foodbot-cart-calculations 1.0.2-dev.1 → 1.0.3-dev.1

package/functions/promotionCalculation.js

@@ -968,39 +968,37 @@ function getFixedPriceProductOffer(cartObject, offer) {
                     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) => {
-                    // console.log(discountedItemIds);
-                    // console.log(appliedQty);
                     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);
-                    // console.log(!discountedItemIds.has(itemId) );
+                
                     if (
                         (offer.offer_products.offer_discount_products.includes(itemId) ||
                         offer.offer_products.package_items.includes(itemId))
-                        && !discountedItemIds.has(itemId) // allow only first occurrence
+                        && !discountedItemIds.has(itemId)
                     ) {
                         var offerAmount = 0;
                         var singleItemCost = element.item_price;
-                        // :white_tick: Apply max_quantity limit
+                
                         const maxQty = offer.max_quantity || 1;
                         let remainingQty = maxQty - appliedQty;
                         const qtyToDiscount = Math.min(element.quantity, remainingQty);
+                
                         if (qtyToDiscount > 0 && singleItemCost >= fixedPrice) {
-                            if (singleItemCost >= fixedPrice) {
-                                offerAmount = (singleItemCost * qtyToDiscount) - (fixedPrice * qtyToDiscount);
-                            }
-                            console.log(offerAmount)
-                            appliedQty += qtyToDiscount; // increase total discounted qty
-                            // discountedItemIds.add(itemId); // mark this item as already discounted
-                            // if(singleItemCost >= fixedPrice){
-                            //     offerAmount = (singleItemCost * element.quantity) - (fixedPrice * element.quantity);
-                            // }
-                            total = total + parseFloat(offerAmount);
+                            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 {
@@ -1009,16 +1007,17 @@ function getFixedPriceProductOffer(cartObject, offer) {
                                     res.redeem_promotion_id = 0;
                                 });
                             }
-                            // :white_tick: only add to discountedItemIds if FULL item.quantity was used
+                
                             if (appliedQty == maxQty) {
                                 discountedItemIds.add(itemId);
                             }
                         }
                     }
+                
                     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.2-dev.1",
+  "version": "1.0.3-dev.1",
   "description": "Package for cart calculations in which it performs discount distribution and tax distribution on order",
   "main": "index.js",
   "scripts": {