0037044: [SER QA 3365] Wrong ticket amount when action made before ticke total amount calculated

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1507900188 -19800
#      Fri Oct 13 18:39:48 2017 +0530
# Node ID ea3e765e944cf077e1095c27ef05416409c9b367
# Parent  88b97ce3fcd9556a602457538261762e6a33553e
Related to issue 37044 : Show scrim while calculating receipt for slower POS

* If benchMarkScore is less than 1000, then we need to show scrim for receipt calculations

diff -r 88b97ce3fcd9 -r ea3e765e944c web/org.openbravo.retail.posterminal/js/login/model/login-model.js
--- a/web/org.openbravo.retail.posterminal/js/login/model/login-model.js	Fri Oct 13 10:02:16 2017 +0200
+++ b/web/org.openbravo.retail.posterminal/js/login/model/login-model.js	Fri Oct 13 18:39:48 2017 +0530
@@ -430,6 +430,11 @@
         OB.MobileApp.model.addSyncCheckpointModel(OB.Model.TaxCashUp);
         OB.MobileApp.model.addSyncCheckpointModel(OB.Model.CashUp);
 
+        OB.MobileApp.view.showScrimOnCalculation = false;
+        if (OB.UTIL.localStorage.getItem('benchmarkScore') && parseInt(OB.UTIL.localStorage.getItem('benchmarkScore'), 10) < 1000) {
+          OB.MobileApp.view.showScrimOnCalculation = true;
+        }
+
         var terminal = this.get('terminal');
         OB.UTIL.initCashUp(function () {
           OB.UTIL.calculateCurrentCash(function () {
diff -r 88b97ce3fcd9 -r ea3e765e944c web/org.openbravo.retail.posterminal/js/model/order.js
--- a/web/org.openbravo.retail.posterminal/js/model/order.js	Fri Oct 13 10:02:16 2017 +0200
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js	Fri Oct 13 18:39:48 2017 +0530
@@ -642,6 +642,9 @@
           });
 
           me.adjustPayment();
+          if (OB.MobileApp.view.showScrimOnCalculation && me.calculatingReceipt && OB.MobileApp.view.openedPopup === null) {
+            enyo.$.scrim.hide();
+          }
           if (save) {
             me.save(function () {
               // Reset the flag that protects reentrant invocations to calculateGross().
@@ -741,6 +744,9 @@
       }
       OB.MobileApp.view.waterfall('calculatingReceipt');
       this.calculatingReceipt = true;
+      if (OB.MobileApp.view.showScrimOnCalculation) {
+        enyo.$.scrim.show();
+      }
 
       this.addToListOfCallbacks(callback);
       var executeCallback;
@@ -766,6 +772,9 @@
             me.calculateReceipt();
             return;
           } else {
+            if (OB.MobileApp.view.showScrimOnCalculation && me.calculatingReceipt && OB.MobileApp.view.openedPopup === null) {
+              enyo.$.scrim.hide();
+            }
             if (me.get('calculateReceiptCallbacks') && me.get('calculateReceiptCallbacks').length > 0) {
               executeCallback(me.get('calculateReceiptCallbacks'), function () {
                 me.calculatingReceipt = false;

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1510134062 -19800
#      Wed Nov 08 15:11:02 2017 +0530
# Node ID 5bfccd85dabd58e90e183b76fcd7cce4552848ae
# Parent  f21e14b092a045a017abaf9b5d96ed76e14c7dd0
Fixed issue 37044 : Created Processing Dialog

diff -r f21e14b092a0 -r 5bfccd85dabd web/org.openbravo.mobile.core/assets/css/ob-standard.css
--- a/web/org.openbravo.mobile.core/assets/css/ob-standard.css	Wed Nov 08 09:00:45 2017 +0100
+++ b/web/org.openbravo.mobile.core/assets/css/ob-standard.css	Wed Nov 08 15:11:02 2017 +0530
@@ -1483,6 +1483,110 @@
   padding-left: 40px;
 }
 
+/* Popup.css */
+div.popup-processing {
+  box-shadow: none;
+  border: none;
+  border-radius: 0px;
+  padding: 0px;
+  color: #ffffff;
+  background: none;
+}
+
+div.popup-processing div.processing-container {
+  width: 350px;
+  border: 2px solid white;
+  background-color: black;
+  opacity: 0.8;
+}
+
+div.processing-container div.processing-label {
+  color: #fff;
+  font-size: 20px;
+  text-align: center;
+  line-height: 140%;
+  padding: 15px;
+}
+
+div.processing-container div.processing-spinner {
+  position: relative;
+  height: 120px; 
+  left: 125px; 
+  top: 30px;
+}
+
+@keyframes processing-spinner {
+  0% {
+    opacity: 1;
+  }
+  100% {
+    opacity: 0;
+  }
+}
+
+div.processing-spinner div {
+  position: absolute;
+  animation-name: processing-spinner;
+  animation-duration: 1.1s;
+  animation-timing-function: linear;
+  animation-iteration-count: infinite;
+  left: 47px;
+  top: 0;
+  width: 9px;
+  height: 19.5px;
+  background-color: #cccccc;
+  border-radius: 20%;
+  transform-origin: 4.5px 42px;
+}
+div.processing-spinner div:nth-child(1) {
+  transform: rotate(0deg);
+  animation-delay: -1.000s;
+}
+div.processing-spinner div:nth-child(2) {
+  transform: rotate(30deg);
+  animation-delay: -0.909s;
+}
+div.processing-spinner div:nth-child(3) {
+  transform: rotate(60deg);
+  animation-delay: -0.818s;
+}
+div.processing-spinner div:nth-child(4) {
+  transform: rotate(90deg);
+  animation-delay: -0.727s;
+}
+div.processing-spinner div:nth-child(5) {
+  transform: rotate(120deg);
+  animation-delay: -0.636s;
+}
+div.processing-spinner div:nth-child(6) {
+  transform: rotate(150deg);
+  animation-delay: -0.545s;
+}
+div.processing-spinner div:nth-child(7) {
+  transform: rotate(180deg);
+  animation-delay: -0.455s;
+}
+div.processing-spinner div:nth-child(8) {
+  transform: rotate(210deg);
+  animation-delay: -0.364s;
+}
+div.processing-spinner div:nth-child(9) {
+  transform: rotate(240deg);
+  animation-delay: -0.273s;
+}
+div.processing-spinner div:nth-child(10) {
+  transform: rotate(270deg);
+  animation-delay: -0.182s;
+}
+div.processing-spinner div:nth-child(11) {
+  transform: rotate(300deg);
+  animation-delay: -0.091s;
+}
+div.processing-spinner div:nth-child(12) {
+  transform: rotate(330deg);
+  animation-delay: 0s;
+}
+
 .flexContainer {
   padding: 0;
   margin: 0;
diff -r f21e14b092a0 -r 5bfccd85dabd web/org.openbravo.mobile.core/source/component/ob-terminal-component.js
--- a/web/org.openbravo.mobile.core/source/component/ob-terminal-component.js	Wed Nov 08 09:00:45 2017 +0100
+++ b/web/org.openbravo.mobile.core/source/component/ob-terminal-component.js	Wed Nov 08 15:11:02 2017 +0530
@@ -125,6 +125,24 @@
   }, {
     name: 'dialogsContainer'
   }, {
+    name: 'processingContainer',
+    kind: 'OB.UI.Popup',
+    classes: 'popup-processing',
+    autoDismiss: false,
+    closeOnEscKey: false,
+    components: [{
+      classes: 'processing-container',
+      components: [{
+        classes: 'processing-spinner',
+        allowHtml: true,
+        content: '<div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div>'
+      }, {
+        classes: 'processing-label',
+        name: 'processingLabel',
+        content: ''
+      }]
+    }]
+  }, {
     name: 'alertContainer',
     components: [{
       kind: 'OB.UTIL.showAlert',
diff -r f21e14b092a0 -r 5bfccd85dabd web/org.openbravo.mobile.core/source/utils/ob-utilitiesui.js
--- a/web/org.openbravo.mobile.core/source/utils/ob-utilitiesui.js	Wed Nov 08 09:00:45 2017 +0100
+++ b/web/org.openbravo.mobile.core/source/utils/ob-utilitiesui.js	Wed Nov 08 15:11:02 2017 +0530
@@ -464,6 +464,15 @@
   }
 };
 
+OB.UTIL.showProcessing = function (value, label) {
+  if (value) {
+    OB.MobileApp.view.$.processingLabel.setContent(OB.UTIL.isNullOrUndefined(label) ? 'Processing...' : label);
+    OB.MobileApp.view.$.processingContainer.show();
+  } else {
+    OB.MobileApp.view.$.processingContainer.hide();
+  }
+};
+
 OB.UTIL.showLoggingOut = function (value) {
   if (value) {
     OB.MobileApp.view.$.containerLoggingOut_label.setContent(OB.I18N.getLabel('OBMOBC_LblLoggingOut'));

# 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();

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1510134069 -19800
#      Wed Nov 08 15:11:09 2017 +0530
# Node ID 902c91e500934fbf00d11bce6096c528a4693e4c
# Parent  85fda510dfd10937290e59b1fa9febc0812ea5ab
Verifies issue 37044 : Modified automated test 'I32878_CheckDeleteKeyOnReceipt'

diff -r 85fda510dfd1 -r 902c91e50093 src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/rfid/AddMultipleRFIDProducts.java
--- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/rfid/AddMultipleRFIDProducts.java	Wed Nov 08 11:43:23 2017 +0530
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/rfid/AddMultipleRFIDProducts.java	Wed Nov 08 15:11:09 2017 +0530
@@ -21,8 +21,10 @@
  */
 package org.openbravo.test.mobile.retail.pack.selenium.tests.rfid;
 
+import java.text.DecimalFormat;
+
 import org.openbravo.test.mobile.core.selenium.SeleniumHelper;
-import org.openbravo.test.mobile.core.utils.OBUtils;
+import org.openbravo.test.mobile.core.utils.OBNumber;
 import org.openbravo.test.mobile.core.utils.OBWait;
 import org.openbravo.test.mobile.retail.mobilecore.annotations.TestClassAnnotations;
 import org.openbravo.test.mobile.retail.mobilecore.javascript.SynchronizationHelper;
@@ -61,37 +63,15 @@
         throw new RuntimeException("isRfidController was expected to be true.");
       }
     };
+
     // Add 20 Base Camp Duffel in row with different serial numbers
-    sendEpcCode("303C000000A4DDC000000001");
-    OBUtils.pause(1000);
-    sendEpcCode("303C000000A4DDC000000002");
-    sendEpcCode("303C000000A4DDC000000003");
-    OBUtils.pause(2000);
-    sendEpcCode("303C000000A4DDC000000004");
-    sendEpcCode("303C000000A4DDC000000005");
-    OBUtils.pause(1000);
-    sendEpcCode("303C000000A4DDC000000006");
-    sendEpcCode("303C000000A4DDC000000007");
-    OBUtils.pause(2000);
-    sendEpcCode("303C000000A4DDC000000008");
-    sendEpcCode("303C000000A4DDC000000009");
-    OBUtils.pause(1000);
-    sendEpcCode("303C000000A4DDC000000010");
-    sendEpcCode("303C000000A4DDC000000011");
-    OBUtils.pause(2000);
-    sendEpcCode("303C000000A4DDC000000012");
-    sendEpcCode("303C000000A4DDC000000013");
-    OBUtils.pause(1000);
-    sendEpcCode("303C000000A4DDC000000014");
-    sendEpcCode("303C000000A4DDC000000015");
-    OBUtils.pause(2000);
-    sendEpcCode("303C000000A4DDC000000016");
-    sendEpcCode("303C000000A4DDC000000017");
-    OBUtils.pause(1000);
-    sendEpcCode("303C000000A4DDC000000018");
-    sendEpcCode("303C000000A4DDC000000019");
-    OBUtils.pause(2000);
-    sendEpcCode("303C000000A4DDC000000020");
+    final DecimalFormat codeFormat = new DecimalFormat("00");
+    final OBNumber price = new OBNumber("89.50");
+    for (int i = 1; i <= 20; i++) {
+      sendEpcCode("303C000000A4DDC0000000" + codeFormat.format(i));
+      verify(TestIdPack.BUTTON_PAY, price.multiply(new OBNumber(i)).toString());
+    }
+
     tap(TestIdPack.BUTTON_PAY);
     new OBWait() {
       @Override
@@ -111,7 +91,5 @@
     tap(TestIdPack.BUTTON_PAY_EXACT);
     tap(TestIdPack.BUTTON_PAY_DONE);
     verify(TestIdPack.LABEL_NEW_RECEIPT, "New Receipt");
-
   }
-
 }
\ No newline at end of file
diff -r 85fda510dfd1 -r 902c91e50093 src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/system/I32878_CheckDeleteKeyOnReceipt.java
--- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/system/I32878_CheckDeleteKeyOnReceipt.java	Wed Nov 08 11:43:23 2017 +0530
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/system/I32878_CheckDeleteKeyOnReceipt.java	Wed Nov 08 15:11:09 2017 +0530
@@ -51,6 +51,7 @@
       verify(TestIdPack.LABEL_TOTALTOPAY, "190.40");
 
       SeleniumHelper.pressKey(Keys.DELETE);
+      verify(TestIdPack.LABEL_TOTALTOPAY, "150.50");
       SeleniumHelper.pressKey(Keys.DELETE);
       verify(TestIdPack.LABEL_TOTALTOPAY, "0.00");
 
diff -r 85fda510dfd1 -r 902c91e50093 src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/system/externalInput/I35661_VerifyKeyEventOnButton.java
--- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/system/externalInput/I35661_VerifyKeyEventOnButton.java	Wed Nov 08 11:43:23 2017 +0530
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/system/externalInput/I35661_VerifyKeyEventOnButton.java	Wed Nov 08 15:11:09 2017 +0530
@@ -80,6 +80,7 @@
     SeleniumHelper.pressKey(Keys.NUMPAD7);
     SeleniumHelper.pressKey(Keys.NUMPAD6);
     SeleniumHelper.pressKey(Keys.NUMPAD6);
+    verify(TestIdPack.INPUT_POINTOFSALE, "99887766");
     SeleniumHelper.pressKey(Keys.ENTER);
   }
 

# HG changeset patch
# User Jorge Garcia <jorge.garcia@openbravo.com>
# Date 1514972700 -3600
#      Wed Jan 03 10:45:00 2018 +0100
# Node ID f4a4f10e55e963d58e3ed5f296bee85ef3cb7d44
# Parent  62c3db53e161de5a869430fccf32e3a177de6211
Related to issue 37044: [SER QA 3365] Wrong ticket amount when action made
before ticket total amount calculated

Modify css properties for processing popup.

diff --git a/web/org.openbravo.mobile.core/assets/css/ob-standard.css b/web/org.openbravo.mobile.core/assets/css/ob-standard.css
--- a/web/org.openbravo.mobile.core/assets/css/ob-standard.css
+++ b/web/org.openbravo.mobile.core/assets/css/ob-standard.css
@@ -1535,10 +1535,15 @@
   padding: 0px;
   color: #ffffff;
   background: none;
+  margin-top: 0px !important;
+  margin-left: 0px !important;
+  top: calc(50% - 93px) !important;
+  left: calc(50% - 144px) !important;
 }
 
 div.popup-processing div.processing-container {
-  width: 350px;
+  width: 284px;
+  height: 182px;
   border: 2px solid white;
   background-color: black;
   opacity: 0.8;
@@ -1549,14 +1554,15 @@
   font-size: 20px;
   text-align: center;
   line-height: 140%;
-  padding: 15px;
+  padding: 12px;
 }
 
 div.processing-container div.processing-spinner {
   position: relative;
-  height: 120px;
-  left: 125px;
-  top: 30px;
+  height: 102px;
+  width: 102px;
+  left: calc(50% - 51px);
+  top: 18px;
 }
 
 @keyframes processing-spinner {