# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1510134102 -19800
#      Wed Nov 08 15:11:42 2017 +0530
# Node ID 021994bbcdf5e0f64a9265517965ae365e055f37
# Parent  e13f1c8b3e268a3f234cdf80375a9726fc17e399
Fixed issue 37044 : Show Processing Dialog while calculating receipt for slower POS

diff -r e13f1c8b3e26 -r 021994bbcdf5 web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js	Wed Nov 08 09:56:01 2017 +0100
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js	Wed Nov 08 15:11:42 2017 +0530
@@ -332,6 +332,20 @@
       }
     };
 
+    receipt.on('calculatingReceipt', function () {
+      enyo.$.scrim2.show();
+      setTimeout(function () {
+        if (receipt.calculatingReceipt === true) {
+          OB.UTIL.showProcessing(true, 'Please wait while the receipt is being processed');
+        }
+      }, 500);
+    });
+
+    receipt.on('calculatedReceipt', function () {
+      enyo.$.scrim2.hide();
+      OB.UTIL.showProcessing(false);
+    });
+
     receipt.on('checkOpenDrawer', function () {
       me.checkOpenDrawer();
     });
diff -r e13f1c8b3e26 -r 021994bbcdf5 web/org.openbravo.retail.posterminal/js/utils/preScanningFocusHook.js
--- a/web/org.openbravo.retail.posterminal/js/utils/preScanningFocusHook.js	Wed Nov 08 09:56:01 2017 +0100
+++ b/web/org.openbravo.retail.posterminal/js/utils/preScanningFocusHook.js	Wed Nov 08 15:11:42 2017 +0530
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2016 Openbravo S.L.U.
+ * Copyright (C) 2016-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.
@@ -9,7 +9,7 @@
 
 OB.UTIL.HookManager.registerHook('OBMOBC_PreScanningFocus', function (args, callbacks) {
   if (OB.UTIL.RfidController.isRfidConfigured() && OB.UTIL.RfidController.get('rfidWebsocket')) {
-    if (args.scanMode === true && !OB.UTIL.RfidController.get('isRFIDEnabled') && OB.UTIL.RfidController.get('reconnectOnScanningFocus') && (OB.MobileApp.view.originalRFIDMode || (OB.MobileApp.view.originalRFIDMode === false && OB.MobileApp.model.get('lastPaneShown') !== 'payment'))) {
+    if ((OB.UTIL.isNullOrUndefined(args.scanMode) || args.scanMode === true) && !OB.UTIL.RfidController.get('isRFIDEnabled') && OB.UTIL.RfidController.get('reconnectOnScanningFocus') && (OB.MobileApp.view.originalRFIDMode || (OB.MobileApp.view.originalRFIDMode === false && OB.MobileApp.model.get('lastPaneShown') !== 'payment'))) {
       OB.UTIL.RfidController.connectRFIDDevice();
     } else if (args.scanMode === false && OB.UTIL.RfidController.get('isRFIDEnabled')) {
       OB.UTIL.RfidController.disconnectRFIDDevice();