0040666: Several discounts do not apply to all lines

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1556545205 -19800
#      Mon Apr 29 19:10:05 2019 +0530
# Node ID 40000ff54d6fe934a4a198d88700c9e75c663260
# Parent  81b6d8f43909791b4b7c0ac9d853c8ae32e84475
Related to issue 40666 : Discount by Total should be calculated for non gropued products

diff -r 81b6d8f43909 -r 40000ff54d6f web/org.openbravo.retail.discounts.bytotal/js/preApplyAutomaticDiscountHook.js
--- a/web/org.openbravo.retail.discounts.bytotal/js/preApplyAutomaticDiscountHook.js	Tue Apr 23 17:36:06 2019 +0200
+++ b/web/org.openbravo.retail.discounts.bytotal/js/preApplyAutomaticDiscountHook.js	Mon Apr 29 19:10:05 2019 +0530
@@ -37,6 +37,13 @@
     args.discountList.remove(targetDiscount);
     args.discountList.push(targetDiscount);
   });
+
+  if (!args.line.get('product').get('groupProduct') || (args.line.get('product').get('groupProduct') && args.line.get('product').get('obposScale'))) {
+    args.line.set('orderManualPromotionsAlreadyApplied', false, {
+      silent: true
+    });
+  }
+
   OB.UTIL.HookManager.callbackExecutor(args, callbacks);
 
 });
\ No newline at end of file

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1556603708 -19800
#      Tue Apr 30 11:25:08 2019 +0530
# Node ID b47d6ab74e004d28068f30d8b15cec9da9db3d62
# Parent  6cc4c6d386cd1712b6e43af1f6a93e9a338170ef
Verifies issue 40666 : Added automated test 'I40666_VerifyTotalDiscountWithNonGroupedProduct'

