From ef55964d5d695a48b21d1cf1411557a02b7ad7e7 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 26 Nov 2025 21:01:31 +0000 Subject: [PATCH 1/4] Initial plan From 619278dbb81241461be37d3cbbd7637d3ce1bcad Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 26 Nov 2025 21:22:22 +0000 Subject: [PATCH 2/4] Implement dynamic stations feature with admin interface support Co-authored-by: Collert <17819526+Collert@users.noreply.github.com> --- deliveries/signals.py | 9 +- deliveries/views.py | 12 +- .../templates/new_admin/menus-instance.html | 8 +- online_store/templates/online_store/menu.html | 20 +- online_store/views.py | 39 ++- pos_server/admin.py | 21 +- pos_server/models.py | 230 ++++++++++++++++-- .../templates/pos_server/order-marking.html | 66 ++--- pos_server/templates/pos_server/order.html | 21 +- pos_server/templatetags/custom_filters.py | 89 +++++-- pos_server/views.py | 181 ++++++++++---- 11 files changed, 544 insertions(+), 152 deletions(-) diff --git a/deliveries/signals.py b/deliveries/signals.py index 3782506..0c5f792 100644 --- a/deliveries/signals.py +++ b/deliveries/signals.py @@ -9,9 +9,9 @@ def new_delivery(sender, instance, created, **kwargs): """ Signal handler for new delivery creation. - This function is triggered when a new delivery instance is created. It checks the kitchen, bar, - and general status of the order associated with the delivery instance. If all statuses are either - 2 or 4, it triggers a push notification to inform about the new delivery. + This function is triggered when a new delivery instance is created. It checks if all stations + are complete for the order associated with the delivery instance. If all statuses are complete, + it triggers a push notification to inform about the new delivery. Args: sender (Model): The model class that sent the signal. @@ -22,7 +22,8 @@ def new_delivery(sender, instance, created, **kwargs): Returns: None """ - if instance.order.kitchen_status in [2, 4] and instance.order.bar_status in [2, 4] and instance.order.gng_status in [2, 4]: + # Use the new all_stations_complete method for checking order readiness + if instance.order.all_stations_complete(): trigger_push_notifications( "New delivery!", "New order available to deliver. Check your app!", diff --git a/deliveries/views.py b/deliveries/views.py index 3c7a034..fca2379 100644 --- a/deliveries/views.py +++ b/deliveries/views.py @@ -37,6 +37,10 @@ def ready_orders(request): """ courier = check_if_active_courier(request) today = timezone.localdate() + + # Filter orders that are ready for delivery + # An order is ready when all legacy stations are complete (2 or 4) + # and no dynamic stations are pending (0) or in progress (1) orders = Delivery.objects.filter( order__kitchen_status__in = [2, 4], order__bar_status__in = [2, 4], @@ -44,7 +48,13 @@ def ready_orders(request): completed=False, order__picked_up=False, timestamp__date=today - ) + ).exclude( + # Exclude orders with pending or in-progress dynamic stations + order__status_0_stations__isnull=False + ).exclude( + order__status_1_stations__isnull=False + ).distinct() + if courier: for d in Delivery.objects.filter(completed = False).all(): if d.courier == request.user: diff --git a/new_admin/templates/new_admin/menus-instance.html b/new_admin/templates/new_admin/menus-instance.html index 680383e..c1a2344 100644 --- a/new_admin/templates/new_admin/menus-instance.html +++ b/new_admin/templates/new_admin/menus-instance.html @@ -64,7 +64,13 @@

#{{ dish.id }} {{ dish.title }} - {{ dish.station }} + + {% if dish.new_station %} + {{ dish.new_station.friendly_name }} + {% else %} + {{ dish.station }} + {% endif %} + {% if dish.in_stock %} check diff --git a/online_store/templates/online_store/menu.html b/online_store/templates/online_store/menu.html index 3373784..23abfb9 100644 --- a/online_store/templates/online_store/menu.html +++ b/online_store/templates/online_store/menu.html @@ -19,13 +19,19 @@

{{menu.menu.title}}

{% for station, items in menu.dishes.items %}
- {% if station == "bar" %} -

{% trans "Drinks and sweets" %}

- {% elif station == "kitchen" %} -

{% trans "Hot food" %}

- {% elif station == "gng" %} -

{% trans "Packaged food" %}

- {% endif %} +

+ {% if station_info and station in station_info %} + {{ station_info.name }} + {% elif station == "bar" %} + {% trans "Drinks and sweets" %} + {% elif station == "kitchen" %} + {% trans "Hot food" %} + {% elif station == "gng" %} + {% trans "Packaged food" %} + {% else %} + {{ station }} + {% endif %} +

