0037507: New hook is required when synchronyzing a ticket

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1518695603 -19800
#      Thu Feb 15 17:23:23 2018 +0530
# Node ID 8b83b469ad7672e9053a8190f968a5409de562c3
# Parent  024d8ad88853c6f8a6b1d03b895bc703566bbbce
Fixed issue 37507 : Refactor PreSyncReceipt in receipt, multiorders

* receipt json should be set after PreSyncReceipt hook

diff -r 024d8ad88853 -r 8b83b469ad76 web/org.openbravo.retail.posterminal/js/data/dataordersave.js
--- a/web/org.openbravo.retail.posterminal/js/data/dataordersave.js	Tue Feb 13 16:57:20 2018 -0500
+++ b/web/org.openbravo.retail.posterminal/js/data/dataordersave.js	Thu Feb 15 17:23:23 2018 +0530
@@ -215,12 +215,12 @@
             OB.trace('Calculationg cashup information.');
             OB.UTIL.cashUpReport(receipt, function (cashUp) {
               receipt.set('cashUpReportInformation', JSON.parse(cashUp.models[0].get('objToSend')));
-              receipt.set('json', JSON.stringify(receipt.serializeToJSON()));
               receipt.set('hasbeenpaid', 'Y');
               OB.UTIL.HookManager.executeHooks('OBPOS_PreSyncReceipt', {
                 receipt: receipt,
                 model: model
               }, function (args) {
+                receipt.set('json', JSON.stringify(receipt.serializeToJSON()));
                 // Important: at this point, the receipt is considered final. Nothing must alter it
                 OB.UTIL.clone(receipt, frozenReceipt);
                 // when all the properties of the receipt have been set, keep a copy
@@ -320,12 +320,6 @@
               OB.trace('Execution Sync process.');
               //If there are no elements in the hook, we can execute the callback asynchronusly with the synchronization process
               // for non-sync do it here, for sync do it in the success callback of runsyncprocess
-              if (!OB.MobileApp.model.hasPermission('OBMOBC_SynchronizedMode', true) && eventParams && eventParams.callback) {
-                eventParams.callback({
-                  frozenReceipt: frozenReceipt,
-                  isCancelled: false
-                });
-              }
               OB.MobileApp.model.runSyncProcess(function () {
                 // in synchronized mode do the doc sequence update in the success and navigate back
                 if (OB.MobileApp.model.hasPermission('OBMOBC_SynchronizedMode', true)) {
@@ -345,6 +339,13 @@
                       });
                     }, tx);
                   });
+                } else {
+                  if (eventParams && eventParams.callback) {
+                    eventParams.callback({
+                      frozenReceipt: frozenReceipt,
+                      isCancelled: false
+                    });
+                  }
                 }
 
                 serverMessageForQuotation(frozenReceipt);
