foodbot-cart-calculations 1.0.40 → 1.0.42

package/calculations.js

@@ -7,8 +7,14 @@ function applyDistribution(body) {
             body.discount = 0
             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).then(final => {
+                promoCalculation.offerCalculation(res, promotion, deliveryCost).then(final => {
 
                     let taxSettings = (body.tax_settings && body.tax_settings.length > 0) ? body.tax_settings : []
                     let taxType = (body.tax_type) ? body.tax_type : 1
@@ -67,8 +73,14 @@ function applyDistribution(body) {
                                 mainCart.cash_expected = parseFloat(taxData.cartTotal) + parseFloat(taxData.tax_amount);
                             }
                             mainCart.order_items = taxData
-                          
-                            let delivery_cost = body.delivery_cost?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;
                           
                             //we took 2 value because in case of absolute we use tipValue

package/functions/promotionCalculation.js

@@ -1,4 +1,4 @@
-function offerCalculation(carts, offer) {
+function offerCalculation(carts, offer, deliveryCost = 0) {
     return new Promise(function (resolve, reject) {
         try {
             carts.total = 0
@@ -88,6 +88,12 @@ function offerCalculation(carts, offer) {
                 }).catch(error => {
                     reject(error);
                 })
+            } else if (offer && offer.offer_discount_type && offer.offer_discount_type == 'free_delivery') {
+                getFreeDeliveryOffer(carts, offer, deliveryCost).then(free => {
+                    resolve(free)
+                }).catch(error => {
+                    reject(error);
+                })
             } else {
                 carts.discount = 0
                 resolve(carts)
@@ -1011,6 +1017,37 @@ function getFixedPriceProductOffer(cartObject, offer) {
     }
 };
 
+function getFreeDeliveryOffer(cartObject, offer, deliveryCost = 0) {
+    return new Promise((resolve, reject) => {
+        try {
+            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;
+                cartObject.delivery_discount = 0;
+                cartObject.is_delivery_discount = false;
+            }
+
+            resolve(cartObject); // Return updated cartObject
+        } catch (error) {
+            reject(error);
+        }
+    });
+}
+
 function setPackageDefaultDiscount(cart) {
     return new Promise(async (resolve, reject) => {
         try {

package/package.json

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