Merge branch '549-imp-select-point-of-sales-per-production-day'

Author: bruecksen

bakeup/shop/models.py

@@ -598,7 +598,7 @@ class PointOfSale(CommonBaseClass):
     is_primary = models.BooleanField(default=False, verbose_name=_("Primary?"))
 
     def __str__(self):
-        return self.name
+        return self.short_name or self.name
 
     def get_short_name(self):
         return self.short_name or self.name
@@ -1012,7 +1012,7 @@ def replace_message_tags(self, message, request):
                         "<a href='{}'>{}</a>".format(order_link, "jetzt ändern")
                     ),
                     "order_link": order_link,
-                    "point_of_sale": self.point_of_sale,
+                    "point_of_sale": self.point_of_sale.name,
                 }
             )
         )

bakeup/templates/shop/customer_order_list.html

@@ -55,7 +55,7 @@ <h2 class="mb-3">Bestellübersicht</h2>
     {% with has_price=order.price_total %}
     <div class="card px-3 py-2 mb-5" id="bestellung-{{ order.pk }}">
         <h4 class="fs-5">Backtag: <strong>{{ order.production_day }}</strong></h4>
-        <h4 class="fs-5">Abholung: <strong>{{ order.point_of_sale|default:'-' }}</strong></h4>
+        <h4 class="fs-5">Abholung: <strong>{{ order.point_of_sale.name|default:'-' }}</strong></h4>
         <div class="row">
             <div class="col-12">
                 <table class="table table-light">

bakeup/templates/shop/includes/checkout.html

@@ -25,7 +25,7 @@ <h1 class="modal-title fs-4 fw-bold" id="checkoutModalLabel">
                 {% if point_of_sales %}
                 <p class=""><span class="min-w-75 d-inline-block">Abholort: </span><select class="form-select form-select-xs d-inline pos-select pe-3 me-1 resizeselect" name="point_of_sale"{% if customer_order.is_locked %} disabled{% endif %}>
                     {% for point_of_sale in point_of_sales %}
-                    <option value="{{ point_of_sale.pk }}" {% if  customer_order.point_of_sale == point_of_sale or not customer_order and user.customer.point_of_sale == point_of_sale %} selected{% endif %}>{{ point_of_sale }}</option>
+                    <option value="{{ point_of_sale.pk }}" {% if  customer_order.point_of_sale == point_of_sale or not customer_order and user.customer.point_of_sale == point_of_sale %} selected{% endif %}>{{ point_of_sale.name }}</option>
                     {% endfor %}
                     </select></p>
                 {% endif %}