@@ -451,12 +452,12 @@
             OB.UTIL.calculateCurrentCash();
             OB.UTIL.cashUpReport(currentReceipt, function (cashUp) {
               currentReceipt.set('cashUpReportInformation', JSON.parse(cashUp.models[0].get('objToSend')));
-              currentReceipt.set('json', JSON.stringify(currentReceipt.serializeToJSON()));
               OB.UTIL.HookManager.executeHooks('OBPOS_PreSyncReceipt', {
                 receipt: currentReceipt,
                 model: model,
                 isMultiOrder: true
               }, function (args) {
+                currentReceipt.set('json', JSON.stringify(currentReceipt.serializeToJSON()));
                 OB.Dal.save(currentReceipt, function () {
                   OB.Dal.get(OB.Model.Order, receiptId, function (savedReceipt) {
                     if (!_.isUndefined(savedReceipt.get('amountToLayaway')) && !_.isNull(savedReceipt.get('amountToLayaway')) && savedReceipt.get('generateInvoice')) {
diff -r 024d8ad88853 -r 8b83b469ad76 web/org.openbravo.retail.posterminal/js/model/order.js
--- a/web/org.openbravo.retail.posterminal/js/model/order.js	Tue Feb 13 16:57:20 2018 -0500
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js	Thu Feb 15 17:23:23 2018 +0530
@@ -5233,6 +5233,7 @@
           receipt: model,
           model: model
         }, function (args) {
+          model.set('json', JSON.stringify(model.serializeToJSON()));
           OB.MobileApp.model.updateDocumentSequenceWhenOrderSaved(model.get('documentnoSuffix'), model.get('quotationnoSuffix'), model.get('returnnoSuffix'), function () {
             model.save(function () {
               if (orderList) {
diff -r 024d8ad88853 -r 8b83b469ad76 web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js	Tue Feb 13 16:57:20 2018 -0500
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js	Thu Feb 15 17:23:23 2018 +0530
@@ -654,25 +654,25 @@
     receipt.on('voidLayaway', function () {
       var me = this;
       var finishVoidLayaway = function () {
-          OB.UTIL.HookManager.executeHooks('OBPOS_PreSyncReceipt', {
-            receipt: receipt,
-            model: me
-          }, function (args) {
-            var synchId = OB.UTIL.SynchronizationHelper.busyUntilFinishes('finishVoidLayaway');
-            var process = new OB.DS.Process('org.openbravo.retail.posterminal.ProcessVoidLayaway');
-            var auxReceipt = new OB.Model.Order();
-            OB.UTIL.clone(receipt, auxReceipt);
-            auxReceipt.prepareToSend(function () {
-              OB.UTIL.cashUpReport(auxReceipt, function (cashUp) {
-                receipt.set('cashUpReportInformation', JSON.parse(cashUp.models[0].get('objToSend')));
-                OB.UTIL.calculateCurrentCash(function () {
-                  receipt.set('obposAppCashup', OB.MobileApp.model.get('terminal').cashUpId);
-                  receipt.set('timezoneOffset', new Date().getTimezoneOffset());
-                  receipt.set('gross', OB.DEC.mul(receipt.get('gross'), -1));
-                  receipt.get('payments').forEach(function (payment) {
-                    payment.set('origAmount', OB.DEC.mul(payment.get('origAmount'), -1));
-                    payment.set('paid', OB.DEC.mul(payment.get('paid'), -1));
-                  });
+          var synchId = OB.UTIL.SynchronizationHelper.busyUntilFinishes('finishVoidLayaway');
+          var process = new OB.DS.Process('org.openbravo.retail.posterminal.ProcessVoidLayaway');
+          var auxReceipt = new OB.Model.Order();
+          OB.UTIL.clone(receipt, auxReceipt);
+          auxReceipt.prepareToSend(function () {
+            OB.UTIL.cashUpReport(auxReceipt, function (cashUp) {
+              receipt.set('cashUpReportInformation', JSON.parse(cashUp.models[0].get('objToSend')));
+              OB.UTIL.calculateCurrentCash(function () {
+                receipt.set('obposAppCashup', OB.MobileApp.model.get('terminal').cashUpId);
+                receipt.set('timezoneOffset', new Date().getTimezoneOffset());
+                receipt.set('gross', OB.DEC.mul(receipt.get('gross'), -1));
+                receipt.get('payments').forEach(function (payment) {
+                  payment.set('origAmount', OB.DEC.mul(payment.get('origAmount'), -1));
+                  payment.set('paid', OB.DEC.mul(payment.get('paid'), -1));
+                });
+                OB.UTIL.HookManager.executeHooks('OBPOS_PreSyncReceipt', {
+                  receipt: receipt,
+                  model: me
+                }, function (args) {
                   receipt.set('json', JSON.stringify(receipt.serializeToJSON()));
                   process.exec({
                     messageId: OB.UTIL.get_UUID(),
@@ -734,26 +734,26 @@
     receipt.on('cancelLayaway', function () {
       var me = this;
       var finishCancelLayaway = function () {
-          OB.UTIL.HookManager.executeHooks('OBPOS_PreSyncReceipt', {
-            receipt: receipt,
-            model: me
-          }, function (args) {
-            var processCancelLayaway, cancelLayawayObj = {},
-                cancelLayawayModel = new OB.Model.CancelLayaway(),
-                documentNo = receipt.get('documentNo'),
-                process = new OB.DS.Process('org.openbravo.retail.posterminal.process.IsOrderCancelled');
+          var processCancelLayaway, cancelLayawayObj = {},
+              cancelLayawayModel = new OB.Model.CancelLayaway(),
+              documentNo = receipt.get('documentNo'),
+              process = new OB.DS.Process('org.openbravo.retail.posterminal.process.IsOrderCancelled');
 
-            processCancelLayaway = function () {
-              receipt.set('posTerminal', OB.MobileApp.model.get('terminal').id);
-              receipt.set('obposAppCashup', OB.MobileApp.model.get('terminal').cashUpId);
-              receipt.set('timezoneOffset', new Date().getTimezoneOffset());
+          processCancelLayaway = function () {
+            receipt.set('posTerminal', OB.MobileApp.model.get('terminal').id);
+            receipt.set('obposAppCashup', OB.MobileApp.model.get('terminal').cashUpId);
+            receipt.set('timezoneOffset', new Date().getTimezoneOffset());
+            var auxReceipt = new OB.Model.Order();
+            OB.UTIL.clone(receipt, auxReceipt);
+            auxReceipt.prepareToSend(function () {
+              OB.UTIL.cashUpReport(auxReceipt, function (cashUp) {
+                receipt.set('cashUpReportInformation', JSON.parse(cashUp.models[0].get('objToSend')));
+                OB.UTIL.HookManager.executeHooks('OBPOS_PreSyncReceipt', {
+                  receipt: receipt,
+                  model: me
+                }, function (args) {
+                  receipt.set('json', JSON.stringify(receipt.serializeToJSON()));
 
-              receipt.set('json', JSON.stringify(receipt.serializeToJSON()));
-              var auxReceipt = new OB.Model.Order();
-              OB.UTIL.clone(receipt, auxReceipt);
-              auxReceipt.prepareToSend(function () {
-                OB.UTIL.cashUpReport(auxReceipt, function (cashUp) {
-                  receipt.set('cashUpReportInformation', JSON.parse(cashUp.models[0].get('objToSend')));
                   var cancelLayawayObj = receipt.serializeToJSON(),
                       paymentStatus = receipt.getPaymentStatus();
 
@@ -803,37 +803,37 @@
                   });
                 });
               });
-              receipt.set('negativeDocNo', documentNo + '*R*');
-              receipt.trigger('print');
-            };
+            });
+            receipt.set('negativeDocNo', documentNo + '*R*');
+            receipt.trigger('print');
+          };
 
-            process.exec({
-              orderId: receipt.get('id'),
-              documentNo: receipt.get('documentNo')
-            }, function (data) {
-              if (data && data.exception) {
-                if (data.exception.message) {
-                  OB.UTIL.showConfirmation.display(OB.I18N.getLabel('OBMOBC_Error'), data.exception.message);
-                  return;
-                }
-                OB.UTIL.showConfirmation.display(OB.I18N.getLabel('OBMOBC_Error'), OB.I18N.getLabel('OBMOBC_OfflineWindowRequiresOnline'));
+          process.exec({
+            orderId: receipt.get('id'),
+            documentNo: receipt.get('documentNo')
+          }, function (data) {
+            if (data && data.exception) {
+              if (data.exception.message) {
+                OB.UTIL.showConfirmation.display(OB.I18N.getLabel('OBMOBC_Error'), data.exception.message);
                 return;
-              } else if (data && data.orderCancelled) {
-                OB.UTIL.showConfirmation.display(OB.I18N.getLabel('OBMOBC_Error'), OB.I18N.getLabel('OBPOS_LayawayCancelledError'));
-                return;
+              }
+              OB.UTIL.showConfirmation.display(OB.I18N.getLabel('OBMOBC_Error'), OB.I18N.getLabel('OBMOBC_OfflineWindowRequiresOnline'));
+              return;
+            } else if (data && data.orderCancelled) {
+              OB.UTIL.showConfirmation.display(OB.I18N.getLabel('OBMOBC_Error'), OB.I18N.getLabel('OBPOS_LayawayCancelledError'));
+              return;
+            } else {
+              if (OB.MobileApp.model.hasPermission('OBMOBC_SynchronizedMode', true)) {
+                OB.UTIL.rebuildCashupFromServer(function () {
+                  processCancelLayaway();
+                });
               } else {
-                if (OB.MobileApp.model.hasPermission('OBMOBC_SynchronizedMode', true)) {
-                  OB.UTIL.rebuildCashupFromServer(function () {
-                    processCancelLayaway();
-                  });
-                } else {
-                  processCancelLayaway();
-                }
+                processCancelLayaway();
               }
-            }, function () {
-              OB.UTIL.showConfirmation.display(OB.I18N.getLabel('OBMOBC_Error'), OB.I18N.getLabel('OBMOBC_OfflineWindowRequiresOnline'));
-              OB.error(arguments);
-            });
+            }
+          }, function () {
+            OB.UTIL.showConfirmation.display(OB.I18N.getLabel('OBMOBC_Error'), OB.I18N.getLabel('OBMOBC_OfflineWindowRequiresOnline'));
+            OB.error(arguments);
           });
           };
       if (receipt.overpaymentExists()) {