foodbot-cart-calculations 1.0.47 → 1.0.48

package/functions/promotionCalculation.js

@@ -959,49 +959,65 @@ function getFixedPriceProductOffer(cartObject, offer) {
                 var total = 0;
                 var count = 0;
                 var fixedPrice = offer.oo_offer_value;
-
-                offer.offer_products.offer_discount_products = offer.offer_products.offer_discount_products.map(val => 
+                let appliedQty = 0; // track how many quantities discounted
+                let discountedItemIds = new Set(); // track which items already discounted
+                offer.offer_products.offer_discount_products = offer.offer_products.offer_discount_products.map(val =>
                     val.toString().length > 10 ? val : Number(val)
                 );
-                offer.offer_products.package_items = offer.offer_products.package_items.map(x => 
+                offer.offer_products.package_items = offer.offer_products.package_items.map(x =>
                     x.toString().length > 10 ? x : parseInt(x, 10)
                 );  
                 
-                var cartItem = carts;
+               
 
+                // ✅ Sort by price (descending → highest first)
+                carts.sort((a, b) => (parseInt(b.item_price) > parseInt(a.item_price)) ? -1 : 1);
+                var cartItem = JSON.parse(JSON.stringify(carts))
+                
                 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);
-                    if (offer.offer_products.offer_discount_products.includes(itemId) || offer.offer_products.package_items.includes(itemId)) {
+                
+                    if (
+                        (offer.offer_products.offer_discount_products.includes(itemId) ||
+                        offer.offer_products.package_items.includes(itemId))
+                        && !discountedItemIds.has(itemId)
+                    ) {
                         var offerAmount = 0;
                         var singleItemCost = element.item_price;
-
-                        if(singleItemCost >= fixedPrice){
-                            offerAmount = (singleItemCost * element.quantity) - (fixedPrice * element.quantity);
-                        }
-
-                        total = total + parseFloat(offerAmount);
-
-                        carts[ItemIndex].promotion_discount_modifier = parseFloat(offerAmount).toFixed(2);
-                        carts[ItemIndex].promotion_discount = parseFloat(offerAmount).toFixed(2);
-                        carts[ItemIndex].remove = true;
-
-                        if (offerAmount > 0) {
-                            carts[ItemIndex].redeem_promotion_id = offer.offer_id;
-                        } else {
-                            carts[ItemIndex].item_modifiers.map((res) => {
-                                res.promotion_discount = 0;
-                                res.redeem_promotion_id = 0;
-                            });
+                
+                        const maxQty = offer.max_quantity || 1;
+                        let remainingQty = maxQty - appliedQty;
+                        const qtyToDiscount = Math.min(element.quantity, remainingQty);
+                
+                        if (qtyToDiscount > 0 && singleItemCost >= fixedPrice) {
+                            offerAmount = (singleItemCost * qtyToDiscount) - (fixedPrice * qtyToDiscount);
+                            appliedQty += qtyToDiscount;
+                
+                            total += parseFloat(offerAmount);
+                            carts[ItemIndex].promotion_discount_modifier = parseFloat(offerAmount).toFixed(2);
+                            carts[ItemIndex].promotion_discount = parseFloat(offerAmount).toFixed(2);
+                            carts[ItemIndex].remove = true;
+                
+                            if (offerAmount > 0) {
+                                carts[ItemIndex].redeem_promotion_id = offer.offer_id;
+                            } else {
+                                carts[ItemIndex].item_modifiers.map((res) => {
+                                    res.promotion_discount = 0;
+                                    res.redeem_promotion_id = 0;
+                                });
+                            }
+                
+                            if (appliedQty == maxQty) {
+                                discountedItemIds.add(itemId);
+                            }
                         }
-                        count++;
-                    } else {
-                        count++;
                     }
-
+                
+                    count++;
                     if (count == carts.length && carts) {
-                        cartObject.item_details = carts
-                        cartObject.discount = total
+                        cartObject.item_details = carts;
+                        cartObject.discount = total;
                         resolve(cartObject);
                     }
                 });

package/package.json

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