0040812: If a manual discount is applied to an order, it is not possible to apply it again. It will remain the first discount

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1558417819 -19800
#      Tue May 21 11:20:19 2019 +0530
# Node ID 951b286e769d12530841ea6e65828e9d2da748d1
# Parent  600f23560d88366d6b61a0744161894f977f734c
Related to issue 40812 : If a manual discount is applied to an order, it is not possible to apply it again. It will remain the first discount
Description

diff -r 600f23560d88 -r 951b286e769d web/org.openbravo.retail.posterminal/js/model/order.js
--- a/web/org.openbravo.retail.posterminal/js/model/order.js	Mon May 20 18:59:22 2019 +0530
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js	Tue May 21 11:20:19 2019 +0530
@@ -227,7 +227,7 @@
           return true;
         }
         for (i = 0; i < promotions.length; i++) {
-          if (!promotions[i].applyNext) {
+          if (!promotions[i].manual && !promotions[i].applyNext) {
             return true;
           }
         }
@@ -3394,6 +3394,9 @@
       var promotions = line.get('promotions') || [],
           disc = {},
           i, replaced = false,
+          unitsConsumed = 0,
+          unitsConsumedByNoCascadeRules = 0,
+          unitsConsumedByTheSameRule = 0,
           discountRule = OB.Model.Discounts.discountRules[rule.attributes.discountType];
       if (discountRule.getIdentifier) {
         disc.identifier = discountRule.getIdentifier(rule, discount);
@@ -3471,43 +3474,43 @@
       disc.obdiscAllowinnegativelines = (!OB.UTIL.isNullOrUndefined(rule.get('obdiscAllowinnegativelines'))) ? rule.get('obdiscAllowinnegativelines') : false;
       disc.executedAtTheEndPromo = discount.executedAtTheEndPromo || false;
 
-      var unitsConsumed = 0;
-      var unitsConsumedByNoCascadeRules = 0;
-      var unitsConsumedByTheSameRule = 0;
-      for (i = 0; i < promotions.length; i++) {
-        if (!promotions[i].applyNext) {
-          unitsConsumedByNoCascadeRules += promotions[i].qtyOffer;
-        } else if (promotions[i].ruleId === disc.ruleId) {
-          unitsConsumedByTheSameRule += promotions[i].qtyOffer;
-        }
-      }
-
-      if (disc.applyNext && unitsConsumedByTheSameRule === 0) {
-        unitsConsumed = unitsConsumedByNoCascadeRules;
-      } else {
-        unitsConsumed = unitsConsumedByNoCascadeRules + unitsConsumedByTheSameRule + disc.qtyOffer;
-      }
       if (!disc.manual) {
         for (i = 0; i < promotions.length; i++) {
-          if (unitsConsumed > line.get('qty')) {
-            if (discount.forceReplace) {
-              if (promotions[i].ruleId === rule.id && discount.discountinstance === promotions[i].discountinstance) {
-                if (promotions[i].hidden !== true) {
-                  promotions[i] = disc;
-                }
-              }
-            }
-            replaced = true;
-            break;
-          } else if (discount.forceReplace) {
+          if (!promotions[i].applyNext) {
+            unitsConsumedByNoCascadeRules += promotions[i].qtyOffer;
+          } else if (promotions[i].ruleId === disc.ruleId) {
+            unitsConsumedByTheSameRule += promotions[i].qtyOffer;
+          }
+        }
+
+        if (disc.applyNext && unitsConsumedByTheSameRule === 0) {
+          unitsConsumed = unitsConsumedByNoCascadeRules;
+        } else {
+          unitsConsumed = unitsConsumedByNoCascadeRules + unitsConsumedByTheSameRule + disc.qtyOffer;
+        }
+      }
+
+      for (i = 0; i < promotions.length; i++) {
+        if (!disc.manual && unitsConsumed > line.get('qty')) {
+          if (discount.forceReplace) {
             if (promotions[i].ruleId === rule.id && discount.discountinstance === promotions[i].discountinstance) {
               if (promotions[i].hidden !== true) {
                 promotions[i] = disc;
-                replaced = true;
-                break;
               }
             }
           }
+          replaced = true;
+          break;
+        } else if (disc.manual || discount.forceReplace) {
+          if (promotions[i].ruleId === rule.id && discount.discountinstance === promotions[i].discountinstance) {
+            if (promotions[i].hidden !== true) {
+              if (disc.applyNext === false) {
+                promotions[i] = disc;
+              }
+              replaced = true;
+              break;
+            }
+          }
         }
       }
 

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1558417823 -19800
#      Tue May 21 11:20:23 2019 +0530
# Node ID 609afc446bb968132f173d8a62fa874c1b9d1633
# Parent  f8b1ad0f0b79acb2d81e8d7d6dd18c59e4b5348c
Verifies issue 40812 : Added automated test 'I40812_VerifyMultiManualDiscounts'

diff -r f8b1ad0f0b79 -r 609afc446bb9 src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/discountsandpromotions/I40812_VerifyMultiManualDiscounts.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/discountsandpromotions/I40812_VerifyMultiManualDiscounts.java	Tue May 21 11:20:23 2019 +0530
@@ -0,0 +1,159 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo Public License
+ * Version 1.0 (the "License"), being the Mozilla Public License
+ * Version 1.1 with a permitted attribution clause; you may not use this
+ * file except in compliance with the License. You may obtain a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo S.L.U.
+ * All portions are Copyright (C) 2019 Openbravo S.L.U.
+ * All Rights Reserved.
+ * Contributor(s):
+ ************************************************************************
+ *
+ * @author RAN
+ *
+ */
+
+package org.openbravo.test.mobile.retail.pack.selenium.tests.discountsandpromotions;
+
+import static org.junit.Assert.fail;
+
+import org.junit.Test;
+import org.openbravo.test.mobile.core.utils.OBWait;
+import org.openbravo.test.mobile.retail.mobilecore.database.DatabaseHelperInsertUpdateOrDelete;
+import org.openbravo.test.mobile.retail.pack.selenium.TestIdPack;
+import org.openbravo.test.mobile.retail.pack.selenium.terminals.WebPOSTerminalHelper;
+
+public class I40812_VerifyMultiManualDiscounts extends WebPOSTerminalHelper {
+  final String PRODUCT_NAME = "Bottle 1 L";
+  final String VAR_DISCOUNT_AMT_NAME = "disc_5_var_euro";
+  final String VAR_DISCOUNT_AMT_ID = "E95B84F4D46E407EBC0C57507DFB8C70";
+  final String BOTTLES_NAME = "3 x 2 Bottles";
+
+  @Test
+  public void test() {
+    // Case 1 - Add Same discount for 2 times without Multiple Instance
+    addProduct();
+    // Add Discount
+    tap(TestIdPack.BUTTON_MENU);
+    tap(TestIdPack.BUTTON_MENU_RECEIPTDISCOUNTS);
+    selectDiscountCombo(1);
+    tap(TestIdPack.BUTTON_RECEIPTDISCOUNTS_CHECKAPPLYALL);
+    tap(TestIdPack.BUTTON_RECEIPTDISCOUNTS_APPLY);
+    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTNAME, "-- " + VAR_DISCOUNT_AMT_NAME);
+    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT, "-5.00");
+    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTNAME2, "-- " + BOTTLES_NAME);
+    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT2, "-9.50");
+    // Add Same Discount with different amount
+    tap(TestIdPack.BUTTON_MENU);
+    tap(TestIdPack.BUTTON_MENU_RECEIPTDISCOUNTS);
+    selectDiscountCombo(1);
+    tap(TestIdPack.BUTTON_KEYPAD_6);
+    tap(TestIdPack.BUTTON_KEYPAD_ENTER);
+    tap(TestIdPack.BUTTON_RECEIPTDISCOUNTS_CHECKAPPLYALL);
+    tap(TestIdPack.BUTTON_RECEIPTDISCOUNTS_APPLY);
+    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTNAME, "-- " + VAR_DISCOUNT_AMT_NAME);
+    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT, "-5.00");
+    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTNAME2, "-- " + BOTTLES_NAME);
+    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT2, "-9.50");
+    // Add Same Discount with different amount and override
+    tap(TestIdPack.BUTTON_MENU);
+    tap(TestIdPack.BUTTON_MENU_RECEIPTDISCOUNTS);
+    selectDiscountCombo(1);
+    tap(TestIdPack.BUTTON_KEYPAD_6);
+    tap(TestIdPack.BUTTON_KEYPAD_ENTER);
+    tap(TestIdPack.BUTTON_RECEIPTDISCOUNTS_CHECKOVERRIDEALL);
+    tap(TestIdPack.BUTTON_RECEIPTDISCOUNTS_CHECKAPPLYALL);
+    tap(TestIdPack.BUTTON_RECEIPTDISCOUNTS_APPLY);
+    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTNAME, "-- " + VAR_DISCOUNT_AMT_NAME);
+    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT, "-6.00");
+    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTNAME2, "-- " + BOTTLES_NAME);
+    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT2, "-9.50");
+    tap(TestIdPack.BUTTON_DELETERECEIPT);
+    tap(TestIdPack.BUTTON_DELETERECEIPT_CONFIRM);
+    verify(TestIdPack.LABEL_TOTALTOPAY, "0.00");
+    
+    // Case 1 - Add Same discount for 2 times with Multiple Instance
+    try {
+      setAllowDiscountWithMultipleInstance(true);
+      reload();
+      addProduct();
+      // Add Discount
+      tap(TestIdPack.BUTTON_MENU);
+      tap(TestIdPack.BUTTON_MENU_RECEIPTDISCOUNTS);
+      selectDiscountCombo(1);
+      tap(TestIdPack.BUTTON_RECEIPTDISCOUNTS_CHECKAPPLYALL);
+      tap(TestIdPack.BUTTON_RECEIPTDISCOUNTS_APPLY);
+      verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTNAME, "-- " + VAR_DISCOUNT_AMT_NAME);
+      verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT, "-5.00");
+      verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTNAME2, "-- " + BOTTLES_NAME);
+      verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT2, "-9.50");
+      // Add Same Discount with different amount
+      tap(TestIdPack.BUTTON_MENU);
+      tap(TestIdPack.BUTTON_MENU_RECEIPTDISCOUNTS);
+      selectDiscountCombo(1);
+      tap(TestIdPack.BUTTON_KEYPAD_6);
+      tap(TestIdPack.BUTTON_KEYPAD_ENTER);
+      tap(TestIdPack.BUTTON_RECEIPTDISCOUNTS_CHECKAPPLYALL);
+      tap(TestIdPack.BUTTON_RECEIPTDISCOUNTS_APPLY);
+      verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTNAME, "-- " + VAR_DISCOUNT_AMT_NAME);
+      verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT, "-5.00");
+      verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTNAME2, "-- " + VAR_DISCOUNT_AMT_NAME);
+      verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT2, "-6.00");
+      verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTNAME3, "-- " + BOTTLES_NAME);
+      verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT3, "-9.50");
+      tap(TestIdPack.BUTTON_DELETERECEIPT);
+      tap(TestIdPack.BUTTON_DELETERECEIPT_CONFIRM);
+      verify(TestIdPack.LABEL_TOTALTOPAY, "0.00");
+    }
+    finally {
+      setAllowDiscountWithMultipleInstance(false);
+      reload();
+    }
+  }
+
+  protected void selectDiscountCombo(final int index) {
+    new OBWait() {
+      @Override
+      protected boolean until(final int currentIteration) {
+        return (Boolean) TestIdPack.COMBO_RECEIPTDISCOUNTS_LIST.enyoNode()
+            .executeExtensionWithReturn(".collection.length > 0");
+      }
+
+      @Override
+      protected void timeout() {
+        fail("The manual discounts combo did not load");
+      }
+    };
+    TestIdPack.COMBO_RECEIPTDISCOUNTS_LIST.enyoNode()
+        .executeExtension(".setSelected(" + index + ")");
+    TestIdPack.COMBO_RECEIPTDISCOUNTS_LIST.enyoNode().executeExtension(".change()");
+    TestIdPack.COMBO_RECEIPTDISCOUNTS_LIST.enyoNode().executeExtension(".waterfall('onchange')");
+  }
+
+  private void addProduct() {
+    tap(TestIdPack.BUTTON_SEARCH);
+    write(TestIdPack.FIELD_SEARCH_TEXT, PRODUCT_NAME);
+    TestIdPack.FIELD_SEARCH_TEXT.enyoNode().executeExtension(".waterfall('onchange')");
+    tap(TestIdPack.BUTTON_SEARCH_EXECUTE);
+    tap(TestIdPack.BUTTON_SEARCHPRODUCT_FIRSTROW);
+    verify(TestIdPack.LABEL_TOTALTOPAY, "9.50");
+    tap(TestIdPack.BUTTON_RECEIPT_ROW1);
+    tap(TestIdPack.BUTTON_KEYPAD_3);
+    tap(TestIdPack.BUTTON_KEYPAD_QUANTITY);
+    verify(TestIdPack.LABEL_TOTALTOPAY, "19.00");
+  }
+
+  private void setAllowDiscountWithMultipleInstance(boolean value) {
+    new DatabaseHelperInsertUpdateOrDelete() {
+    }.execute(String.format(
+        "update m_offer set em_obdisc_allowmultipleinstan = '%s' where m_offer_id = '%s'",
+        value ? "Y" : "N", VAR_DISCOUNT_AMT_ID), 1);
+  }
+}