foodbot-cart-calculations 1.0.41 → 1.0.42

package/calculations.js

@@ -8,6 +8,11 @@ function applyDistribution(body) {
             let mainCart = body
             let promotion = (body.promotion_applied && body.promotion_applied) ? body.promotion_applied : {};
             let deliveryCost = (body.delivery_cost && body.delivery_cost) ? body.delivery_cost : 0;
+            
+            if(body?.order_items?.delivery_discount)
+                body.order_items.delivery_discount = 0
+                body.order_items.is_delivery_discount = false
+
             promoCalculation.setPackageDefaultDiscount(body.order_items).then(res => {
                 promoCalculation.offerCalculation(res, promotion, deliveryCost).then(final => {
 
@@ -69,11 +74,11 @@ function applyDistribution(body) {
                             }
                             mainCart.order_items = taxData
                             
-                            let delivery_cost = body.delivery_cost?body.delivery_cost:0;
-                            
-                            if(final.is_delivery_discount){
-                                delivery_cost = 0;
-                                body.delivery_cost = 0
+                            let delivery_cost = body.delivery_cost ? body.delivery_cost : 0;
+                            // Adjust delivery cost based on delivery discount
+                            if (final.is_delivery_discount) {
+                                delivery_cost = Math.max(0, delivery_cost - final.delivery_discount); 
+                                body.delivery_cost = delivery_cost; // Update body accordingly
                             }
 
                             let service_amount = body.service_amount?body.service_amount:0;

package/functions/promotionCalculation.js

@@ -1018,23 +1018,35 @@ function getFixedPriceProductOffer(cartObject, offer) {
 };
 
 function getFreeDeliveryOffer(cartObject, offer, deliveryCost = 0) {
-    return new Promise(function (resolve, reject) {
+    return new Promise((resolve, reject) => {
         try {
-            if(cartObject.total >= offer.oo_min_amount){
-                cartObject.discount = 0
-                cartObject.delivery_discount = deliveryCost;
+            let discountRoundOff = offer.discount_roundoff; // 1 = Round off, 0 = No rounding
+            let deliveryDiscount = 0; // Default
+
+            if (cartObject.total >= offer.oo_min_amount && offer.oo_offer_type == 'percentage' && offer.oo_offer_value > 0) {
+                // Calculate discount as a percentage of delivery cost
+                deliveryDiscount = (deliveryCost * offer.oo_offer_value) / 100;
+                
+                // Apply rounding if discountRoundOff is 1
+                if (discountRoundOff == 1) {
+                    deliveryDiscount = Math.round(deliveryDiscount);
+                }
+
+                cartObject.discount = 0;
+                cartObject.delivery_discount = deliveryDiscount;
                 cartObject.is_delivery_discount = true;
-            }else{
-                cartObject.discount = 0
+            } else {
+                cartObject.discount = 0;
                 cartObject.delivery_discount = 0;
                 cartObject.is_delivery_discount = false;
             }
-            resolve(cartObject); // Resolve the promise with updated cartObject
+
+            resolve(cartObject); // Return updated cartObject
         } catch (error) {
-            reject(error)
+            reject(error);
         }
-    })
-};
+    });
+}
 
 function setPackageDefaultDiscount(cart) {
     return new Promise(async (resolve, reject) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foodbot-cart-calculations",
-  "version": "1.0.41",
+  "version": "1.0.42",
   "description": "Package for cart calculations in which it performs discount distribution and tax distribution on order",
   "main": "index.js",
   "scripts": {