0036851: Pack discount is not working with Non-Grouped products

# HG changeset patch
# User Rafael Queralta Pozo <rqueralta@nauta.cu>
# Date 1506544768 14400
#      Wed Sep 27 16:39:28 2017 -0400
# Node ID d24e3e329feaa4aec0a654c377ee7aafa0bce5cc
# Parent  fea6ee8c2ca93cddb1dbe4cb0c75cd1a5dbb72e1
Fixed issue 36851: Pack discount is not working with Non-Grouped products

diff --git a/web/org.openbravo.retail.discounts/js/promotion-pack.js b/web/org.openbravo.retail.discounts/js/promotion-pack.js
--- a/web/org.openbravo.retail.discounts/js/promotion-pack.js
+++ b/web/org.openbravo.retail.discounts/js/promotion-pack.js
@@ -7,7 +7,7 @@
  ************************************************************************************
  */
 
-/*global OB, Backbone, console */
+/*global OB, _, Backbone, console */
 
 // Pack
 OB.Model.Discounts.discountRules.BE5D42E554644B6AA262CCB097753951 = {
@@ -15,7 +15,7 @@
   implementation: function (discountRule, receipt, line, listener, candidates) {
     var applyingToLines = new Backbone.Collection(),
         criteria, promotionCandidates = line.get('promotionCandidates') || [],
-        finalAmt, totalAmtCombo, lineNum, previousAmt, i;
+        finalAmt, totalAmtCombo, lineNum, previousAmt, i, receiptProducts = {};
 
     // Query local DB to know detail about the rule (products and quantities) 
     criteria = {
@@ -42,7 +42,19 @@
         }
       });
 
-      if (applyingToLines.length !== products.length) {
+      applyingToLines.forEach(function (l) {
+        if (receiptProducts[l.get('product').id]) {
+          receiptProducts[l.get('product').id].lines.push(l);
+          receiptProducts[l.get('product').id].qty += l.getQty();
+        } else {
+          receiptProducts[l.get('product').id] = {
+            lines: [l],
+            qty: l.getQty()
+          };
+        }
+      });
+
+      if (_.size(receiptProducts) !== products.length) {
         // rule can't be applied because not all products are matched
         listener.trigger('completed');
         return;
@@ -66,7 +78,7 @@
           return;
         }
         product.set('receiptLine', line);
-        applyNtimes = Math.floor(line.get('qty') / (product.get('obdiscQty') || 1));
+        applyNtimes = Math.floor(receiptProducts[line.get('product').id].qty / (product.get('obdiscQty') || 1));
         if (!chunks || applyNtimes < chunks) {
           chunks = applyNtimes;
         }
@@ -91,12 +103,12 @@
 
       totalAmt = products.reduce(function (total, product) {
         var l = product.get('receiptLine');
-        return OB.DEC.add(total, OB.DEC.mul(l.get('qty'), l.get('discountedLinePrice') || l.get('price')));
+        return OB.DEC.add(total, OB.DEC.mul(receiptProducts[l.get('product').id].qty, l.get('discountedLinePrice') || l.get('price')));
       }, OB.DEC.Zero);
 
       outOfComboAmt = products.reduce(function (total, product) {
         var l = product.get('receiptLine'),
-            unitsOutOfCombo = l.get('qty') - (chunks * (product.get('obdiscQty') || 1));
+            unitsOutOfCombo = receiptProducts[l.get('product').id].qty - (chunks * (product.get('obdiscQty') || 1));
 
         return OB.DEC.add(total, OB.DEC.mul(unitsOutOfCombo, l.get('discountedLinePrice') || l.get('price')));
       }, OB.DEC.Zero);
@@ -116,17 +128,19 @@
           // discountRuleLine = discountRule.clone();
           lineNum += 1;
           if (lineNum < products.length) {
-            actualAmt = OB.DEC.div(OB.DEC.mul(OB.DEC.mul(product.get('obdiscQty') * chunks || l.get('qty'), price), promotionAmt), (totalAmtCombo));
-            previousAmt += actualAmt;
+            actualAmt = OB.DEC.div(OB.DEC.mul(OB.DEC.mul(((l.get('product').get('groupProduct')) ? product.get('obdiscQty') : l.get('qty')) * chunks || l.get('qty'), price), promotionAmt), (totalAmtCombo));
+            previousAmt += (l.get('product').get('groupProduct')) ? actualAmt : OB.DEC.mul(actualAmt, receiptProducts[l.get('product').id].qty);
           } else {
             // last line with discount: calculate discount based on pending amt to be discounted
             actualAmt = OB.DEC.sub(promotionAmt, previousAmt);
           }
           discountRule.set('qtyOffer', OB.DEC.toNumber(product.get('obdiscQty') || 1) * chunks);
-          receipt.addPromotion(l, discountRule, {
-            amt: actualAmt,
-            pack: true,
-            chunks: chunks
+          _.each(receiptProducts[l.get('product').id].lines, function (lp) {
+            receipt.addPromotion(lp, discountRule, {
+              amt: actualAmt,
+              pack: true,
+              chunks: chunks
+            });
           });
         });
       }