0035637: Check is Multiple in price Adjustment not working in Web Pos

# HG changeset patch
Related to issue 35637 : Modified Discount logic for Price Adjustment IsMultiple

* Both Discount Amount & Percentage included for discount calculation if Price Adjustment "ismultiple" is configured

diff -r ffd8b9490dbf -r 9986c67e7a0f web/org.openbravo.retail.posterminal/js/model/discounts.js
--- a/web/org.openbravo.retail.posterminal/js/model/discounts.js	Fri May 05 09:28:34 2017 +0200
+++ b/web/org.openbravo.retail.posterminal/js/model/discounts.js	Tue May 09 12:51:14 2017 +0530
@@ -428,8 +428,18 @@
       chunks = 1;
       if (isMultiple) {
         chunks = parseInt((qty / multipleQty), 10);
-        discountedLinePrice = OB.DEC.toNumber(discountRule.get('discountAmount') * chunks);
-        discountAmt = discountedLinePrice;
+        if (!OB.UTIL.isNullOrUndefined(discountRule.get('discountAmount')) && discountRule.get('discountAmount') > 0 && discountRule.get('discountAmount') < linePrice) {
+          discountedLinePrice = OB.DEC.sub(linePrice, discountRule.get('discountAmount'));
+          discountAmt = OB.DEC.mul(discountRule.get('discountAmount'), chunks);
+        } else if (!OB.UTIL.isNullOrUndefined(discountRule.get('discount')) && discountRule.get('discount') > 0) {
+          discountAmt = OB.DEC.mul(linePrice, OB.DEC.div(discountRule.get('discount'), 100));
+          if (discountAmt < linePrice) {
+            discountedLinePrice = OB.DEC.sub(linePrice, discountAmt);
+            discountAmt = OB.DEC.mul(discountAmt, chunks);
+          } else {
+            discountAmt = 0;
+          }
+        }
       } else {
         if (!OB.UTIL.isNullOrUndefined(discountRule.get('fixedPrice')) && discountRule.get('fixedPrice') >= 0) {
           discountedLinePrice = discountRule.get('fixedPrice');

# HG changeset patch
Verifies issue 35637 : Modified automated test 'I35637_VerifyPriceAdjWithIsMultiple'

* Added logic for discount percentage

diff -r b579cf4f48dd -r 930cecd18f8d src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/discountsandpromotions/I35637_VerifyPriceAdjWithIsMultiple.java
--- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/discountsandpromotions/I35637_VerifyPriceAdjWithIsMultiple.java	Mon May 08 17:10:46 2017 +0530
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/discountsandpromotions/I35637_VerifyPriceAdjWithIsMultiple.java	Tue May 09 12:51:49 2017 +0530
@@ -31,34 +31,58 @@
 public class I35637_VerifyPriceAdjWithIsMultiple extends WebPOSTerminalHelper {
 
   private final String offerId = RetailUtils.getRandomUUID();
-  private final String offerName = "Price Adj Multi";
+  private final String offerName = "Price Adj Is Multiple Disc";
   private final String offerProductId = RetailUtils.getRandomUUID();
-  private final String productId = "E48BE3598A5F426CAA4ACBEC6C469DDC";
-  private final String productName = "Snowshoes velcro";
+  private final String productId = "934E7D7587EC4C7A9E9FF58F0382D450";
+  private final String productName = "Avalanche transceiver";
 
   @Test
   public void test() {
+
+    // Check Ticket with discount Amount
     // Add Product
-    tap(TestIdPack.BUTTON_SEARCH);
-    write(TestIdPack.FIELD_SEARCH_TEXT, productName);
-    tap(TestIdPack.BUTTON_SEARCH_EXECUTE);
-    tap(TestIdPack.BUTTON_SEARCHPRODUCT_FIRSTROW);
-    verify(TestIdPack.LABEL_TOTALTOPAY, "64.90");
+    addProduct();
 
     // Increase Qty to 4
     tap(TestIdPack.BUTTON_RECEIPT_ROW1);
     tap(TestIdPack.BUTTON_KEYPAD_4);
     tap(TestIdPack.BUTTON_KEYPAD_QUANTITY);
     verify(TestIdPack.LABEL_RECEIPT_ROW1_QTY, "4");
-    verify(TestIdPack.LABEL_TOTALTOPAY, "249.60");
     verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTNAME, "-- " + offerName);
-    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT, "-10.00");
+    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT, "-15.00");
     // Increase Qty to 6
     tap(TestIdPack.BUTTON_RECEIPT_ROW1);
     tap(TestIdPack.BUTTON_KEYPAD_6);
     tap(TestIdPack.BUTTON_KEYPAD_QUANTITY);
     verify(TestIdPack.LABEL_RECEIPT_ROW1_QTY, "6");
-    verify(TestIdPack.LABEL_TOTALTOPAY, "369.40");
+    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTNAME, "-- (2x) " + offerName);
+    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT, "-30.00");
+
+    // Delete Ticket
+    tap(TestIdPack.BUTTON_DELETERECEIPT);
+    tap(TestIdPack.BUTTON_DELETERECEIPT_CONFIRM);
+    verify(TestIdPack.LABEL_TOTALTOPAY, "0.00");
+
+    removeDiscountAmtInOffer();
+    reload();
+
+    // Check Ticket with discount Percentage
+    // Add Product
+    addProduct();
+
+    // Increase Qty to 4
+    tap(TestIdPack.BUTTON_RECEIPT_ROW1);
+    tap(TestIdPack.BUTTON_KEYPAD_4);
+    tap(TestIdPack.BUTTON_KEYPAD_QUANTITY);
+    verify(TestIdPack.LABEL_RECEIPT_ROW1_QTY, "4");
+    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTNAME, "-- " + offerName);
+    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT, "-10.00");
+
+    // Increase Qty to 6
+    tap(TestIdPack.BUTTON_RECEIPT_ROW1);
+    tap(TestIdPack.BUTTON_KEYPAD_6);
+    tap(TestIdPack.BUTTON_KEYPAD_QUANTITY);
+    verify(TestIdPack.LABEL_RECEIPT_ROW1_QTY, "6");
     verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTNAME, "-- (2x) " + offerName);
     verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT, "-20.00");
 
