foodbot-cart-calculations 1.0.41 → 1.0.43

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

@@ -143,18 +143,19 @@ function getCategorySpeificOffer(carts, offer) {
 
                     let foundItemsSum = 0
                     carts.item_details.filter((res) => {
-                        let itemId = res.item_id.toString().length > 10 ? res.item_id : parseInt(res.item_id);
-                        if (!res.event && (offer.offer_discount_type == 'manual' || (offer.offer_products.offer_discount_products.includes(itemId) && res.isPackage == 0) || (offer.offer_products.package_items.includes(itemId) && res.isPackage == 1))) {
-
-                            foundItemsSum = foundItemsSum + res.item_price_with_modifier * res.quantity
-                            return foundItemsSum
+                        if(!res.purchase_points){
+                            let itemId = res.item_id?.toString().length > 10 ? res.item_id : parseInt(res.item_id);
+                            if (!res.event && (offer.offer_discount_type == 'manual' || (offer.offer_products.offer_discount_products.includes(itemId) && res.isPackage == 0) || (offer.offer_products.package_items.includes(itemId) && res.isPackage == 1))) {
+                                foundItemsSum = foundItemsSum + res.item_price_with_modifier * res.quantity
+                                return foundItemsSum
+                            }
                         }
                     })
 
                     let offerAmount = (offer.oo_offer_value <= foundItemsSum) ? offer.oo_offer_value : foundItemsSum;
                     let remaningOfferAmount = offerAmount
                     carts.item_details.forEach((element, index) => {
-                        let itemId = element.item_id.toString().length > 10 ? element.item_id : parseInt(element.item_id);
+                        let itemId = element.item_id?.toString().length > 10 ? element.item_id : parseInt(element.item_id);
                         if (!element.event && (offer.offer_discount_type == 'manual' || (offer.offer_products.offer_discount_products.includes(itemId) && element.isPackage == 0) || (offer.offer_products.package_items.includes(itemId) && element.isPackage == 1))) {
                             var itemAmount = 0;
 
@@ -749,7 +750,7 @@ function addItemQuantity(items, offer) {
                 item.toString().length > 10 ? item : parseInt(item, 10)
             );
             items.forEach(function (element) {
-                let itemId = element.item_id.toString().length > 10 ? element.item_id : parseInt(element.item_id);
+                let itemId = element.item_id?.toString().length > 10 ? element.item_id : parseInt(element.item_id);
                 if (offer.offer_products.offer_buy_products.includes(itemId) || offer.offer_products.offer_get_products.includes(itemId)) {
                     for (var i = 1; i <= element.quantity; i++) {
                         if (offer.offer_products.order_modifiercost_use == 1) {
@@ -849,7 +850,7 @@ function getFreeProductOffer(cartObject, offer) {
                 cartItem.forEach((element, index) => {
                     var ItemIndex = carts.findIndex((x) => x.item_id == element.item_id && !x.remove);
 
-                    let itemId = element.item_id.toString().length > 10 ? element.item_id : parseInt(element.item_id);
+                    let itemId = element.item_id?.toString().length > 10 ? element.item_id : parseInt(element.item_id);
                     if (offer.offer_products.offer_discount_products.includes(itemId)) {
                         var offerAmount = 0;
                         let costWithOutModifier = 0;
@@ -971,7 +972,7 @@ function getFixedPriceProductOffer(cartObject, offer) {
 
                 cartItem.forEach((element, index) => {
                     var ItemIndex = carts.findIndex((x) => x.item_id == element.item_id && !x.remove);
-                    let itemId = element.item_id.toString().length > 10 ? element.item_id : parseInt(element.item_id);
+                    let itemId = element.item_id?.toString().length > 10 ? element.item_id : parseInt(element.item_id);
                     if (offer.offer_products.offer_discount_products.includes(itemId) || offer.offer_products.package_items.includes(itemId)) {
                         var offerAmount = 0;
                         var singleItemCost = element.item_price;
@@ -1018,23 +1019,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) => {
@@ -1051,7 +1064,9 @@ function setPackageDefaultDiscount(cart) {
                         let itemTotal = 0;
                         if (item.package_items && item.package_items.length > 0) {
                             item.package_items.forEach(function (v) {
-                                itemTotal += (item.quantity * v.price);
+                                //this commemted code is sceniore when user can also increas item quantity i think which is wrong
+                                // itemTotal += ((item.quantity * v.quantity) * v.price);
+                                itemTotal += (item.quantity  * v.price);
                             })
                             let packagePrice = item.quantity * item.item_price;
                             let totalDiscount = (packagePrice < itemTotal) ? (parseFloat(itemTotal) - parseFloat(packagePrice)).toFixed(2) : 0;
@@ -1089,10 +1104,11 @@ function distributeDiscount(packageItems, totalDiscount, itemTotal, quantity) {
             let totalApplied = 0;
             let singleUnit = (quantity * parseFloat(totalDiscount) / parseFloat(itemTotal)).toFixed(2);
             for (const [index, item] of packageItems.entries()) {
+                //this commemted code is sceniore when user can also increas item quantity i think which is wrong
+                // let discountPerItem = (parseFloat(singleUnit) * (parseInt(item.quantity) * parseFloat(item.price))).toFixed(2);
                 let discountPerItem = (parseFloat(singleUnit) * parseFloat(item.price)).toFixed(2);
                 totalApplied = (parseFloat(totalApplied) + parseFloat(discountPerItem)).toFixed(2);
                 item.default_combo_discount = parseFloat(discountPerItem).toFixed(2);
-
                 if (index == packageItems.length - 1) {
 
                     let remaningOfferAmount = (parseFloat(totalDiscount) - parseFloat(totalApplied)).toFixed(2);

package/package.json

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