fix soft delveiry

webresto · Aug 25, 2024 · ac0b81a · ac0b81a
1 parent 9191848
commit ac0b81a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 37 deletions.
diff --git a/models/Order.js b/models/Order.js
@@ -1340,24 +1340,13 @@ let Model = {
                     }
                     emitter.emit("core:order-after-check-delivery", order);
                 }
-                /**
-                 *   delivery: {
-                        deliveryTimeMinutes: 0,
-                        allowed: false,
-                        cost: null,
-                        item: undefined,
-                        message: 'Shipping cost will be calculated'
-                      },
-                 *
-                 */
-                if ((!delivery || delivery.allowed === false) && softDeliveryCalculation) {
-                    delivery.allowed = true;
-                    delivery.cost = null;
-                    delivery.message = "Shipping cost cannot be calculated";
-                }
                 order.delivery = delivery;
             }
-            sails.log.debug(order);
+            if ((!order.delivery || delivery.allowed === false) && softDeliveryCalculation) {
+                delivery.allowed = true;
+                delivery.cost = null;
+                delivery.message = "Shipping cost cannot be calculated";
+            }
             if (order.delivery && isValidDelivery(order.delivery, softDeliveryCalculation)) {
                 if (!order.delivery.item) {
                     order.deliveryCost = order.delivery.cost;

diff --git a/models/Order.ts b/models/Order.ts
@@ -1607,30 +1607,14 @@ let Model = {
           }
           emitter.emit("core:order-after-check-delivery", order);
         }
-
-
-        /**
-         *   delivery: {
-                deliveryTimeMinutes: 0,
-                allowed: false,
-                cost: null,
-                item: undefined,
-                message: 'Shipping cost will be calculated'
-              },
-         * 
-         */
-
-        if((!delivery || delivery.allowed === false) && softDeliveryCalculation) {
-          delivery.allowed = true;
-          delivery.cost = null
-          delivery.message = "Shipping cost cannot be calculated"
-        }
-
         order.delivery = delivery
       }
 
-
-      sails.log.debug(order)
+      if((!order.delivery || delivery.allowed === false) && softDeliveryCalculation) {
+        delivery.allowed = true;
+        delivery.cost = null
+        delivery.message = "Shipping cost cannot be calculated"
+      }
 
       if (order.delivery && isValidDelivery(order.delivery, softDeliveryCalculation)) {
         if (!order.delivery.item) {