{% for dish in items %}
str: return self.title + @property + def effective_station(self): + """ + Returns the effective station for this dish. + Uses new_station if set, otherwise falls back to old station field. + """ + if self.new_station: + return self.new_station + return None + + @property + def station_code(self): + """ + Returns the station code for this dish. + Uses new_station.code if set, otherwise falls back to old station field. + """ + if self.new_station: + return self.new_station.code + return self.station + def check_if_only_choice_dish(self): """ Checks whether the dish only consists of components that point to other dishes. @@ -147,7 +167,9 @@ def serialize_with_options(self): "image":self.image.url if self.image else None, "description":self.description, "menu":self.menu.first().id, - "station":self.station, + "station":self.new_station.code if self.new_station else self.station, + "station_name":self.new_station.friendly_name if self.new_station else self.station, + "station_icon":self.new_station.icon if self.new_station else None, "in_stock":self.in_stock, "force_in_stock":self.force_in_stock, "choice_components":choice_components, @@ -225,13 +247,22 @@ class Order(models.Model): gift_cards = models.ManyToManyField(GiftCard, through="gift_cards.GiftCardAuthorization", blank=True) def save(self, *args, **kwargs): - # Calculate prep time if needed - if (self.bar_status == 2 or self.bar_status == 4) and (self.kitchen_status == 2 or self.kitchen_status == 4) and (self.gng_status == 2 or self.gng_status == 4): + # Calculate prep time if needed using both legacy and dynamic station statuses + legacy_complete = ( + (self.bar_status == 2 or self.bar_status == 4) and + (self.kitchen_status == 2 or self.kitchen_status == 4) and + (self.gng_status == 2 or self.gng_status == 4) + ) + + if legacy_complete: if not self.prep_time: self.prep_time = timezone.now() - self.timestamp # Call the original save method super().save(*args, **kwargs) + + # Check dynamic stations for prep time calculation (must be done after save because of M2M) + # This will be called in post_save if needed # Update the active orders cache update_active_orders_cache() @@ -252,6 +283,139 @@ def __eq__(self, other): def __hash__(self): return hash(self.id) + def get_station_status(self, station): + """ + Get the status of a specific station for this order. + + Args: + station: Station object or station code string + + Returns: + int: Status code (0=pending, 1=approved, 2=completed, 3=rejected, 4=not required) + """ + if isinstance(station, str): + # Get station by code + try: + station = Station.objects.get(code=station) + except Station.DoesNotExist: + return 4 # Not required if station doesn't exist + + if self.status_0_stations.filter(pk=station.pk).exists(): + return 0 + elif self.status_1_stations.filter(pk=station.pk).exists(): + return 1 + elif self.status_2_stations.filter(pk=station.pk).exists(): + return 2 + elif self.status_3_stations.filter(pk=station.pk).exists(): + return 3 + return 4 # Not required + + def set_station_status(self, station, status): + """ + Set the status of a specific station for this order. + + Args: + station: Station object or station code string + status: int status code (0=pending, 1=approved, 2=completed, 3=rejected, 4=not required) + """ + if isinstance(station, str): + try: + station = Station.objects.get(code=station) + except Station.DoesNotExist: + return + + # Remove from all status fields first + self.status_0_stations.remove(station) + self.status_1_stations.remove(station) + self.status_2_stations.remove(station) + self.status_3_stations.remove(station) + self.status_4_stations.remove(station) + + # Add to the appropriate status field + if status == 0: + self.status_0_stations.add(station) + elif status == 1: + self.status_1_stations.add(station) + elif status == 2: + self.status_2_stations.add(station) + elif status == 3: + self.status_3_stations.add(station) + # For status 4, we don't add to any field + + def get_all_station_statuses(self): + """ + Get a dictionary of all station statuses for this order. + + Returns: + dict: Mapping of station code to status code + """ + result = {} + for station in self.status_0_stations.all(): + result[station.code] = 0 + for station in self.status_1_stations.all(): + result[station.code] = 1 + for station in self.status_2_stations.all(): + result[station.code] = 2 + for station in self.status_3_stations.all(): + result[station.code] = 3 + return result + + def get_required_stations(self): + """ + Get all stations that are required for this order (status 0, 1, 2, or 3). + + Returns: + QuerySet: All stations that are required for this order + """ + from django.db.models import Q + return Station.objects.filter( + Q(status_0_orders=self) | Q(status_1_orders=self) | + Q(status_2_orders=self) | Q(status_3_orders=self) + ).distinct() + + def all_stations_complete(self): + """ + Check if all required stations are complete or not required. + + Returns: + bool: True if all required stations are complete + """ + # Check dynamic station statuses + if self.status_0_stations.exists() or self.status_1_stations.exists(): + return False + # Also check legacy statuses for backward compatibility + if self.kitchen_status in [0, 1] or self.bar_status in [0, 1] or self.gng_status in [0, 1]: + return False + return True + + def any_station_pending(self): + """ + Check if any station is pending approval (status 0). + + Returns: + bool: True if any station is pending approval + """ + if self.status_0_stations.exists(): + return True + # Also check legacy statuses for backward compatibility + if self.kitchen_status == 0 or self.bar_status == 0 or self.gng_status == 0: + return True + return False + + def any_station_in_progress(self): + """ + Check if any station is in progress (status 1). + + Returns: + bool: True if any station is in progress + """ + if self.status_1_stations.exists(): + return True + # Also check legacy statuses for backward compatibility + if self.kitchen_status == 1 or self.bar_status == 1 or self.gng_status == 1: + return True + return False + def progress_status(self): """ Determine the progress status of an order based on various conditions. @@ -260,36 +424,37 @@ def progress_status(self): int: The status code representing the progress of the order. - 6: Delivery completed. - 5: Order picked up. - - 4: Order ready (kitchen, bar, and gng statuses are 2 or 4). - - 3: Order in progress (any of kitchen, bar, or gng statuses is 1). - - 2: Order not started (any of kitchen, bar, or gng statuses is 0 and start time is in the past). - - 1: Order is scheduled (any of kitchen, bar, or gng statuses is 0 and start time is in the future). + - 4: Order ready (all stations are completed or not required). + - 3: Order in progress (any station is approved/in progress). + - 2: Order not started (any station is pending and start time is in the past). + - 1: Order is scheduled (any station is pending and start time is in the future). None: If the channel is neither "delivery" nor "web". """ - print(timezone.localtime(self.start_time)) - print(timezone.localtime(timezone.now())) - print(timezone.localtime(self.start_time) > timezone.localtime(timezone.now())) + all_complete = self.all_stations_complete() + any_in_progress = self.any_station_in_progress() + any_pending = self.any_station_pending() + if self.channel == "delivery": - if self.delivery.first().completed: + if self.delivery.first() and self.delivery.first().completed: status = 6 elif self.picked_up: status = 5 - elif not self.picked_up and self.kitchen_status in [2, 4] and self.bar_status in [2, 4] and self.gng_status in [2, 4]: + elif not self.picked_up and all_complete: status = 4 - elif not self.picked_up and (self.kitchen_status == 1 or self.bar_status == 1 or self.gng_status == 1): + elif not self.picked_up and any_in_progress: status = 3 - elif (self.kitchen_status == 0 or self.bar_status == 0 or self.gng_status == 0) and self.start_time <= timezone.now(): + elif any_pending and self.start_time <= timezone.now(): status = 2 else: status = 1 elif self.channel == "web": if self.picked_up: status = 5 - elif not self.picked_up and self.kitchen_status in [2, 4] and self.bar_status in [2, 4] and self.gng_status in [2, 4]: + elif not self.picked_up and all_complete: status = 4 - elif not self.picked_up and (self.kitchen_status == 1 or self.bar_status == 1 or self.gng_status == 1): + elif not self.picked_up and any_in_progress: status = 3 - elif (self.kitchen_status == 0 or self.bar_status == 0 or self.gng_status == 0) and self.start_time <= timezone.now(): + elif any_pending and self.start_time <= timezone.now(): status = 2 else: status = 1 @@ -507,12 +672,41 @@ def __str__(self) -> str: return self.name class Station(models.Model): + """ + Model representing a station where dishes are prepared. + Stations can be created dynamically through the admin interface. + + Attributes: + friendly_name (CharField): Human-readable name of the station (e.g., "Kitchen", "Bar"). + code (CharField): Unique short code for the station (e.g., "kitchen", "bar"). + icon (CharField): Material Symbols icon name for the station. + """ friendly_name = models.CharField(max_length=50) - code = models.CharField(max_length=10) + code = models.CharField(max_length=10, unique=True) icon = models.CharField(max_length=20, choices=settings.AVAILABLE_ICONS) def __str__(self): return self.friendly_name + + @classmethod + def get_or_create_default_stations(cls): + """ + Creates default stations if they don't exist. + Returns a dictionary mapping old station codes to Station objects. + """ + defaults = [ + {"code": "kitchen", "friendly_name": "Kitchen", "icon": "restaurant"}, + {"code": "bar", "friendly_name": "Bar", "icon": "local_cafe"}, + {"code": "gng", "friendly_name": "Grab & Go", "icon": "kitchen"}, + ] + result = {} + for default in defaults: + station, _ = cls.objects.get_or_create( + code=default["code"], + defaults={"friendly_name": default["friendly_name"], "icon": default["icon"]} + ) + result[default["code"]] = station + return result def update_active_orders_cache(): """ diff --git a/pos_server/templates/pos_server/order-marking.html b/pos_server/templates/pos_server/order-marking.html index eacf95f..0104e49 100644 --- a/pos_server/templates/pos_server/order-marking.html +++ b/pos_server/templates/pos_server/order-marking.html @@ -160,11 +160,11 @@

