From 2892a7dc258b621f4954b8004476d93693b0a123 Mon Sep 17 00:00:00 2001 From: Midgard Date: Tue, 25 Feb 2020 19:05:21 +0100 Subject: [PATCH] Add no_text options --- app/hlds/parser.py | 2 +- app/views/order.py | 2 +- data/fitchen.hlds | 6 +++--- data/fritoloog.hlds | 4 ++-- data/simpizza.hlds | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/hlds/parser.py b/app/hlds/parser.py index a6e452d..7728909 100644 --- a/app/hlds/parser.py +++ b/app/hlds/parser.py @@ -85,7 +85,7 @@ class HldsSemanticActions: name=ast["name"], description=ast["description"], price=ast["price"] or 0, - tags=ast["tags"], + tags=ast["tags"] or [], ) noindent_choice_entry = indent_choice_entry diff --git a/app/views/order.py b/app/views/order.py index 88e7fd3..843c50f 100644 --- a/app/views/order.py +++ b/app/views/order.py @@ -170,7 +170,7 @@ def order_item_create(order_id: int) -> typing.Any: return option.name except AttributeError: return ", ".join(o.name for o in option) - comments = [_name(option) for option in chosen if option] + comments = [_name(option) for option in chosen if option and "no_text" not in option.tags] if item.comment: comments.append("Comment: " + item.comment) item.comment = "; ".join(comments) diff --git a/data/fitchen.hlds b/data/fitchen.hlds index 3689c82..502ffcb 100644 --- a/data/fitchen.hlds +++ b/data/fitchen.hlds @@ -16,7 +16,7 @@ bowl_wrap: Bowl of wrap red_beet_wrap: Rodebietenwrap € 0.99 veggie: Vegetarische opties - meat: Niet vegetarisch :: {has_meat} + meat: Niet vegetarisch :: {has_meat} {no_text} tofu: Vegetarisch met tofu tempeh: Vegetarisch met tempeh -- Gekruide tempeh avocado: Vegetarisch met avocado @@ -24,7 +24,7 @@ veggie: Vegetarische opties vegan: Veganistisch veggie_on_veggie_dish: Vegetarische opties - veggie: Vegetarisch (met standaard eiwitgerief van gerecht) + veggie: Vegetarisch (met standaard eiwitgerief van gerecht) :: {no_text} tofu: Vegetarisch met tofu tempeh: Vegetarisch met tempeh -- Gekruide tempeh avocado: Vegetarisch met avocado @@ -32,7 +32,7 @@ veggie_on_veggie_dish: Vegetarische opties vegan: Veganistisch veggie_on_vegan_dish: Vegetarische opties - vegan: Veganistisch + vegan: Veganistisch :: {no_text} tofu: Vegetarisch met tofu tempeh: Vegetarisch met tempeh -- Gekruide tempeh avocado: Vegetarisch met avocado diff --git a/data/fritoloog.hlds b/data/fritoloog.hlds index c8bdb1b..8abfbf9 100644 --- a/data/fritoloog.hlds +++ b/data/fritoloog.hlds @@ -28,8 +28,8 @@ sauce: Saus other: Andere (in commentaar) extra_cheese: Extra kaas - no_extra_cheese: Nee - yes_extra_cheese: Ja € 0.2 + no_extra_cheese: Geen extra kaas :: {no_text} + yes_extra_cheese: Extra kaas € 0.2 dish chicken_fingers: Kippenvingers :: {has_meat} € 3 dish nuggiz: Nuggiz :: {has_meat} € 3 diff --git a/data/simpizza.hlds b/data/simpizza.hlds index 73468bd..cbd9313 100644 --- a/data/simpizza.hlds +++ b/data/simpizza.hlds @@ -22,7 +22,7 @@ size: Grootte large: Large -- 37 cm € 15.95 garlic_sauce: Looksaus - no_garlic_sauce: Zonder looksaus + no_garlic_sauce: Geen extra looksaus :: {no_text} yes_garlic_sauce: Met looksaus (prijs onzeker) € 0.75 dish margherita: Pizza margherita -- Veggie