Attached Files | 0001-fixes-Issue-42980-added-orderCheckList-hook-and-call.patch [^] (4,694 bytes) 2020-02-03 10:25 [Show Content] [Hide Content]From b1dbc1d8f3979636ab507d0e3303da9c84407615 Mon Sep 17 00:00:00 2001
From: rsalmeanob <rafael.salmean@openbravo.com>
Date: Mon, 3 Feb 2020 09:39:01 +0100
Subject: [PATCH] fixes Issue 42980 added orderCheckList hook and call to allow
custom behaviour in SCO
---
.../posterminal/OBPOSComponentProvider.java | 2 +-
.../js/orderListCheckHook.js | 30 +++++++++++++
.../js/utils/rfidWebsocket.js | 44 ++-----------------
3 files changed, 34 insertions(+), 42 deletions(-)
create mode 100644 web/org.openbravo.retail.posterminal/js/orderListCheckHook.js
diff --git a/src/org/openbravo/retail/posterminal/OBPOSComponentProvider.java b/src/org/openbravo/retail/posterminal/OBPOSComponentProvider.java
index a920041f9..78073cf88 100644
--- a/src/org/openbravo/retail/posterminal/OBPOSComponentProvider.java
+++ b/src/org/openbravo/retail/posterminal/OBPOSComponentProvider.java
@@ -214,7 +214,7 @@ public class OBPOSComponentProvider extends BaseComponentProvider {
"model/discounts",
// Hook
- "components/menuhook",
+ "components/menuhook", "orderListCheckHook",
// Websockets
"utils/rfidWebsocket",
diff --git a/web/org.openbravo.retail.posterminal/js/orderListCheckHook.js b/web/org.openbravo.retail.posterminal/js/orderListCheckHook.js
new file mode 100644
index 000000000..80335c05d
--- /dev/null
+++ b/web/org.openbravo.retail.posterminal/js/orderListCheckHook.js
@@ -0,0 +1,30 @@
+OB.UTIL.HookManager
+ .registerHook(
+ 'OBPOS_OrderListCheck',
+ function(args, c) {
+ var extra = args.extra;
+ if (OB.MobileApp.model.orderList.size() === 1) {
+ extra.set('nextDocumentNo', +OB.MobileApp.model
+ .getNextDocumentno().documentNo.split('/')[1]);
+ extra.set('nextIsNegative', false);
+ } else {
+ if (OB.MobileApp.model.orderList.at(0)
+ .get('documentNo') === OB.MobileApp.model.receipt
+ .get('documentNo')) {
+ extra.set('nextDocumentNo',
+ +OB.MobileApp.model.orderList.at(1).get(
+ 'documentNo').split('/')[1]);
+ extra.set('nextIsNegative',
+ OB.MobileApp.model.orderList.at(1).get(
+ 'isNegative'));
+ } else {
+ extra.set('nextDocumentNo',
+ +OB.MobileApp.model.orderList.at(0).get(
+ 'documentNo').split('/')[1]);
+ extra.set('nextIsNegative',
+ OB.MobileApp.model.orderList.at(0).get(
+ 'isNegative'));
+ }
+ }
+ OB.UTIL.HookManager.callbackExecutor(args, c);
+ });
\ No newline at end of file
diff --git a/web/org.openbravo.retail.posterminal/js/utils/rfidWebsocket.js b/web/org.openbravo.retail.posterminal/js/utils/rfidWebsocket.js
index 73d4596f2..a21a1b575 100644
--- a/web/org.openbravo.retail.posterminal/js/utils/rfidWebsocket.js
+++ b/web/org.openbravo.retail.posterminal/js/utils/rfidWebsocket.js
@@ -647,47 +647,9 @@ OB.UTIL.RfidController.updateEpcBuffers = function(callback, errorCallback) {
extra.set('isLayaway', OB.MobileApp.model.receipt.attributes.isLayaway);
extra.set('orderType', OB.MobileApp.model.receipt.attributes.orderType);
extra.set('lines', lines);
- // OB.MobileApp.model.orderList.size() is 0 for SCO
- if (OB.MobileApp.model.orderList.size() === 0 || OB.MobileApp.model.orderList.size() === 1) {
- extra.set(
- 'nextDocumentNo',
- +OB.MobileApp.model.getNextDocumentno().documentNo.split('/')[1]
- );
- extra.set('nextIsNegative', false);
- } else {
- if (
- OB.MobileApp.model.orderList.at(0).get('documentNo') ===
- OB.MobileApp.model.receipt.get('documentNo')
- ) {
- extra.set(
- 'nextDocumentNo',
- +OB.MobileApp.model.orderList
- .at(1)
- .get('documentNo')
- .split('/')[1]
- );
- extra.set(
- 'nextIsNegative',
- OB.MobileApp.model.orderList
- .at(1)
- .get('isNegative')
- );
- } else {
- extra.set(
- 'nextDocumentNo',
- +OB.MobileApp.model.orderList
- .at(0)
- .get('documentNo')
- .split('/')[1]
- );
- extra.set(
- 'nextIsNegative',
- OB.MobileApp.model.orderList
- .at(0)
- .get('isNegative')
- );
- }
- }
+ OB.UTIL.HookManager.executeHooks('OBPOS_OrderListCheck', {
+ extra: extra
+ });
OB.UTIL.RfidController.get('rfidWebsocket').send(
'updateEpcBuffers:' + uuid + ':' + JSON.stringify(extra)
);
--
2.17.1
|