0035320: Impossible to create several layaways in a terminal without cash payment methods

# HG changeset patch
Fixes issue 35320 : Layway button should be enabled where receipt is set as layaway

* Code Refactored, Since multiple listener('paymentCancel') created for receipt object in layaway button tap

diff -r cef081b9da0b -r 8ab663ea1541 web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js	Fri Feb 17 10:16:52 2017 -0600
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js	Thu Feb 23 16:05:02 2017 +0530
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2013-2016 Openbravo S.L.U.
+ * Copyright (C) 2013-2017 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -258,6 +258,9 @@
     this.receipt.on('updatePending', function () {
       this.updatePending();
     }, this);
+    this.receipt.on('paymentCancel', function () {
+      this.$.layawayaction.setDisabled(false);
+    }, this);
     this.model.get('leftColumnViewManager').on('change:currentView', function () {
       if (!this.model.get('leftColumnViewManager').isMultiOrder()) {
         this.updatePending();
@@ -278,6 +281,7 @@
       var payment = OB.MobileApp.model.paymentnames[OB.MobileApp.model.get('paymentcash')];
       if ((model.get('orderType') === 2 || (model.get('isLayaway'))) && model.get('orderType') !== 3 && !model.getPaymentStatus().done && _.isUndefined(model.get('paidInNegativeStatusAmt'))) {
         this.$.layawayaction.setContent(OB.I18N.getLabel('OBPOS_LblLayaway'));
+        this.$.layawayaction.setDisabled(false);
         this.$.layawayaction.show();
       } else {
         this.$.layawayaction.hide();
@@ -1543,9 +1547,6 @@
     }
     this.setDisabled(true);
     enyo.$.scrim.show();
-    receipt.on('paymentCancel', function () {
-      this.setDisabled(false);
-    }, this);
     receipt.trigger('paymentDone', me.allowOpenDrawer);
   }
 });
\ No newline at end of file

# HG changeset patch
Verifies issue 35320 : Added automated test 'I35320_VerifyLayawayButtonEnabled'

diff -r efce039cd3f6 -r da141d714d24 src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/layaway/I35320_VerifyLayawayButtonEnabled.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/layaway/I35320_VerifyLayawayButtonEnabled.java	Thu Feb 23 16:05:07 2017 +0530
@@ -0,0 +1,74 @@
+/*
+ *************************************************************************
+ * 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 RAN
+ *
+ */
+
+package org.openbravo.test.mobile.retail.pack.selenium.tests.layaway;
+
+import org.junit.Test;
+import org.openbravo.test.mobile.retail.mobilecore.annotations.TestClassAnnotations;
+import org.openbravo.test.mobile.retail.pack.database.WebPOSDatabaseConstants;
+import org.openbravo.test.mobile.retail.pack.database.WebPOSDatabaseHelper;
+import org.openbravo.test.mobile.retail.pack.selenium.TestIdPack;
+import org.openbravo.test.mobile.retail.pack.selenium.terminals.WebPOSTerminalHelper;
+
+@TestClassAnnotations(isHighVolumeCompatible = true)
+public class I35320_VerifyLayawayButtonEnabled extends WebPOSTerminalHelper {
+
+  @Test
+  public void test() {
+    addLayaway();
+    addLayaway();
+  }
+
+  private void addLayaway() {
+    // Create Layaway
+    tap(TestIdPack.BUTTON_MENU);
+    tap(TestIdPack.BUTTON_MENU_LAYAWAYTHISRECEIPT);
+    tap(TestIdPack.BUTTON_SEARCH);
+    write(TestIdPack.FIELD_SEARCH_TEXT,
+        TestIdPack.BUTTON_SEARCHPRODUCT_AVALANCHETRANSCEIVER.getRowName());
+    tap(TestIdPack.BUTTON_SEARCH_EXECUTE);
+    tap(TestIdPack.BUTTON_SEARCHPRODUCT_AVALANCHETRANSCEIVER);
+    verify(TestIdPack.LABEL_TOTALTOPAY, "150.50");
+    verify(TestIdPack.LABEL_RECEIPT_TYPE, "To be laid away");
+    tap(TestIdPack.BUTTON_PAY);
+    isDisabled(TestIdPack.BUTTON_LAYAWAY, false);
+    tap(TestIdPack.BUTTON_LAYAWAY);
+    verify(TestIdPack.LABEL_TOTALTOPAY, "0.00");
+  }
+
+  @Override
+  public void beforeWithReload() {
+    updatePaymentMethods(true);
+  }
+
+  @Override
+  public void afterWithReload() {
+    updatePaymentMethods(false);
+  }
+
+  private void updatePaymentMethods(final Boolean isForTest) {
+    WebPOSDatabaseHelper.activateDeactivatePayment(
+        WebPOSDatabaseConstants.VBS1001_OBPOS_APP_PAYMENT_CASH, !isForTest);
+    WebPOSDatabaseHelper.activateDeactivatePayment(
+        WebPOSDatabaseConstants.VBS1001_OBPOS_APP_PAYMENT_USACASH, !isForTest);
+  }
+}
\ No newline at end of file

# HG changeset patch
# User Antonio Moreno <antonio.moreno@openbravo.com>
# Date 1488906544 -3600
#      Tue Mar 07 18:09:04 2017 +0100
# Node ID 8781612b1a0acfc2c05751e77332ba38651733d3
# Parent  6188362fc1e6669c622f8220479e1d52c8476502
Fixed issue 35320. Force update of the layawayAction button in case the ticket itself changed, by checking the docNo

diff -r 6188362fc1e6 -r 8781612b1a0a web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js	Thu Feb 23 13:39:16 2017 -0600
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js	Tue Mar 07 18:09:04 2017 +0100
@@ -272,7 +272,7 @@
     if (this.model.get('leftColumnViewManager').isMultiOrder()) {
       this.updatePendingMultiOrders();
     }
-    this.receipt.on('change:orderType change:isLayaway change:payment', function (model) {
+    this.receipt.on('change:orderType change:isLayaway change:payment change:documentNo', function (model) {
       if (this.model.get('leftColumnViewManager').isMultiOrder()) {
         this.updateCreditSalesAction();
         this.$.layawayaction.hide();