diff -r 6cc4c6d386cd -r b47d6ab74e00 src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/discounts_bytotal/I40666_VerifyTotalDiscountWithNonGroupedProduct.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/discounts_bytotal/I40666_VerifyTotalDiscountWithNonGroupedProduct.java	Tue Apr 30 11:25:08 2019 +0530
@@ -0,0 +1,78 @@
+/*
+ *************************************************************************
+ * 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.extmodules.selenium.tests.discounts_bytotal;
+
+import org.junit.Test;
+import org.openbravo.test.mobile.retail.extmodules.selenium.TestIdExtModules;
+import org.openbravo.test.mobile.retail.extmodules.selenium.terminals.WebPOSExtModulesTerminalHelper;
+
+public class I40666_VerifyTotalDiscountWithNonGroupedProduct
+    extends WebPOSExtModulesTerminalHelper {
+
+  final String PRODUCT_NAME = "WVG/ADP02";
+  final String PRODUCT_ID = "934E7D7587EC4C7A9E9FF58F0382D450";
+  final String DISCOUNT_NAME_1 = "-- disc_fixed_5_euro";
+  final String DISCOUNT_NAME_2 = "-- Variable Amount Discount By Total - 23 EUR";
+
+  @Test
+  public void test() {
+    tap(TestIdExtModules.BUTTON_SEARCH);
+    write(TestIdExtModules.FIELD_SEARCH_TEXT, PRODUCT_NAME);
+    tap(TestIdExtModules.BUTTON_SEARCH_EXECUTE);
+    TestIdExtModules.BUTTON_SEARCHPRODUCT_FIRSTROW.enyoNode().waitUntilIsReady();
+    tap(TestIdExtModules.BUTTON_SEARCHPRODUCT_FIRSTROW);
+    tap(TestIdExtModules.BUTTON_SEARCHPRODUCT_FIRSTROW);
+    verify(TestIdExtModules.LABEL_TOTALTOPAY, "40.00");
+
+    // Apply discounts
+    // --> Fixed 5 EUR
+    prepareManualPromotionsToApply(9);
+    tap(TestIdExtModules.BUTTON_RECEIPTDISCOUNTS_CHECKAPPLYALL);
+    tap(TestIdExtModules.BUTTON_RECEIPTDISCOUNTS_APPLY);
+    // --> Variable Amount discount by Total
+    prepareManualPromotionsToApply(5);
+    tap(TestIdExtModules.BUTTON_RECEIPTDISCOUNTS_APPLY);
+
+    // Verify discounts
+    verify(TestIdExtModules.LABEL_RECEIPT_ROW1_DISCOUNTNAME_EXTMOD, DISCOUNT_NAME_1);
+    verify(TestIdExtModules.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT_EXTMOD, "-5.00");
+    verify(TestIdExtModules.LABEL_RECEIPT_ROW1_DISCOUNTNAME2_EXTMOD, DISCOUNT_NAME_2);
+    verify(TestIdExtModules.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT2_EXTMOD, "-11.50");
+
+    verify(TestIdExtModules.LABEL_RECEIPT_ROW2_DISCOUNTNAME_EXTMOD, DISCOUNT_NAME_1);
+    verify(TestIdExtModules.LABEL_RECEIPT_ROW2_DISCOUNTAMOUNT_EXTMOD, "-5.00");
+    verify(TestIdExtModules.LABEL_RECEIPT_ROW2_DISCOUNTNAME2_EXTMOD, DISCOUNT_NAME_2);
+    verify(TestIdExtModules.LABEL_RECEIPT_ROW2_DISCOUNTAMOUNT2_EXTMOD, "-11.50");
+
+    // Delete Ticket
+    tap(TestIdExtModules.BUTTON_DELETERECEIPT);
+    tap(TestIdExtModules.BUTTON_DELETERECEIPT_CONFIRM);
+    verify(TestIdExtModules.LABEL_TOTALTOPAY, "0.00");
+  }
+
+  private void prepareManualPromotionsToApply(int promotionPositionInCombo) {
+    tap(TestIdExtModules.BUTTON_MENU);
+    tap(TestIdExtModules.BUTTON_MENU_RECEIPTDISCOUNTS);
+    selectDiscountCombo(promotionPositionInCombo);
+  }
+}
diff -r 6cc4c6d386cd -r b47d6ab74e00 src-test/org/openbravo/test/mobile/retail/pack/selenium/TestIdPack.java
--- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/TestIdPack.java	Thu Apr 25 19:00:49 2019 +0200
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/TestIdPack.java	Tue Apr 30 11:25:08 2019 +0530
@@ -2775,10 +2775,18 @@
       "listOrderLines_row1_control3"); //
   public static TestIdConstructor LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT_EXTMOD = new TestIdConstructor(
       "listOrderLines_row1_control4"); //
+  public static TestIdConstructor LABEL_RECEIPT_ROW1_DISCOUNTNAME2_EXTMOD = new TestIdConstructor(
+      "listOrderLines_row1_control7"); //
+  public static TestIdConstructor LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT2_EXTMOD = new TestIdConstructor(
+      "listOrderLines_row1_control8"); //
   public static TestIdConstructor LABEL_RECEIPT_ROW2_DISCOUNTNAME_EXTMOD = new TestIdConstructor(
       "listOrderLines_row2_control3"); //
   public static TestIdConstructor LABEL_RECEIPT_ROW2_DISCOUNTAMOUNT_EXTMOD = new TestIdConstructor(
       "listOrderLines_row2_control4"); //
+  public static TestIdConstructor LABEL_RECEIPT_ROW2_DISCOUNTNAME2_EXTMOD = new TestIdConstructor(
+      "listOrderLines_row2_control7"); //
+  public static TestIdConstructor LABEL_RECEIPT_ROW2_DISCOUNTAMOUNT2_EXTMOD = new TestIdConstructor(
+      "listOrderLines_row2_control8"); //
   public static TestIdConstructor LABEL_RECEIPT_ROW3_DISCOUNTNAME_EXTMOD = new TestIdConstructor(
       "listOrderLines_row3_control3"); //
   public static TestIdConstructor LABEL_RECEIPT_ROW3_DISCOUNTAMOUNT_EXTMOD = new TestIdConstructor(