0047976: Error in promotions in the version 18Q3

diff --git a/web/org.openbravo.retail.discounts.bytotal/js/promotion-by-total-utils.js b/web/org.openbravo.retail.discounts.bytotal/js/promotion-by-total-utils.js
index 676f212..3c9806e 100644
--- a/web/org.openbravo.retail.discounts.bytotal/js/promotion-by-total-utils.js
+++ b/web/org.openbravo.retail.discounts.bytotal/js/promotion-by-total-utils.js
@@ -55,6 +55,14 @@ OB.Model.Discounts.DISCT = {
           linesToCompute = [],
           promotionCandidates, ret, isFreeProduct = OB.Model.Discounts.DISCT.isFreeProduct(checkingLine.get('product'), freeProducts);
 
+      function checkReceiptConsumedForFreeProduct(receipt, discountRule) {
+        var receiptConsumed = receipt.get('receiptConsumedForFreeProduct') || false;
+        if (!receiptConsumed || (receiptConsumed && discountRule.get('applyNext'))) {
+          receipt.set('receiptConsumedForFreeProduct', true);
+          return true;
+        }
+        return false;
+      }
 
       function getDiscountedLinePrice(line) {
         // discounted price should be set in line.discountedLinePrice, but we cannot trust
@@ -123,6 +131,10 @@ OB.Model.Discounts.DISCT = {
           return; //continue
         }
 
+        if (discountRule.get('discountType') === '4755A35B4DA34F6CB08F15462BA123CF' && !isFreeProduct && !checkReceiptConsumedForFreeProduct(receipt, discountRule)) {
+          return; //continue
+        }
+
         linePrice = getDiscountedLinePrice(l);
 
         // total for PIT includes taxes and for no PIT does not
diff --git a/web/org.openbravo.retail.discounts.bytotal/js/promotion-freeitemstotal.js b/web/org.openbravo.retail.discounts.bytotal/js/promotion-freeitemstotal.js
index 8c88a8c..d0e81a9 100644
--- a/web/org.openbravo.retail.discounts.bytotal/js/promotion-freeitemstotal.js
+++ b/web/org.openbravo.retail.discounts.bytotal/js/promotion-freeitemstotal.js
@@ -15,6 +15,13 @@ OB.Model.Discounts.discountRules['4755A35B4DA34F6CB08F15462BA123CF'] = {
   async: true,
   discountedUnits: {},
   implementation: function (discountRule, receipt, line, listener) {
+    OB.MobileApp.model.receipt.off('calculatedReceipt', null, OB.Model.Discounts.discountRules['4755A35B4DA34F6CB08F15462BA123CF']);
+    OB.MobileApp.model.receipt.on('calculatedReceipt', function () {
+      OB.Model.Discounts.discountRules['4755A35B4DA34F6CB08F15462BA123CF'].discountedUnits = {};
+      OB.MobileApp.model.receipt.unset('receiptConsumedForFreeProduct');
+      receipt.off('calculatedReceipt', null, OB.Model.Discounts.discountRules['4755A35B4DA34F6CB08F15462BA123CF'].removeDiscountedUnits);
+    }, OB.Model.Discounts.discountRules['4755A35B4DA34F6CB08F15462BA123CF']);
+
     if (!OB.Model.Discounts.DISCT.doProcess()) {
       // nothing to do for now
       listener.trigger('completed');
@@ -52,7 +59,7 @@ OB.Model.Discounts.discountRules['4755A35B4DA34F6CB08F15462BA123CF'] = {
 
             fp = OB.Model.Discounts.DISCT.isFreeProduct(l.get('product'), freeProducts);
             if (fp) {
-              fpId = fp.get('product');
+              fpId = fp.get('product') + '-' + discountRule.id;
 
               // a product can be in more than one line, keep count of how many units
               // have already been discounted
@@ -65,7 +72,7 @@ OB.Model.Discounts.discountRules['4755A35B4DA34F6CB08F15462BA123CF'] = {
               dr.discountedUnits[fpId] += unitsToDiscount;
 
               _.each(l.get('promotions'), function (p) {
-                if (p.discountType === discountRule.get('discountType')) {
+                if (p.ruleId === discountRule.get('ruleId')) {
                   discountApplied = true;
                   return;
                 }

diff --git a/web/org.openbravo.retail.discounts.bytotal/js/promotion-freeitemstotal.js b/web/org.openbravo.retail.discounts.bytotal/js/promotion-freeitemstotal.js
index 8c88a8c..c4f4d9e 100644
--- a/web/org.openbravo.retail.discounts.bytotal/js/promotion-freeitemstotal.js
+++ b/web/org.openbravo.retail.discounts.bytotal/js/promotion-freeitemstotal.js
@@ -21,6 +21,14 @@ OB.Model.Discounts.discountRules['4755A35B4DA34F6CB08F15462BA123CF'] = {
       return;
     }
 
+    OB.MobileApp.model.receipt.off('calculatedReceipt', null, OB.Model.Discounts.discountRules['4755A35B4DA34F6CB08F15462BA123CF']);
+    OB.MobileApp.model.receipt.on('calculatedReceipt', function () {
+      OB.Model.Discounts.discountRules['4755A35B4DA34F6CB08F15462BA123CF'].discountedUnits = {};
+      OB.MobileApp.model.receipt.unset('receiptConsumedForFreeProduct');
+      receipt.off('calculatedReceipt', null, OB.Model.Discounts.discountRules['4755A35B4DA34F6CB08F15462BA123CF']);
+    }, OB.Model.Discounts.discountRules['4755A35B4DA34F6CB08F15462BA123CF']);
+
+
     OB.Dal.find(OB.Model.FreeProduct, {
       'promotionDiscount': discountRule.get('id')
     }, function (freeProducts) {
@@ -32,6 +40,9 @@ OB.Model.Discounts.discountRules['4755A35B4DA34F6CB08F15462BA123CF'] = {
           // total is bigger than min, let's check if there are free items
           // in the ticket to apply the promo
           for (i = 0; i < preprocess.linesToCompute.length; i++) {
+            if (receipt.get('receiptConsumedForFreeProduct')) {
+              break;
+            }
             if (OB.Model.Discounts.DISCT.isFreeProduct(preprocess.linesToCompute[i].line.get('product'), freeProducts) && (preprocess.total - preprocess.linesToCompute[i].total >= discountRule.get('disctTotalreceipt'))) {
               shouldApply = true;
               break;
@@ -52,7 +63,7 @@ OB.Model.Discounts.discountRules['4755A35B4DA34F6CB08F15462BA123CF'] = {
 
             fp = OB.Model.Discounts.DISCT.isFreeProduct(l.get('product'), freeProducts);
             if (fp) {
-              fpId = fp.get('product');
+              fpId = fp.get('product') + '-' + discountRule.id
 
               // a product can be in more than one line, keep count of how many units
               // have already been discounted
@@ -76,6 +87,7 @@ OB.Model.Discounts.discountRules['4755A35B4DA34F6CB08F15462BA123CF'] = {
                 receipt.addPromotion(l, discountRule, {
                   amt: OB.DEC.mul(l.get('discountedLinePrice') || l.get('price'), unitsToDiscount)
                 });
+                receipt.set('receiptConsumedForFreeProduct', true);
               }
             }
           });

diff --git a/web/org.openbravo.retail.discounts.bytotal/js/promotion-by-total-utils.js b/web/org.openbravo.retail.discounts.bytotal/js/promotion-by-total-utils.js
index 676f212..1be7331 100644
--- a/web/org.openbravo.retail.discounts.bytotal/js/promotion-by-total-utils.js
+++ b/web/org.openbravo.retail.discounts.bytotal/js/promotion-by-total-utils.js
@@ -60,6 +60,8 @@ OB.Model.Discounts.DISCT = {
         // discounted price should be set in line.discountedLinePrice, but we cannot trust
         // all rules correctly set this info
         var price;
+        var qty = line.getQty();
+        var qtyUsed = 0;
 
         line.calculateGross();
         // in PIT discounts are applied to gross
@@ -81,7 +83,15 @@ OB.Model.Discounts.DISCT = {
               price = OB.DEC.sub(price, (p.amt || 0));
             }
           }
+          qtyUsed = OB.DEC.add(qtyUsed, p.qtyOfferReserved || 0);
         });
+        if (qtyUsed === 0) {
+          price = price || 0;
+        } else if (qtyUsed === line.getQty()) {
+          price = 0;
+        } else {
+          price = OB.DEC.div(OB.DEC.mul(qtyUsed, price), qty)
+        }
         return {
           price: price
         };
@@ -125,6 +135,10 @@ OB.Model.Discounts.DISCT = {
 
         linePrice = getDiscountedLinePrice(l);
 
+        if (linePrice.price <= 0) {
+          return; //continue
+        }
+
         // total for PIT includes taxes and for no PIT does not
         total = OB.DEC.add(total, linePrice.price);
 
diff --git a/web/org.openbravo.retail.discounts.bytotal/js/promotion-freeitemstotal.js b/web/org.openbravo.retail.discounts.bytotal/js/promotion-freeitemstotal.js
index 8c88a8c..076331d 100644
--- a/web/org.openbravo.retail.discounts.bytotal/js/promotion-freeitemstotal.js
+++ b/web/org.openbravo.retail.discounts.bytotal/js/promotion-freeitemstotal.js
@@ -21,6 +21,13 @@ OB.Model.Discounts.discountRules['4755A35B4DA34F6CB08F15462BA123CF'] = {
       return;
     }
 
+    OB.MobileApp.model.receipt.off('calculatingReceipt', null, OB.Model.Discounts.discountRules['4755A35B4DA34F6CB08F15462BA123CF']);
+    OB.MobileApp.model.receipt.on('calculatingReceipt', function () {
+      OB.Model.Discounts.discountRules['4755A35B4DA34F6CB08F15462BA123CF'].discountedUnits = {};
+      receipt.off('calculatingReceipt', null, OB.Model.Discounts.discountRules['4755A35B4DA34F6CB08F15462BA123CF']);
+    }, OB.Model.Discounts.discountRules['4755A35B4DA34F6CB08F15462BA123CF']);
+
+
     OB.Dal.find(OB.Model.FreeProduct, {
       'promotionDiscount': discountRule.get('id')
     }, function (freeProducts) {
@@ -49,10 +56,9 @@ OB.Model.Discounts.discountRules['4755A35B4DA34F6CB08F15462BA123CF'] = {
             var unitsToDiscount, fp, fpId, l = lc.line,
                 discountApplied = false;
 
-
             fp = OB.Model.Discounts.DISCT.isFreeProduct(l.get('product'), freeProducts);
             if (fp) {
-              fpId = fp.get('product');
+              fpId = fp.get('product') + '-' + discountRule.id
 
               // a product can be in more than one line, keep count of how many units
               // have already been discounted

diff --git a/web/org.openbravo.retail.posterminal/js/model/discounts.js b/web/org.openbravo.retail.posterminal/js/model/discounts.js
index deba322a4..c45fe8e44 100644
--- a/web/org.openbravo.retail.posterminal/js/model/discounts.js
+++ b/web/org.openbravo.retail.posterminal/js/model/discounts.js
@@ -60,9 +60,6 @@
         });
         receipt.trigger('applyPromotionsFinished');
       }
-      if (OB.Model.Discounts.discountRules['4755A35B4DA34F6CB08F15462BA123CF']) {
-        OB.Model.Discounts.discountRules['4755A35B4DA34F6CB08F15462BA123CF'].discountedUnits = {};
-      }
     },
     applyPromotionsLat: function (receipt, line) {
       var me = this;