add soft delivery calculation

webresto · Aug 24, 2024 · 3eeb18f · 3eeb18f
1 parent 2e98edc
commit 3eeb18f
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 24 deletions.
diff --git a/models/Order.js b/models/Order.js
@@ -689,19 +689,21 @@ let Model = {
             emitter.emit("core:order-is-self-service", order, customer, isSelfService, address);
         }
         else {
-            order.selfService = false;
-            if (address) {
-                if (!address.city)
-                    address.city = await Settings.get("CITY");
-                checkAddress(address);
-                order.address = { ...address };
-            }
-            else {
-                if (!isSelfService && order.address === null) {
-                    throw {
-                        code: 5,
-                        error: "address is required",
-                    };
+            if (!await Settings.get("SOFT_DELIVERY_CALCULATION")) {
+                order.selfService = false;
+                if (address) {
+                    if (!address.city)
+                        address.city = await Settings.get("CITY");
+                    checkAddress(address);
+                    order.address = { ...address };
+                }
+                else {
+                    if (!isSelfService && order.address === null) {
+                        throw {
+                            code: 5,
+                            error: "address is required",
+                        };
+                    }
                 }
             }
         }

diff --git a/models/Order.ts b/models/Order.ts
@@ -861,17 +861,19 @@ let Model = {
       order.selfService = true;
       emitter.emit("core:order-is-self-service", order, customer, isSelfService, address);
     } else {
-      order.selfService = false;
-      if (address) {
-        if (!address.city) address.city = await Settings.get("CITY")
-        checkAddress(address);
-        order.address = { ...address };
-      } else {
-        if (!isSelfService && order.address === null) {
-          throw {
-            code: 5,
-            error: "address is required",
-          };
+      if(!await Settings.get("SOFT_DELIVERY_CALCULATION")) {
+        order.selfService = false;
+        if (address) {
+          if (!address.city) address.city = await Settings.get("CITY")
+          checkAddress(address);
+          order.address = { ...address };
+        } else {
+          if (!isSelfService && order.address === null) {
+            throw {
+              code: 5,
+              error: "address is required",
+            };
+          }
         }
       }
     }