{% trans "Order management" %}

@@ -219,18 +213,30 @@

Preferences

{% trans "Filters" %}

-
- - -
-
- - -
-
- - -
+ {% if station_info %} + {% for station in station_info %} +
+ + +
+ {% endfor %} + {% else %} +
+ + +
+
+ + +
+
+ + +
+ {% endif %}

{% trans "Auto-done" %}

diff --git a/pos_server/templates/pos_server/order.html b/pos_server/templates/pos_server/order.html index 9fe6bf4..312e49f 100644 --- a/pos_server/templates/pos_server/order.html +++ b/pos_server/templates/pos_server/order.html @@ -7,13 +7,20 @@ {% csrf_token %}
{% for station, items in menu.items %} - {% if station == "bar" %} -

{% trans "Drinks and sweets" %}

- {% elif station == "kitchen" %} -

{% trans "Hot food" %}

- {% elif station == "gng" %} -

{% trans "Grab & Go" %}

- {% endif %} +

+ {% if station_info and station in station_info %} + {{ station_info|yesno:station_info|default:"restaurant" }} + {{ station_info.name|default:station }} + {% elif station == "bar" %} + {% trans "Drinks and sweets" %} + {% elif station == "kitchen" %} + {% trans "Hot food" %} + {% elif station == "gng" %} + {% trans "Grab & Go" %} + {% else %} + {{ station }} + {% endif %} +