@@ -68,20 +92,34 @@
     verify(TestIdPack.LABEL_TOTALTOPAY, "0.00");
   }
 
+  private void addProduct() {
+    tap(TestIdPack.BUTTON_SEARCH);
+    write(TestIdPack.FIELD_SEARCH_TEXT, productName);
+    tap(TestIdPack.BUTTON_SEARCH_EXECUTE);
+    tap(TestIdPack.BUTTON_SEARCHPRODUCT_AVALANCHETRANSCEIVER);
+    verify(TestIdPack.LABEL_TOTALTOPAY, "150.50");
+
+    tap(TestIdPack.BUTTON_RECEIPT_ROW1);
+    tap(TestIdPack.BUTTON_KEYPAD_1);
+    tap(TestIdPack.BUTTON_KEYPAD_0);
+    tap(TestIdPack.BUTTON_KEYPAD_0);
+    tap(TestIdPack.BUTTON_KEYPAD_PRICE);
+  }
+
   @Override
   public void beforeWithReload() {
     final String clientId = BackboneHelper.getTerminalValue("client"), orgId = "0", userId = "100";
 
     final String offerSQL = String.format(
         "insert into m_offer(m_offer_id, ad_client_id, ad_org_id, createdby, updatedby, "
-            + "m_offer_type_id, name, addamt, ismultiple, multiple, discount, datefrom, "
+            + "m_offer_type_id, name, discount, addamt, ismultiple, multiple, datefrom, "
             + "bpartner_selection, bp_group_selection, product_selection, prod_cat_selection, "
             + "pricelist_selection, apply_next, org_selection, characteristics_selection, "
             + "em_obdisc_distribute, em_obdisc_role_selection, em_obdisc_approval_required) "
-            + "values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '0', "
+            + "values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', "
             + "TO_DATE('2017-01-01 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), 'Y', 'Y', 'N', 'Y', 'Y', "
             + "'Y', 'Y', 'Y', 'N', 'Y', 'N')", offerId, clientId, orgId, userId, userId,
-        "5D4BAF6BB86D4D2C9ED3D5A6FC051579", offerName, "10", "Y", "3");
+        "5D4BAF6BB86D4D2C9ED3D5A6FC051579", offerName, "10", "15", "Y", "3");
     new DatabaseHelperInsertUpdateOrDelete().execute(offerSQL, 1);
 
     final String offerProductSQL = String.format(
@@ -98,4 +136,9 @@
     new DatabaseHelperInsertUpdateOrDelete().execute(
         String.format("delete from m_offer where m_offer_id = '%s'", offerId), 1);
   }
+
+  public void removeDiscountAmtInOffer() {
+    new DatabaseHelperInsertUpdateOrDelete().execute(
+        String.format("update m_offer set addamt = 0 where m_offer_id = '%s'", offerId), 1);
+  }
 }