diff -r bbbe22655371 src-db/database/sourcedata/OBMOBC_PROCESS_DEFINITION.xml
--- a/src-db/database/sourcedata/OBMOBC_PROCESS_DEFINITION.xml Wed Nov 14 10:09:02 2018 +0100
+++ b/src-db/database/sourcedata/OBMOBC_PROCESS_DEFINITION.xml Mon Dec 10 12:28:59 2018 +0100
@@ -9,6 +9,7 @@
+
@@ -20,6 +21,7 @@
+
@@ -31,8 +33,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -42,8 +69,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -53,6 +93,7 @@
+
@@ -64,8 +105,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -75,6 +129,7 @@
+
@@ -86,6 +141,7 @@
+
diff -r bbbe22655371 web/org.openbravo.retail.posterminal/js/components/bplocation.js
--- a/web/org.openbravo.retail.posterminal/js/components/bplocation.js Wed Nov 14 10:09:02 2018 +0100
+++ b/web/org.openbravo.retail.posterminal/js/components/bplocation.js Mon Dec 10 12:28:59 2018 +0100
@@ -707,6 +707,7 @@
return true;
},
searchAction: function (inSender, inEvent) {
+ var execution = OB.UTIL.ProcessController.start('searchCustomerAddress');
var me = this,
criteria = {},
filter = inEvent.locName;
@@ -765,6 +766,7 @@
criteria.remoteFilters = remoteCriteria;
}
OB.Dal.find(OB.Model.BPLocation, criteria, successCallbackBPsLoc, errorCallback);
+ OB.UTIL.ProcessController.finish('searchCustomerAddress', execution);
return true;
},
bpsList: null,
diff -r bbbe22655371 web/org.openbravo.retail.posterminal/js/components/bplocationship.js
--- a/web/org.openbravo.retail.posterminal/js/components/bplocationship.js Wed Nov 14 10:09:02 2018 +0100
+++ b/web/org.openbravo.retail.posterminal/js/components/bplocationship.js Mon Dec 10 12:28:59 2018 +0100
@@ -1,6 +1,6 @@
/*
************************************************************************************
- * Copyright (C) 2012-2017 Openbravo S.L.U.
+ * Copyright (C) 2012-2018 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.
@@ -58,6 +58,7 @@
return true;
},
searchAction: function (inSender, inEvent) {
+ var execution = OB.UTIL.ProcessController.start('searchCustomerAddress');
var me = this,
criteria = {},
filter = inEvent.locName;
@@ -107,6 +108,7 @@
criteria.remoteFilters = remoteCriteria;
}
OB.Dal.find(OB.Model.BPLocation, criteria, successCallbackBPsLoc, errorCallback);
+ OB.UTIL.ProcessController.finish('searchCustomerAddress', execution);
return true;
},
bpsList: null,
diff -r bbbe22655371 web/org.openbravo.retail.posterminal/js/components/businesspartner_selector.js
--- a/web/org.openbravo.retail.posterminal/js/components/businesspartner_selector.js Wed Nov 14 10:09:02 2018 +0100
+++ b/web/org.openbravo.retail.posterminal/js/components/businesspartner_selector.js Mon Dec 10 12:28:59 2018 +0100
@@ -1,6 +1,6 @@
/*
************************************************************************************
- * Copyright (C) 2016-2017 Openbravo S.L.U.
+ * Copyright (C) 2016-2018 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.
@@ -480,6 +480,7 @@
return true;
},
searchAction: function (inSender, inEvent) {
+ var execution = OB.UTIL.ProcessController.start('searchCustomer');
var me = this;
if (OB.MobileApp.model.hasPermission('OBPOS_retail.createCustomerButton', true)) {
@@ -671,7 +672,7 @@
}
OB.Dal.query(OB.Model.BPartnerFilter, select + orderby, params, successCallbackBPs, errorCallback, null, null, limit);
}
-
+ OB.UTIL.ProcessController.finish('searchCustomer', execution);
return true;
},
bpsList: null,
diff -r bbbe22655371 web/org.openbravo.retail.posterminal/js/login/model/login-model.js
--- a/web/org.openbravo.retail.posterminal/js/login/model/login-model.js Wed Nov 14 10:09:02 2018 +0100
+++ b/web/org.openbravo.retail.posterminal/js/login/model/login-model.js Mon Dec 10 12:28:59 2018 +0100
@@ -332,6 +332,17 @@
}
});
+ // move terminal log model to the end of models to sync since has less priority
+ var i, indexTerminalLogModel = -1;
+ for (i = 0; i < this.get('dataSyncModels').length; i++) {
+ if (this.get('dataSyncModels')[i].name === "OBMOBC_TerminalLog") {
+ indexTerminalLogModel = i;
+ }
+ }
+ if (indexTerminalLogModel !== -1) {
+ this.get('dataSyncModels').push(this.get('dataSyncModels').splice(indexTerminalLogModel, 1)[0]);
+ }
+
this.on('ready', function () {
OB.debug("next process: 'retail.pointofsale' window");
if (this.get('terminal').currencyFormat) {
@@ -453,7 +464,6 @@
OB.UTIL.HookManager.executeHooks('OBPOS_PreSynchData', {}, function () {
OB.debug('runSyncProcess: synchronize all models');
OB.MobileApp.model.syncAllModels(function () {
- OB.info('runSyncProcess: synchronization successfully done');
executeCallbacks(true, me.get('syncProcessCallbacks'), function () {
me.pendingSyncProcess = false;
});
@@ -532,7 +542,7 @@
},
postSyncProcessActions: function () {
- if (OB.MobileApp.model.get('context').user && _.isUndefined(OB.MobileApp.model.get('context').user.isSalesRepresentative)) {
+ if (OB.MobileApp.model.get('context') && OB.MobileApp.model.get('context').user && _.isUndefined(OB.MobileApp.model.get('context').user.isSalesRepresentative)) {
OB.Dal.get(OB.Model.SalesRepresentative, OB.MobileApp.model.usermodel.get('id'), function (salesrepresentative) {
if (!salesrepresentative) {
OB.MobileApp.model.get('context').user.isSalesRepresentative = false;
diff -r bbbe22655371 web/org.openbravo.retail.posterminal/js/model/order.js
--- a/web/org.openbravo.retail.posterminal/js/model/order.js Wed Nov 14 10:09:02 2018 +0100
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js Mon Dec 10 12:28:59 2018 +0100
@@ -1046,6 +1046,7 @@
clearWith: function (_order) {
var execution = OB.UTIL.ProcessController.start('clearWith');
+
// verify that the clearWith is not used for any other purpose than to update and fire the events of the UI receipt
OB.UTIL.Debug.execute(function () {
var isTheUIReceipt = this.cid === OB.MobileApp.model.receipt.cid;
@@ -6543,6 +6544,7 @@
}
},
loadCurrent: function (isNew) {
+ OB.MobileApp.model.set('terminalLogContext', this.current.get('documentNo'));
// Check if the current order to be loaded should be deleted
if (this.current.get('obposIsDeleted') && this.current.get('id')) {
var deletedOrderDocNo = this.current.get('documentNo');
@@ -6970,19 +6972,23 @@
}
},
addPayment: function (payment, callback) {
+ var execution = OB.UTIL.ProcessController.start('addPayment');
var i, max, p, order, payments, total, finalCallback;
if (!OB.DEC.isNumber(payment.get('amount'))) {
OB.UTIL.showWarning(OB.I18N.getLabel('OBPOS_MsgPaymentAmountError'));
+ OB.UTIL.ProcessController.finish('addPayment', execution);
return;
}
if (this.stopAddingPayments) {
OB.UTIL.showWarning(OB.I18N.getLabel('OBPOS_CannotAddPayments'));
+ OB.UTIL.ProcessController.finish('addPayment', execution);
return;
}
if (!payment.get('isReversePayment') && this.getPending() <= 0 && payment.get('amount') > 0) {
OB.UTIL.showWarning(OB.I18N.getLabel('OBPOS_PaymentsExact'));
+ OB.UTIL.ProcessController.finish('addPayment', execution);
return;
}
@@ -7012,6 +7018,7 @@
if (args && args.cancellation) {
executeFinalCallback();
+ OB.UTIL.ProcessController.finish('addPayment', execution);
return;
}
@@ -7029,6 +7036,7 @@
order.adjustPayment();
order.trigger('displayTotal');
executeFinalCallback();
+ OB.UTIL.ProcessController.finish('addPayment', execution);
return;
}
}
@@ -7044,6 +7052,7 @@
order.adjustPayment();
order.trigger('displayTotal');
executeFinalCallback();
+ OB.UTIL.ProcessController.finish('addPayment', execution);
return;
}
}
@@ -7058,6 +7067,7 @@
order.adjustPayment();
order.trigger('displayTotal');
executeFinalCallback();
+ OB.UTIL.ProcessController.finish('addPayment', execution);
return;
});
},