Merge pull request #532 from bruecksen/528-imp-customer-order-updated-if-nothing-has-changed

In create/update order view detect if order has been changed and only…

Author: bruecksen

bakeup/shop/models.py

@@ -829,20 +829,25 @@ def create_or_update_customer_order(
         cls, request, production_day, customer, products, point_of_sale=None
     ):
         with transaction.atomic():
+            changes_detected = False
             point_of_sale = (
                 point_of_sale
                 and PointOfSale.objects.get(pk=point_of_sale)
                 or customer.point_of_sale
             )
+            old_customer_order = CustomerOrder.objects.filter(
+                production_day=production_day, customer=customer
+            ).first()
             customer_order, created = CustomerOrder.objects.update_or_create(
                 production_day=production_day,
                 customer=customer,
                 defaults={
                     "point_of_sale": point_of_sale,
                 },
             )
+            if old_customer_order and old_customer_order.point_of_sale != point_of_sale:
+                changes_detected = True
             for product, quantity in products.items():
-                # print(product, quantity)
                 production_day_product = ProductionDayProduct.objects.get(
                     production_day=production_day, product=product
                 )
@@ -883,6 +888,10 @@ def create_or_update_customer_order(
                     if product.sale_price:
                         price = product.sale_price.price.amount
                         price_total = price * quantity
+                    old_position = CustomerOrderPosition.objects.filter(
+                        Q(product=product)
+                        | Q(product__product_template=product, order=customer_order)
+                    ).first()
                     position, created = CustomerOrderPosition.objects.filter(
                         Q(product=product) | Q(product__product_template=product)
                     ).update_or_create(
@@ -894,12 +903,19 @@ def create_or_update_customer_order(
                             "price_total": price_total,
                         },
                     )
+                    if created:
+                        changes_detected = True
+                    elif old_position and old_position.quantity != quantity:
+                        changes_detected = True
                 elif quantity == 0:
-                    CustomerOrderPosition.objects.filter(
+                    deleted, object_types = CustomerOrderPosition.objects.filter(
                         Q(product=product) | Q(product__product_template=product),
                         order=customer_order,
                     ).delete()
-            return customer_order, created
+                    if deleted:
+                        changes_detected = True
+
+            return customer_order, created, changes_detected
 
     def get_production_day_products_ordered_list(self):
         production_day_products = (

bakeup/shop/views.py

@@ -130,12 +130,14 @@ def customer_order_add_or_update(request, production_day):
                 for k, v in request.POST.items()
                 if k.startswith("product-")
             }
-            order, created = CustomerOrder.create_or_update_customer_order(
-                request,
-                production_day,
-                request.user.customer,
-                products,
-                request.POST.get("point_of_sale", None),
+            order, created, changes_detected = (
+                CustomerOrder.create_or_update_customer_order(
+                    request,
+                    production_day,
+                    request.user.customer,
+                    products,
+                    request.POST.get("point_of_sale", None),
+                )
             )
             products_recurring = {
                 Product.objects.get(pk=k.replace("productabo-", "")): int(
@@ -162,12 +164,12 @@ def customer_order_add_or_update(request, production_day):
                     messages.INFO,
                     "Vielen Dank, die Bestellung wurde geändert.",
                 )
-            if order:
+            if order and changes_detected:
                 if EmailSettings.load(request_or_site=request).send_email_order_confirm:
                     order.send_order_confirm_email(request)
-                return HttpResponseRedirect(
-                    "{}#bestellung-{}".format(reverse("shop:order-list"), order.pk)
-                )
+            return HttpResponseRedirect(
+                "{}#bestellung-{}".format(reverse("shop:order-list"), order.pk)
+            )
         elif "cancel" in request.POST:
             # cancellation of order
             customer_order = get_object_or_404(