foodbot-cart-calculations 1.0.18 → 1.0.20

package/functions/promotionCalculation.js

@@ -31,12 +31,13 @@ function offerCalculation(carts, offer) {
             if (offer && offer.offer_discount_type && offer.offer_discount_type == 'buy_x_get_y') {
                 getOfferDetails(carts, offer).then(res => {
                     carts = res
+                    console.log("res",res)
                     if (offer && offer.oo_offer_type == 'percentage' && offer.discount_roundoff && offer.discount_roundoff == 1) {
 
                         // offer.oo_offer_types = JSON.parse(JSON.stringify(offer.oo_offer_type))
                         // offer.oo_offer_values = JSON.parse(JSON.stringify(offer.oo_offer_value))
                         offer.oo_offer_type = 'absolute'
-                        offer.oo_offer_value = Math.round(carts.discount)
+                        offer.oo_offer_value = (carts && carts.discount)?Math.round(carts.discount):0
                         getOfferDetails(carts, offer).then(res => {
                             resolve(res)
                         }).catch(error=>{
@@ -452,7 +453,7 @@ function getOfferDetails(carts, offer = []) {
                     reject(error);
                 })
             } else {
-                    resolve({ 'offer_amount': 0, 'amount': '' });
+                    resolve(carts);
             }
         } catch (error) {
             reject(error)
@@ -477,7 +478,7 @@ function getBuyxGetYOnCondition(descending, cartData, offer,total,buyItemAmount,
         }
       });
 
-      console.log("bbbbbbbbbbbbbbbbbbbb",buyItems)
+    
   
       const totalCount = parseInt(offer.offer_products.get_item_count) + parseInt(offer.offer_products.buy_item_count);
       if (buyItems && parseInt(buyItems.length) >= parseInt(offer.offer_products.buy_item_count) && desc.length > 1 && descending.length >= totalCount) {
@@ -489,22 +490,22 @@ function getBuyxGetYOnCondition(descending, cartData, offer,total,buyItemAmount,
           if (desc[i].buy && buyCount < offer.offer_products.buy_item_count && buyCount != offer.offer_products.buy_item_count) {
             buyCount++;
             desc1[i].remove = true;
-            buyArray.push(desc[i].item_id);
+            // buyItemss.push(desc[i].item_id);
           } else if (desc[i] && desc[i].get && getCount < offer.offer_products.get_item_count && getCount != offer.offer_products.get_item_count) {
             let amt = 0;
             let amtWithModi = 0;
-            getArray.push(desc[i].item_id);
+            // getArray.push(desc[i].item_id);
   
             let itemIndex = -1;
             if (desc[i]) itemIndex = carts.findIndex(obj => obj.item_id == desc[i].item.item_id && !obj.discount_status);
             if (itemIndex == -1) itemIndex = carts.findIndex(obj => obj.item_id == desc[i].item.item_id);
 
-            console.log("item index",itemIndex)
+           
   
             if (offer.oo_offer_type === "percentage") {
               let itemTotalDiscount = 0;
               itemAmount = (parseFloat(desc[i].item.item_price) * parseFloat(offer.oo_offer_value)) / 100;
-  
+              buyItemAmount = itemAmount
               itemTotalDiscount += itemAmount;
               amt += itemAmount;
               amtWithModi = amt;
@@ -545,9 +546,11 @@ function getBuyxGetYOnCondition(descending, cartData, offer,total,buyItemAmount,
               carts[itemIndex].discount_status = true;
               total = total + amtWithModi;
               carts[itemIndex].redeem_promotion_id = offer.offer_id;
+              
             }
             getCount++;
             desc1[i].remove = true;
+            cartData.totalDiscount =  total;
           }
 
 
@@ -583,7 +586,7 @@ function getBuyxGetYOnCondition(descending, cartData, offer,total,buyItemAmount,
           
             if(i == desc.length -1){
               
-                cartData.discount = cartData.totalDiscount
+                cartData.discount = cartData.totalDiscount?cartData.totalDiscount:0;
                 resolve(cartData);
             }
            
@@ -613,12 +616,14 @@ function getBuyxGetYOnCondition(descending, cartData, offer,total,buyItemAmount,
 function getAbsoluteDiscount(cartObject, offer, buyItemss, buyItemAmount,total) {
     return new Promise(function (resolve, reject) {
         try {
+            console.log("ooooooooooooooo",JSON.parse(JSON.stringify(offer)))
             let offerAmount = offer.oo_offer_value;
             let singlePriceDiscount = offerAmount / buyItemAmount;
             singlePriceDiscount = parseFloat(singlePriceDiscount).toFixed(6);
             let remaningOfferAmount = offer.oo_offer_value;
             let count = 0;
             let carts = cartObject.item_details;
+            console.log("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",buyItemss,total)
             if(buyItemss && buyItemss.length>0){
                 buyItemss.forEach((element, buyIndex) => {
                     let itemAmount = 0;
@@ -630,8 +635,10 @@ function getAbsoluteDiscount(cartObject, offer, buyItemss, buyItemAmount,total)
                     if (itemIndex == -1) itemIndex = carts.findIndex((obj) => {
                         return obj.item_id == element.item_id;
                     });
+
+                    console.log("carts index",carts,itemIndex)
     
-                    if (!carts[itemIndex].promotion_discount_modifier) carts[itemIndex].promotion_discount_modifier = 0;
+                    if ( !carts[itemIndex].promotion_discount_modifier) carts[itemIndex].promotion_discount_modifier = 0;
     
                     if (element.item_modifiers && element.item_modifiers.length > 0 && offer.offer_products.order_modifiercost_use == 1) {
                         let modiCount = 0;
@@ -676,6 +683,7 @@ function getAbsoluteDiscount(cartObject, offer, buyItemss, buyItemAmount,total)
                     carts[itemIndex].discount_applied = true;
     
                     if (buyItemss[buyItemss.length - 1].item_id == element.item_id) {
+                        console.log("innnn ifffffffffffff",element.item_price,remaningOfferAmount)
     
                         itemAmount = (element.item_price < remaningOfferAmount) ? element.item_price : parseFloat(remaningOfferAmount).toFixed(2);
                     } else {
@@ -683,6 +691,7 @@ function getAbsoluteDiscount(cartObject, offer, buyItemss, buyItemAmount,total)
                     }
     
                     itemAmount = parseFloat(itemAmount);
+                    console.log("iiiiiiiiii",itemAmount)
                     total = parseFloat(total) + parseFloat(itemAmount);
                     total = parseFloat(total).toFixed(2);
                     itemTotalDiscount = parseFloat(itemTotalDiscount) + parseFloat(itemAmount);
@@ -693,10 +702,10 @@ function getAbsoluteDiscount(cartObject, offer, buyItemss, buyItemAmount,total)
                     carts[itemIndex].redeem_promotion_id = offer.offer_id;
     
                     if (count == buyItemss.length) {
+                        console.log("ttttttttttttttt",total)
                         cartObject.item_details = carts
                         cartObject.discount = total
-    
-    
+
                         resolve(cartObject);
                     }
                 });

package/package.json

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