refactor

webresto · Aug 29, 2024 · 432dcda · 432dcda
1 parent 6a1af6d
commit 432dcda
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 40 deletions.
diff --git a/models/Order.js b/models/Order.js
@@ -723,7 +723,7 @@ let Model = {
                 error: "Problem with counting cart",
             };
         }
-        if (!order.selfService && !order.delivery?.allowed) {
+        if (!order.selfService && softDeliveryCalculation === false && order.delivery?.allowed === false) {
             throw {
                 code: 11,
                 error: "Delivery not allowed",
@@ -1319,29 +1319,22 @@ let Model = {
                 sails.log.debug(order, delivery);
                 if (order.selfService === false && order.address?.city && order.address?.street && order.address?.home) {
                     emitter.emit("core:order-check-delivery", order);
+                    let delivery;
                     try {
-                        let delivery;
-                        try {
-                            delivery = await deliveryAdapter.calculate(order);
-                        }
-                        catch (error) {
-                            sails.log.error("deliveryAdapter.calculate error:", error);
-                            delivery = {
-                                allowed: false,
-                                cost: 0,
-                                item: undefined,
-                                message: error.replace(/[^\w\s]/gi, ''),
-                                deliveryTimeMinutes: undefined,
-                                hasError: true
-                            };
-                        }
+                        delivery = await deliveryAdapter.calculate(order);
                     }
                     catch (error) {
-                        sails.log.error(`Core > order > delivery calculate fail: `, error);
+                        sails.log.error("deliveryAdapter.calculate error:", error);
+                        delivery = {
+                            allowed: false,
+                            cost: 0,
+                            item: undefined,
+                            message: error.replace(/[^\w\s]/gi, ''),
+                            deliveryTimeMinutes: undefined,
+                            hasError: true
+                        };
                     }
-                    emitter.emit("core:order-after-check-delivery", order);
                 }
-                order.delivery = delivery;
             }
             if (softDeliveryCalculation &&
                 (!order.delivery ||
@@ -1352,6 +1345,7 @@ let Model = {
                 delivery.cost = null;
                 delivery.message = SOFT_DELIVERY_CALCULATION_MESSAGE ?? "Shipping cost cannot be calculated";
             }
+            order.delivery = delivery;
             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
@@ -900,7 +900,7 @@ let Model = {
       };
     }
 
-    if (!order.selfService && !order.delivery?.allowed) {
+    if (!order.selfService && softDeliveryCalculation === false && order.delivery?.allowed === false) {
       throw {
         code: 11,
         error: "Delivery not allowed",
@@ -1587,28 +1587,21 @@ let Model = {
         sails.log.debug(order, delivery)
         if (order.selfService === false && order.address?.city && order.address?.street && order.address?.home) {
           emitter.emit("core:order-check-delivery", order);
+          let delivery: Delivery
           try {
-            let delivery: Delivery
-            try {
-              delivery = await deliveryAdapter.calculate(order);
-            } catch (error) {
-              sails.log.error("deliveryAdapter.calculate error:", error)
-              delivery = {
-                allowed: false,
-                cost: 0,
-                item: undefined,
-                message: error.replace(/[^\w\s]/gi, ''),
-                deliveryTimeMinutes: undefined,
-                hasError: true
-              }
-            }
-
+            delivery = await deliveryAdapter.calculate(order);
           } catch (error) {
-            sails.log.error(`Core > order > delivery calculate fail: `, error)
-          }
-          emitter.emit("core:order-after-check-delivery", order);
+            sails.log.error("deliveryAdapter.calculate error:", error)
+            delivery = {
+              allowed: false,
+              cost: 0,
+              item: undefined,
+              message: error.replace(/[^\w\s]/gi, ''),
+              deliveryTimeMinutes: undefined,
+              hasError: true
+            }
+          }   
         }
-        order.delivery = delivery
       }
 
       if (
@@ -1624,6 +1617,8 @@ let Model = {
         delivery.message = SOFT_DELIVERY_CALCULATION_MESSAGE ?? "Shipping cost cannot be calculated";
       }
 
+      order.delivery = delivery;
+
       if (order.delivery && isValidDelivery(order.delivery, softDeliveryCalculation)) {
         if (!order.delivery.item) {
           order.deliveryCost = order.delivery.cost
@@ -1652,7 +1647,6 @@ let Model = {
 
       order = (await Order.update({ id: order.id }, order).fetch())[0];
 
-
       emitter.emit("core:order-after-count", order);
       return order;
     } catch (error) {