{% for item in items %} {% if item.visible_in_menu %} diff --git a/pos_server/templatetags/custom_filters.py b/pos_server/templatetags/custom_filters.py index 771e8b4..2641eba 100644 --- a/pos_server/templatetags/custom_filters.py +++ b/pos_server/templatetags/custom_filters.py @@ -11,6 +11,16 @@ def has_kitchen_item(dishes): def has_bar_item(dishes): return any(item["station"] == "bar" for item in dishes) +@register.filter(name='has_station_item') +def has_station_item(dishes, station_code): + """ + Checks if the dishes list has any item from a specific station. + :param dishes: List of dish dictionaries. + :param station_code: The station code to check for. + :return: True if any dish is from the specified station. + """ + return any(item["station"] == station_code for item in dishes) + @register.filter(name='has_options') def has_options(dish): return len(dish.serialize_with_options()["fields"]["choice_components"]) > 0 @@ -31,15 +41,21 @@ def pending_other_stations(order:dict, filters:list): if not filters: filters = [] - # Map the status fields in the Order model - station_status_fields = { - "kitchen": order["kitchen_status"], - "bar": order["bar_status"], - "gng": order["gng_status"], + # Map the legacy status fields in the Order model + legacy_station_status_fields = { + "kitchen": order.get("kitchen_status", 4), + "bar": order.get("bar_status", 4), + "gng": order.get("gng_status", 4), } - # Check stations not covered by filters - for station, status in station_status_fields.items(): + # Check legacy stations not covered by filters + for station, status in legacy_station_status_fields.items(): + if station not in filters and status == 0: # Pending approval + return True + + # Check dynamic station statuses + station_statuses = order.get("station_statuses", {}) + for station, status in station_statuses.items(): if station not in filters and status == 0: # Pending approval return True @@ -57,15 +73,21 @@ def pending_self(order:dict, filters:list): if not filters: filters = [] - # Map the status fields in the Order model - station_status_fields = { - "kitchen": order["kitchen_status"], - "bar": order["bar_status"], - "gng": order["gng_status"], + # Map the legacy status fields in the Order model + legacy_station_status_fields = { + "kitchen": order.get("kitchen_status", 4), + "bar": order.get("bar_status", 4), + "gng": order.get("gng_status", 4), } - # Check stations not covered by filters - for station, status in station_status_fields.items(): + # Check legacy stations covered by filters + for station, status in legacy_station_status_fields.items(): + if station in filters and status == 0: # Pending approval + return True + + # Check dynamic station statuses + station_statuses = order.get("station_statuses", {}) + for station, status in station_statuses.items(): if station in filters and status == 0: # Pending approval return True @@ -78,13 +100,44 @@ def all_stations_ready(order:dict): :param order: An instance of the Order model parsed via collect_order(). :return: True if order is ready in all productions stations, False otherwise. """ - return ( - (order["kitchen_status"] == 2 or order["kitchen_status"] == 4) + # Check legacy stations + legacy_ready = ( + (order.get("kitchen_status", 4) == 2 or order.get("kitchen_status", 4) == 4) and - (order["bar_status"] == 2 or order["bar_status"] == 4) + (order.get("bar_status", 4) == 2 or order.get("bar_status", 4) == 4) and - (order["gng_status"] == 2 or order["gng_status"] == 4) + (order.get("gng_status", 4) == 2 or order.get("gng_status", 4) == 4) ) + + # Check dynamic station statuses - all must be completed (2) or not present + station_statuses = order.get("station_statuses", {}) + dynamic_ready = all(status in [2, 4] for status in station_statuses.values()) + + return legacy_ready and dynamic_ready + +@register.filter(name='get_station_status') +def get_station_status(order:dict, station_code:str): + """ + Gets the status for a specific station from the order. + :param order: An instance of the Order model parsed via collect_order(). + :param station_code: The station code to check. + :return: Status code (0=pending, 1=approved, 2=completed, 3=rejected, 4=not required). + """ + # First check dynamic station statuses + station_statuses = order.get("station_statuses", {}) + if station_code in station_statuses: + return station_statuses[station_code] + + # Fallback to legacy statuses + legacy_mapping = { + "kitchen": "kitchen_status", + "bar": "bar_status", + "gng": "gng_status", + } + if station_code in legacy_mapping: + return order.get(legacy_mapping[station_code], 4) + + return 4 # Not required @register.filter(name='format_duration') def format_duration(value: timedelta): diff --git a/pos_server/views.py b/pos_server/views.py index 68fa200..9c8c369 100644 --- a/pos_server/views.py +++ b/pos_server/views.py @@ -116,40 +116,60 @@ def order_marking(request): """ if request.method == "GET": today = timezone.localdate() - stations = ["kitchen", "bar", "gng"] + # Get all dynamic stations + all_stations = Station.objects.all() + station_codes = list(all_stations.values_list('code', flat=True)) + # Include legacy station codes for backward compatibility + legacy_stations = ["kitchen", "bar", "gng"] + all_station_codes = list(set(station_codes + legacy_stations)) + filters = request.GET.getlist('filter') print(filters) + # Fetch all orders conditions = Q(picked_up=False) & Q(start_time__lte=now()) & Q(timestamp__date=today) - status_conditions = Q() - for station in stations: + + # Build status conditions for legacy stations + legacy_status_conditions = Q() + for station in legacy_stations: if station in filters: - status_conditions |= ~Q(**{f"{station}_status__in": [3, 4]}) - else: - status_conditions |= ~Q(**{f"{station}_status__in": [0, 1, 2, 3, 4]}) - conditions &= status_conditions - orders = Order.objects.filter(conditions) + legacy_status_conditions |= ~Q(**{f"{station}_status__in": [3, 4]}) + + # Build status conditions for dynamic stations + dynamic_status_conditions = Q() + for station_code in filters: + try: + station = Station.objects.get(code=station_code) + # Check if order has this station in status 0, 1, or 2 (pending, approved, completed) + dynamic_status_conditions |= Q(status_0_stations=station) | Q(status_1_stations=station) | Q(status_2_stations=station) + except Station.DoesNotExist: + pass + + if filters: + conditions &= (legacy_status_conditions | dynamic_status_conditions) + + orders = Order.objects.filter(conditions).distinct() print(orders) # Prepare data for each order orders_data = [] for order in orders: orders_data.append(collect_order(order)) + + # Get station info for the filter UI + station_info = [{"code": s.code, "name": s.friendly_name, "icon": s.icon} for s in all_stations] + return render(request, "pos_server/order-marking.html", { "route":"markings", 'orders': orders_data, "filters":json.dumps(filters), - "stations":json.dumps(stations) + "stations":json.dumps(all_station_codes), + "station_info": station_info }) elif request.method == "DELETE": # Mark order as picked up order_id = json.loads(request.body)["orderId"] order = Order.objects.get(id=order_id) - station_mappings = { - "kitchen": order.kitchen_status, - "bar": order.bar_status, - "gng": order.gng_status, - } order.picked_up = True order.save() return JsonResponse({"status":"Order marked picked up"}, status=200) @@ -159,18 +179,30 @@ def order_marking(request): filters = json.loads(request.body)["filters"] order = Order.objects.get(id=order_id) - station_mappings = { + # Legacy station mappings for backward compatibility + legacy_station_mappings = { "kitchen": "kitchen_status", "bar": "bar_status", "gng": "gng_status", } - for station in filters: - if station in station_mappings: - field_name = station_mappings[station] - current_value = getattr(order, field_name) # Get the current value of the attribute - if current_value != 4: # Only update if the current value is not 4 - setattr(order, field_name, 2) + for station_code in filters: + # Try legacy station first + if station_code in legacy_station_mappings: + field_name = legacy_station_mappings[station_code] + current_value = getattr(order, field_name) + if current_value != 4: # Only update if not "not required" + setattr(order, field_name, 2) # Set to completed + + # Also update dynamic station status + try: + station = Station.objects.get(code=station_code) + current_status = order.get_station_status(station) + if current_status != 4: # Only update if not "not required" + order.set_station_status(station, 2) # Set to completed + except Station.DoesNotExist: + pass + order.save() return JsonResponse({"status":"Order marked done"}, status=200) elif request.method == "POST": @@ -180,21 +212,43 @@ def order_marking(request): order_id = body["orderId"] action = body["action"] order = Order.objects.get(id=order_id) - station_mappings = { + + # Legacy station mappings for backward compatibility + legacy_station_mappings = { "kitchen": "kitchen_status", "bar": "bar_status", "gng": "gng_status", } + payment_id = order.authorization.payment_id if order.authorization else None if action == "approve": - for station in filters: - if station in station_mappings: - field_name = station_mappings[station] - current_value = getattr(order, field_name) # Get the current value of the attribute - if current_value != 4: # Only update if the current value is not 4 - setattr(order, field_name, 1) + for station_code in filters: + # Try legacy station first + if station_code in legacy_station_mappings: + field_name = legacy_station_mappings[station_code] + current_value = getattr(order, field_name) + if current_value != 4: # Only update if not "not required" + setattr(order, field_name, 1) # Set to approved + + # Also update dynamic station status + try: + station = Station.objects.get(code=station_code) + current_status = order.get_station_status(station) + if current_status != 4: # Only update if not "not required" + order.set_station_status(station, 1) # Set to approved + except Station.DoesNotExist: + pass + order.save() - all_approved = order.kitchen_status in [1,4] and order.bar_status in [1,4] and order.gng_status in [1,4] + + # Check if all stations are approved or not required + all_approved = order.all_stations_complete() or ( + order.kitchen_status in [1, 2, 4] and + order.bar_status in [1, 2, 4] and + order.gng_status in [1, 2, 4] and + not order.status_0_stations.exists() + ) + return JsonResponse({ "status":"Order marked approved", "action":action, @@ -330,10 +384,15 @@ def pos(request): # Sort dishes by ID before grouping to ensure consistent ordering dishes = Dish.objects.filter(menu=menu).order_by('id') - # Group dishes by station + # Group dishes by station using new_station if available grouped_dishes = defaultdict(list) for dish in dishes: - grouped_dishes[dish.station].append(dish) + station_key = dish.station_code # Uses new_station.code or falls back to old station field + grouped_dishes[station_key].append(dish) + + # Get all stations for proper ordering and display names + all_stations = Station.objects.all() + station_info = {s.code: {"name": s.friendly_name, "icon": s.icon} for s in all_stations} # Sort each group of dishes by ID to ensure stable ordering within each station sorted_grouped_dishes = {station: sorted(items, key=lambda x: x.id) for station, items in grouped_dishes.items()} @@ -343,7 +402,8 @@ def pos(request): "menu": sorted_grouped_dishes, "menu_title": menu.title, "json": json.dumps([dish.serialize_with_options() for dish in dishes]), - "menus": Menu.objects.all() + "menus": Menu.objects.all(), + "station_info": station_info }) elif request.method == "POST": body = json.loads(request.body) @@ -361,15 +421,23 @@ def pos(request): dish = Dish.objects.get(id=dish_id) if check_if_only_choice_dish(dish): continue - if dish.station == "bar": - new_order.bar_status = 1 - new_order.picked_up = False - elif dish.station == "kitchen": - new_order.kitchen_status = 1 - new_order.picked_up = False - elif dish.station == "gng": - new_order.gng_status = 1 + + # Use new dynamic station system + if dish.new_station: + new_order.set_station_status(dish.new_station, 1) # Set to approved new_order.picked_up = False + else: + # Fallback to legacy station handling + if dish.station == "bar": + new_order.bar_status = 1 + new_order.picked_up = False + elif dish.station == "kitchen": + new_order.kitchen_status = 1 + new_order.picked_up = False + elif dish.station == "gng": + new_order.gng_status = 1 + new_order.picked_up = False + for dc in dish.dishcomponent_set.all(): if dc.component.crafting_option == "auto": craft_component(dc.component.id, 1) @@ -652,11 +720,12 @@ def get_15_min_window(dt): else: stats["item_stats"][item.title] += 1 - # Count the distribution of dishes across stations - if item.station not in stats["stations"]: - stats["stations"][item.station] = 1 + # Count the distribution of dishes across stations using station_code + station_code = item.station_code + if station_code not in stats["stations"]: + stats["stations"][station_code] = 1 else: - stats["stations"][item.station] += 1 + stats["stations"][station_code] += 1 # Track the quantity of each component used in the dish for dc in item.dishcomponent_set.all(): @@ -728,18 +797,19 @@ def compile_menu(menu): Returns: tuple: A tuple containing: - - categories (dict): A dictionary with keys 'kitchen', 'bar', and 'gng', each containing a list of prettified dishes. + - categories (dict): A dictionary with station codes as keys, each containing a list of prettified dishes. - components_out (bool): A boolean indicating if components are out (always False in this implementation). """ components_out = False - categories = { - "kitchen":[], - "bar":[], - "gng":[], - } + + # Get all stations and initialize categories dynamically + categories = defaultdict(list) + for dish in menu.dishes.all().order_by("id"): - categories[dish.station].append(prettify_dish(dish)) - return categories, components_out + station_code = dish.station_code # Uses new_station.code or falls back to old station field + categories[station_code].append(prettify_dish(dish)) + + return dict(categories), components_out def prettify_dish(dish): """ @@ -1129,6 +1199,7 @@ def collect_order(order, done=False): - done (bool): Indicates if the order is done. - bar_status (str): The bar status of the order. - gng_status (str): The grab-and-go status of the order. + - station_statuses (dict): Dynamic station statuses mapping station code to status. - picked_up (bool): Indicates if the order has been picked up. - payment_id (str): The payment ID associated with the order authorization, if available. """ @@ -1144,8 +1215,11 @@ def collect_order(order, done=False): 'name': od.dish.title, 'quantity': od.quantity, 'price': od.dish.price, - 'station': od.dish.station + 'station': od.dish.station_code # Use station_code for backward compatibility }) + + # Get dynamic station statuses + station_statuses = order.get_all_station_statuses() # Add the order and its dishes to the orders_data list return({ @@ -1164,6 +1238,7 @@ def collect_order(order, done=False): "done":done, "bar_status":order.bar_status, "gng_status":order.gng_status, + "station_statuses": station_statuses, "picked_up":order.picked_up, "payment_id":order.authorization.payment_id if order.authorization else None, }) From 2cd8106fd92f90e5cacc3cc0578b0099ffc6d81b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 26 Nov 2025 21:25:32 +0000 Subject: [PATCH 3/4] Add comprehensive tests for dynamic station functionality Co-authored-by: Collert <17819526+Collert@users.noreply.github.com> --- pos_server/tests.py | 209 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 208 insertions(+), 1 deletion(-) diff --git a/pos_server/tests.py b/pos_server/tests.py index 7ce503c..1b70ee1 100644 --- a/pos_server/tests.py +++ b/pos_server/tests.py @@ -1,3 +1,210 @@ from django.test import TestCase +from pos_server.models import Station, Dish, Order, Menu -# Create your tests here. + +class StationModelTests(TestCase): + """Tests for the Station model.""" + + def test_station_creation(self): + """Test that a station can be created with all required fields.""" + station = Station.objects.create( + friendly_name="Test Kitchen", + code="test_kitchen", + icon="restaurant" + ) + self.assertEqual(station.friendly_name, "Test Kitchen") + self.assertEqual(station.code, "test_kitchen") + self.assertEqual(station.icon, "restaurant") + + def test_station_str(self): + """Test the string representation of a station.""" + station = Station.objects.create( + friendly_name="Test Bar", + code="test_bar", + icon="local_cafe" + ) + self.assertEqual(str(station), "Test Bar") + + def test_station_code_unique(self): + """Test that station codes must be unique.""" + Station.objects.create( + friendly_name="Station 1", + code="unique_code", + icon="restaurant" + ) + with self.assertRaises(Exception): + Station.objects.create( + friendly_name="Station 2", + code="unique_code", # Same code + icon="local_cafe" + ) + + def test_get_or_create_default_stations(self): + """Test that default stations can be created.""" + result = Station.get_or_create_default_stations() + self.assertIn("kitchen", result) + self.assertIn("bar", result) + self.assertIn("gng", result) + self.assertEqual(result["kitchen"].code, "kitchen") + self.assertEqual(result["bar"].code, "bar") + self.assertEqual(result["gng"].code, "gng") + + +class DishStationTests(TestCase): + """Tests for Dish station functionality.""" + + def setUp(self): + """Set up test data.""" + self.menu = Menu.objects.create(title="Test Menu", is_active=True) + self.station = Station.objects.create( + friendly_name="Test Station", + code="test_station", + icon="restaurant" + ) + + def test_dish_with_new_station(self): + """Test that a dish can be created with a new_station.""" + dish = Dish.objects.create( + title="Test Dish", + price=10.00, + station="kitchen", # Legacy field + new_station=self.station + ) + dish.menu.add(self.menu) + self.assertEqual(dish.new_station, self.station) + self.assertEqual(dish.station_code, "test_station") + + def test_dish_station_code_with_legacy(self): + """Test that station_code falls back to legacy station field.""" + dish = Dish.objects.create( + title="Test Dish Legacy", + price=10.00, + station="bar", # Legacy field only + new_station=None + ) + dish.menu.add(self.menu) + self.assertEqual(dish.station_code, "bar") + + def test_dish_effective_station(self): + """Test the effective_station property.""" + dish = Dish.objects.create( + title="Test Dish", + price=10.00, + station="kitchen", + new_station=self.station + ) + dish.menu.add(self.menu) + self.assertEqual(dish.effective_station, self.station) + + def test_dish_serialize_with_options_station(self): + """Test that serialize_with_options includes station info.""" + dish = Dish.objects.create( + title="Test Dish Serialize", + price=10.00, + station="kitchen", + new_station=self.station + ) + dish.menu.add(self.menu) + serialized = dish.serialize_with_options() + self.assertEqual(serialized["fields"]["station"], "test_station") + self.assertEqual(serialized["fields"]["station_name"], "Test Station") + self.assertEqual(serialized["fields"]["station_icon"], "restaurant") + + +class OrderStationStatusTests(TestCase): + """Tests for Order station status functionality.""" + + def setUp(self): + """Set up test data.""" + self.station1 = Station.objects.create( + friendly_name="Station 1", + code="station1", + icon="restaurant" + ) + self.station2 = Station.objects.create( + friendly_name="Station 2", + code="station2", + icon="local_cafe" + ) + self.order = Order.objects.create(channel="store") + + def test_set_and_get_station_status(self): + """Test setting and getting station status.""" + self.order.set_station_status(self.station1, 0) # Pending + self.assertEqual(self.order.get_station_status(self.station1), 0) + + self.order.set_station_status(self.station1, 1) # Approved + self.assertEqual(self.order.get_station_status(self.station1), 1) + + self.order.set_station_status(self.station1, 2) # Completed + self.assertEqual(self.order.get_station_status(self.station1), 2) + + def test_get_station_status_by_code(self): + """Test getting station status by code string.""" + self.order.set_station_status(self.station1, 1) + self.assertEqual(self.order.get_station_status("station1"), 1) + + def test_get_all_station_statuses(self): + """Test getting all station statuses.""" + self.order.set_station_status(self.station1, 1) + self.order.set_station_status(self.station2, 2) + + statuses = self.order.get_all_station_statuses() + self.assertEqual(statuses["station1"], 1) + self.assertEqual(statuses["station2"], 2) + + def test_all_stations_complete(self): + """Test all_stations_complete method.""" + # Initially should be complete (no stations assigned) + self.assertTrue(self.order.all_stations_complete()) + + # Add a pending station + self.order.set_station_status(self.station1, 0) + self.assertFalse(self.order.all_stations_complete()) + + # Complete the station + self.order.set_station_status(self.station1, 2) + self.assertTrue(self.order.all_stations_complete()) + + def test_any_station_pending(self): + """Test any_station_pending method.""" + self.assertFalse(self.order.any_station_pending()) + + self.order.set_station_status(self.station1, 0) + self.assertTrue(self.order.any_station_pending()) + + self.order.set_station_status(self.station1, 1) + self.assertFalse(self.order.any_station_pending()) + + def test_any_station_in_progress(self): + """Test any_station_in_progress method.""" + self.assertFalse(self.order.any_station_in_progress()) + + self.order.set_station_status(self.station1, 1) + self.assertTrue(self.order.any_station_in_progress()) + + self.order.set_station_status(self.station1, 2) + self.assertFalse(self.order.any_station_in_progress()) + + def test_get_required_stations(self): + """Test get_required_stations method.""" + self.order.set_station_status(self.station1, 1) + self.order.set_station_status(self.station2, 2) + + required = self.order.get_required_stations() + self.assertIn(self.station1, required) + self.assertIn(self.station2, required) + + def test_legacy_compatibility(self): + """Test that legacy station statuses still work.""" + self.order.kitchen_status = 0 + self.order.save() + + self.assertTrue(self.order.any_station_pending()) + self.assertFalse(self.order.all_stations_complete()) + + self.order.kitchen_status = 2 + self.order.save() + + self.assertFalse(self.order.any_station_pending()) + self.assertTrue(self.order.all_stations_complete()) From be548dd6c24924dda4606d3ff7705f0b06f0b95f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 26 Nov 2025 21:29:09 +0000 Subject: [PATCH 4/4] Address code review feedback and add helper method for approval check Co-authored-by: Collert <17819526+Collert@users.noreply.github.com> --- pos_server/models.py | 16 ++++++++++++ pos_server/templates/pos_server/order.html | 5 +--- pos_server/tests.py | 29 ++++++++++++++++++++++ pos_server/views.py | 7 +----- 4 files changed, 47 insertions(+), 10 deletions(-) diff --git a/pos_server/models.py b/pos_server/models.py index f968dc1..bdd0462 100644 --- a/pos_server/models.py +++ b/pos_server/models.py @@ -416,6 +416,22 @@ def any_station_in_progress(self): return True return False + def all_stations_approved_or_complete(self): + """ + Check if all stations are at least approved (status 1, 2, or 4). + This means no station is pending approval (status 0). + + Returns: + bool: True if all stations are at least approved + """ + # Check dynamic station statuses - no pending stations + if self.status_0_stations.exists(): + return False + # Also check legacy statuses for backward compatibility + if self.kitchen_status == 0 or self.bar_status == 0 or self.gng_status == 0: + return False + return True + def progress_status(self): """ Determine the progress status of an order based on various conditions. diff --git a/pos_server/templates/pos_server/order.html b/pos_server/templates/pos_server/order.html index 312e49f..b45408a 100644 --- a/pos_server/templates/pos_server/order.html +++ b/pos_server/templates/pos_server/order.html @@ -8,10 +8,7 @@
{% for station, items in menu.items %}

