0036894: [SERQA 3299] Layaway button is kept disabled when PostPaymentDone hook stop the execution

diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js b/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js
@@ -493,7 +493,7 @@
       });
     }, this);
 
-    receipt.on('paymentDone', function (openDrawer) {
+    receipt.on('paymentDone', function (openDrawer, cancelProcessCallback) {
       var isOrderCancelledProcess = new OB.DS.Process('org.openbravo.retail.posterminal.process.IsOrderCancelled'),
           triggerPaymentAccepted, triggerPaymentAcceptedImpl;
 
@@ -501,10 +501,14 @@
         OB.UTIL.HookManager.executeHooks('OBPOS_PostPaymentDone', {
           receipt: receipt
         }, function (args) {
-          if (OB.MobileApp.model.hasPermission('OBMOBC_SynchronizedMode', true)) {
-            OB.MobileApp.model.setSynchronizedCheckpoint(triggerPaymentAcceptedImpl);
+          if (args && !args.cancellation) {
+            if (OB.MobileApp.model.hasPermission('OBMOBC_SynchronizedMode', true)) {
+              OB.MobileApp.model.setSynchronizedCheckpoint(triggerPaymentAcceptedImpl);
+            } else {
+              triggerPaymentAcceptedImpl();
+            }
           } else {
-            triggerPaymentAcceptedImpl();
+            cancelProcessCallback();
           }
         });
       };
@@ -723,7 +727,9 @@
           OB.UTIL.HookManager.executeHooks('OBPOS_PostPaymentDone', {
             receipt: orders.at(index)
           }, function (args) {
-            triggerPaymentAccepted(orders, index + 1);
+            if (args && !args.cancellation) {
+              triggerPaymentAccepted(orders, index + 1);
+            }
           });
         }
       };
@@ -1158,4 +1164,4 @@
     });
     callbackFunc();
   }
-});
\ No newline at end of file
+});
diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js
@@ -1607,6 +1607,8 @@
     }
     this.setDisabled(true);
     enyo.$.scrim.show();
-    receipt.trigger('paymentDone', me.allowOpenDrawer);
+    receipt.trigger('paymentDone', me.allowOpenDrawer, null, function (args) {
+      this.setDisabled(false);
+    });
   }
 });
\ No newline at end of file

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1506577798 -19800
#      Thu Sep 28 11:19:58 2017 +0530
# Node ID b01e8e8912fdd00be20d9bc4ad856a68e6648d30
# Parent  3db292762d0c98980ec5c749edae94dbd15210e7
Verifies issue 35571 : Added automated test 'I35571_VerifyReceiptWithMutiPaymentTerm'

diff -r 3db292762d0c -r b01e8e8912fd src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/system/I36894_VerifyPaymentButtonAfterPaymentCancel.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/system/I36894_VerifyPaymentButtonAfterPaymentCancel.java	Thu Sep 28 11:19:58 2017 +0530
@@ -0,0 +1,92 @@
+/*
+ *************************************************************************
+ * 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.system;
+
+import org.junit.After;
+import org.junit.Test;
+import org.openbravo.test.mobile.core.utils.OBUtils;
+import org.openbravo.test.mobile.retail.mobilecore.javascript.MobileCoreAPI;
+import org.openbravo.test.mobile.retail.mobilecore.selenium.TestIdCore;
+import org.openbravo.test.mobile.retail.pack.selenium.TestIdPack;
+import org.openbravo.test.mobile.retail.pack.selenium.terminals.WebPOSTerminalHelper;
+
+public class I36894_VerifyPaymentButtonAfterPaymentCancel extends WebPOSTerminalHelper {
+
+  private static final String HOOK_NAME = "OBPOS_PostPaymentDone";
+  final String HOOK_FUNCTION = "function (args, callbacks) {args.cancellation = true; OB.MobileApp.model.hookManager.callbackExecutor(args, callbacks);}";
+  boolean isUnregistered = false;
+
+  @Test
+  public void test() {
+    // register hook
+    MobileCoreAPI.hook(HOOK_NAME, HOOK_FUNCTION);
+
+    // For Receipt
+    addProduct();
+    tap(TestIdPack.BUTTON_PAY);
+    tap(TestIdPack.BUTTON_PAY_EXACT);
+    isDisabled(TestIdPack.BUTTON_PAY_DONE, false);
+    tap(TestIdPack.BUTTON_PAY_DONE);
+    OBUtils.pause(200);
+    isDisabled(TestIdPack.BUTTON_PAY_DONE, false);
+    verify(TestIdPack.LABEL_TOTALTOPAY, "3.60");
+
+    // Remove Payment
+    tap(TestIdPack.BUTTON_RECEIPT_PAYMENT_ROW1_REMOVE);
+
+    // For Layaways
+    tap(TestIdCore.BUTTON_MENU);
+    tap(TestIdPack.BUTTON_MENU_LAYAWAYTHISRECEIPT);
+    tap(TestIdPack.BUTTON_PAY);
+    isDisabled(TestIdPack.BUTTON_LAYAWAY, false);
+    tap(TestIdPack.BUTTON_LAYAWAY);
+    OBUtils.pause(200);
+    isDisabled(TestIdPack.BUTTON_LAYAWAY, false);
+    verify(TestIdPack.LABEL_TOTALTOPAY, "3.60");
+
+    // unRegister the hook
+    MobileCoreAPI.unHook(HOOK_NAME, HOOK_FUNCTION);
+    isUnregistered = true;
+
+    // Delete Receipt
+    tap(TestIdPack.BUTTON_DELETERECEIPT);
+    tap(TestIdPack.BUTTON_DELETERECEIPT_CONFIRM);
+    verify(TestIdPack.LABEL_TOTALTOPAY, "0.00");
+  }
+
+  private void addProduct() {
+    tap(TestIdPack.BUTTON_BROWSE);
+    tap(TestIdPack.BUTTON_CATEGORY_BACKPACKSANDTRAVEL);
+    tap(TestIdPack.BUTTON_PRODUCT_BACKPACKSANDTRAVEL_ADHESIVEBODYWARNMERS);
+    verify(TestIdPack.LABEL_TOTALTOPAY, "3.60");
+  }
+
+  @Override
+  @After
+  public void after() {
+    if (!isUnregistered) {
+      MobileCoreAPI.unHook(HOOK_NAME, HOOK_FUNCTION);
+    }
+    super.after();
+  }
+}