diff --git a/models/Order.js b/models/Order.js index fdea7743..5111b73c 100644 --- a/models/Order.js +++ b/models/Order.js @@ -1316,10 +1316,8 @@ let Model = { else { let deliveryAdapter = await Adapter.getDeliveryAdapter(); await deliveryAdapter.reset(order); - 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 { delivery = await deliveryAdapter.calculate(order); } diff --git a/models/Order.ts b/models/Order.ts index 18f068dd..2542f485 100644 --- a/models/Order.ts +++ b/models/Order.ts @@ -1584,10 +1584,8 @@ let Model = { } else { let deliveryAdapter = await Adapter.getDeliveryAdapter(); await deliveryAdapter.reset(order); - 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 { delivery = await deliveryAdapter.calculate(order); } catch (error) { @@ -1616,9 +1614,9 @@ 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