- {% if station_info and station in station_info %} - {{ station_info|yesno:station_info|default:"restaurant" }} - {{ station_info.name|default:station }} - {% elif station == "bar" %} + {% if station == "bar" %} {% trans "Drinks and sweets" %} {% elif station == "kitchen" %} {% trans "Hot food" %} diff --git a/pos_server/tests.py b/pos_server/tests.py index 1b70ee1..75a0a49 100644 --- a/pos_server/tests.py +++ b/pos_server/tests.py @@ -208,3 +208,32 @@ def test_legacy_compatibility(self): self.assertFalse(self.order.any_station_pending()) self.assertTrue(self.order.all_stations_complete()) + + def test_all_stations_approved_or_complete(self): + """Test all_stations_approved_or_complete method.""" + # Initially should be True (no stations assigned means all approved) + self.assertTrue(self.order.all_stations_approved_or_complete()) + + # Add a pending station + self.order.set_station_status(self.station1, 0) + self.assertFalse(self.order.all_stations_approved_or_complete()) + + # Approve the station + self.order.set_station_status(self.station1, 1) + self.assertTrue(self.order.all_stations_approved_or_complete()) + + # Complete the station + self.order.set_station_status(self.station1, 2) + self.assertTrue(self.order.all_stations_approved_or_complete()) + + def test_all_stations_approved_or_complete_legacy(self): + """Test all_stations_approved_or_complete with legacy fields.""" + self.order.kitchen_status = 0 + self.order.save() + + self.assertFalse(self.order.all_stations_approved_or_complete()) + + self.order.kitchen_status = 1 + self.order.save() + + self.assertTrue(self.order.all_stations_approved_or_complete()) diff --git a/pos_server/views.py b/pos_server/views.py index 9c8c369..50f31b2 100644 --- a/pos_server/views.py +++ b/pos_server/views.py @@ -242,12 +242,7 @@ def order_marking(request): order.save() # Check if all stations are approved or not required - all_approved = order.all_stations_complete() or ( - order.kitchen_status in [1, 2, 4] and - order.bar_status in [1, 2, 4] and - order.gng_status in [1, 2, 4] and - not order.status_0_stations.exists() - ) + all_approved = order.all_stations_approved_or_complete() return JsonResponse({ "status":"Order marked approved",