0035279: The reimbursement in cancel and replace an order is positive and not negative in web POS

# HG changeset patch
# User Mario Castello <mario.castello@peoplewalking.com>
# Date 1487784400 21600
#      mié feb 22 11:26:40 2017 -0600
# Node ID f4485b5d86c65510952b6ca44472f054c8414354
# Parent  272d6261e4d29666d02e97afcc1466168faf85a4
Fixed issue 0035279: The reimbursement in cancel and replace an order is positive and not negative in web POS

- Added validation for order CancelAndReplace and check is the paid is negatives

diff --git a/web/org.openbravo.retail.posterminal/js/model/order.js b/web/org.openbravo.retail.posterminal/js/model/order.js
--- a/web/org.openbravo.retail.posterminal/js/model/order.js
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js
@@ -266,7 +266,8 @@
       return '(' + OB.I18N.formatCurrency(this.get('amount')) + ' ' + this.get('isocode') + ')';
     },
     printAmountWithSignum: function () {
-      var paidReturn = this.get('isPaid') && (this.get('orderGross') < 0);
+      var receipt = OB.MobileApp.model.receipt;
+      var paidReturn = (this.get('isPaid') && (this.get('orderGross') < 0)) || (receipt.get('doCancelAndReplace') === true && receipt.get('replacedorder') && receipt.getPaymentStatus().isNegative);
       // if the ticket is a paid return, new payments must be displayed in negative
       if (this.get('rate')) {
         return OB.I18N.formatCurrency(paidReturn ? OB.DEC.mul(OB.DEC.abs(this.get('origAmount') || OB.DEC.mul(this.get('amount'), this.get('rate'))), -1) : this.printAmount());

# HG changeset patch
# User Mario Castello <mario.castello@peoplewalking.com>
# Date 1487785348 21600
#      mié feb 22 11:42:28 2017 -0600
# Node ID 3673baae32dfca2f4800c0ca243a38b1654edb47
# Parent  efce039cd3f644caf5a9211c5599b9452c3d73a6
Verifies issue 35279: Added automated test I35279_CancelAndRplcLayaway

diff --git a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/cancelandreplace/I35279_CancelAndRplcLayaway.java b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/cancelandreplace/I35279_CancelAndRplcLayaway.java
new file mode 100644
--- /dev/null
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/cancelandreplace/I35279_CancelAndRplcLayaway.java
@@ -0,0 +1,142 @@
+/*
+ *************************************************************************
+ * 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) 2017 Openbravo S.L.U.
+ * All Rights Reserved.
+ * Contributor(s):
+ ************************************************************************
+ *
+ * @author MCA
+ *
+ */
+
+package org.openbravo.test.mobile.retail.pack.selenium.tests.cancelandreplace;
+
+import java.math.BigDecimal;
+
+import org.junit.Test;
+import org.openbravo.test.mobile.retail.mobilecore.annotations.TestClassAnnotations;
+import org.openbravo.test.mobile.retail.mobilecore.javascript.BackboneHelper;
+import org.openbravo.test.mobile.retail.pack.selenium.TestIdPack;
+import org.openbravo.test.mobile.retail.pack.selenium.terminals.WebPOSCancelAndReplaceTerminalHelper;
+import org.openbravo.test.mobile.retail.pack.selenium.terminals.WebPOSTerminalHelper;
+
+/**
+ * Cancel and Replace of a lay away with a reimbursement
+ */
+
+@TestClassAnnotations(isHighVolumeCompatible = true)
+public class I35279_CancelAndRplcLayaway extends WebPOSTerminalHelper {
+
+  final String paymentMethodId = "45A202BF44884F05B8A1BF741E2063B6";
+  final String productId = "C1757506CB6B469B8DE4739F04523B7C";
+
+  @Test
+  public void test() {
+    tap(TestIdPack.BUTTON_SEARCH);
+    write(TestIdPack.FIELD_SEARCH_TEXT,
+        TestIdPack.BUTTON_SEARCHPRODUCT_INSECTREPELLENT.getRowName());
+    tap(TestIdPack.BUTTON_SEARCH_EXECUTE);
+    tap(TestIdPack.BUTTON_SEARCHPRODUCT_INSECTREPELLENT);
+    verify(TestIdPack.LABEL_TOTALTOPAY, "14.50");
+    tap(TestIdPack.BUTTON_EDIT);
+    tap(TestIdPack.BUTTON_KEYPAD_4);
+    tap(TestIdPack.BUTTON_KEYPAD_QUANTITY);
+    verify(TestIdPack.LABEL_TOTALTOPAY, "58.00");
+
+    final String receiptNo = BackboneHelper.getDocumentNo();
+    final String customer = get(TestIdPack.BUTTON_RECEIPT_CUSTOMER);
+
+    // Lay away the receipt
+    tap(TestIdPack.BUTTON_MENU);
+    tap(TestIdPack.BUTTON_MENU_LAYAWAYTHISRECEIPT);
+    verify(TestIdPack.LABEL_RECEIPT_TYPE, "To be laid away");
+
+    // Finish the lay away
+    tap(TestIdPack.BUTTON_PAY);
+    tap(TestIdPack.BUTTON_PAY_CASH_50);
+    tap(TestIdPack.BUTTON_LAYAWAY);
+    verify(TestIdPack.LABEL_TOTALTOPAY, "0.00");
+
+    // Retrieve created lay away
+    tap(TestIdPack.BUTTON_MENU);
+    tap(TestIdPack.BUTTON_MENU_LAYAWAYS);
+    write(TestIdPack.FIELD_SEARCH_RECEIPT, receiptNo);
+    tap(TestIdPack.BUTTON_LAYAWAYS_SEARCH);
+    tap(TestIdPack.TABLE_RECEIPTSEARCH, String.format("%s - %s", receiptNo, customer));
+    verify(TestIdPack.LABEL_TOTALTOPAY, "58.00");
+
+    tap(TestIdPack.BUTTON_MENU);
+    tap(TestIdPack.BUTTON_MENU_CANCELANDREPLACE);
+    verify(TestIdPack.LABEL_RECEIPT_TYPE, "'Cancel and Replace' of  " + receiptNo);
+    verify(TestIdPack.LABEL_TOTALTOPAY, "58.00");
+    tap(TestIdPack.BUTTON_PAY);
+    verify(TestIdPack.LABEL_RECEIPT_PAY_REMAINING, "8.00€");
+    tap(TestIdPack.BUTTON_PAY_EXACT);
+    verify(TestIdPack.LABEL_RECEIPT_ADDEDPAYMENT_ROW2_AMOUNT, "8.00");
+    tap(TestIdPack.BUTTON_RECEIPT_PAYMENT_ROW2_REMOVE);
+    verify(TestIdPack.LABEL_RECEIPT_PAY_REMAINING, "8.00€");
+
+    // Edit the line and changes quantity
+    tap(TestIdPack.BUTTON_RECEIPT_ROW1);
+    tap(TestIdPack.BUTTON_KEYPAD_2);
+    tap(TestIdPack.BUTTON_KEYPAD_QUANTITY);
+    verify(TestIdPack.LABEL_TOTALTOPAY, "29.00");
+    tap(TestIdPack.BUTTON_PAY);
+    verify(TestIdPack.LABEL_RECEIPT_PAY_REMAINING, "21.00€");
+    tap(TestIdPack.BUTTON_PAY_EXACT);
+    verify(TestIdPack.LABEL_RECEIPT_ADDEDPAYMENT_ROW2_AMOUNT, "-21.00");
+    tap(TestIdPack.BUTTON_PAY_DONE);
+    verify(TestIdPack.LABEL_TOTALTOPAY, "0.00");
+
+    // check orders data
+    verifyCancelAndReplaceUtils(receiptNo);
+    verify(TestIdPack.LABEL_TOTALTOPAY, "0.00");
+  }
+
+  public void verifyCancelAndReplaceUtils(final String receiptNo) {
+    // Final checks
+    WebPOSCancelAndReplaceTerminalHelper.checkIsCanceled(receiptNo);
+    WebPOSCancelAndReplaceTerminalHelper.checkCanceledOrder(receiptNo, receiptNo + "*R*");
+    WebPOSCancelAndReplaceTerminalHelper.checkReplacedOrder(receiptNo, receiptNo + "-1");
+
+    WebPOSCancelAndReplaceTerminalHelper.checkReceived(receiptNo, BigDecimal.valueOf(58.00));
+    WebPOSCancelAndReplaceTerminalHelper.checkReceived(receiptNo + "*R*",
+        BigDecimal.valueOf(-58.00));
+    WebPOSCancelAndReplaceTerminalHelper.checkReceived(receiptNo + "-1", BigDecimal.valueOf(29.00));
+
+    WebPOSCancelAndReplaceTerminalHelper.checkOutstanding(receiptNo, BigDecimal.ZERO);
+    WebPOSCancelAndReplaceTerminalHelper.checkOutstanding(receiptNo + "*R*", BigDecimal.ZERO);
+    WebPOSCancelAndReplaceTerminalHelper.checkOutstanding(receiptNo + "-1", BigDecimal.ZERO);
+
+    WebPOSCancelAndReplaceTerminalHelper.checkNumberOfPayments(receiptNo, (long) 2);
+    WebPOSCancelAndReplaceTerminalHelper.checkNumberOfPayments(receiptNo + "*R*", (long) 1);
+    WebPOSCancelAndReplaceTerminalHelper.checkNumberOfPayments(receiptNo + "-1", (long) 2);
+
+    WebPOSCancelAndReplaceTerminalHelper.checkPaymentDetail(receiptNo, BigDecimal.valueOf(8.00),
+        paymentMethodId, BigDecimal.ZERO);
+    WebPOSCancelAndReplaceTerminalHelper.checkPaymentDetail(receiptNo + "*R*",
+        BigDecimal.valueOf(-58.00), paymentMethodId, BigDecimal.ZERO);
+    WebPOSCancelAndReplaceTerminalHelper.checkPaymentDetail(receiptNo + "-1",
+        BigDecimal.valueOf(50.00), paymentMethodId, BigDecimal.ZERO);
+
+    WebPOSCancelAndReplaceTerminalHelper.checkLine(receiptNo, productId, 4, 4);
+    WebPOSCancelAndReplaceTerminalHelper.checkLine(receiptNo + "*R*", productId, -4, -4);
+    WebPOSCancelAndReplaceTerminalHelper.checkLine(receiptNo + "-1", productId, 2, 2);
+
+    WebPOSCancelAndReplaceTerminalHelper.checkLineShipment(receiptNo, productId, 4, 4, false);
+    WebPOSCancelAndReplaceTerminalHelper.checkLineShipment(receiptNo + "*R*", productId, -4, -4,
+        false);
+    WebPOSCancelAndReplaceTerminalHelper.checkLineShipment(receiptNo + "-1", productId, 2, 2, true);
+  }
+}