0038847: Wrong asynchrony point in in cash managment process

# HG changeset patch
# User Guillermo Alvarez de Eulate <guillermo.alvarez@openbravo.com>
# Date 1530198490 -7200
#      Thu Jun 28 17:08:10 2018 +0200
# Node ID 4b82add38cba7853b18aa3ececcab1386f042546
# Parent  4585ba9f88ced3d0244d83d761b527103fd8d5b0
Fixed Issue 38847: Fixed some code which assumes synchrony when asynchorny happens

Trigger paymentdone should wait until callback to remove currentPayment
Run Synchronization should wait until calculateCurrentCash is finished

diff -r 4585ba9f88ce -r 4b82add38cba web/org.openbravo.retail.posterminal/js/cashmgmt/model/cashmgmt-model.js
--- a/web/org.openbravo.retail.posterminal/js/cashmgmt/model/cashmgmt-model.js	Wed Jun 27 14:21:24 2018 +0200
+++ b/web/org.openbravo.retail.posterminal/js/cashmgmt/model/cashmgmt-model.js	Thu Jun 28 17:08:10 2018 +0200
@@ -26,7 +26,7 @@
     var me = this;
 
     this.depsdropstosave = new Backbone.Collection();
-    this.depsdropstosave.on('paymentDone', function (model, p, callback) {
+    this.depsdropstosave.on('paymentDone', function (model, p, callback, errorCallback) {
       // argument checks
       OB.UTIL.Debug.execute(function () {
         if (!me.payments) {
@@ -34,6 +34,7 @@
         }
       });
       var isError = false;
+
       me.payments.each(function (pay) {
         if (p.id === pay.get('paymentmethod_id')) {
           isError = (p.type === 'drop' && OB.DEC.sub(pay.get('total'), OB.DEC.mul(p.amount, p.rate)) < 0);
@@ -42,6 +43,9 @@
 
       if (isError) {
         OB.UTIL.showError(OB.I18N.getLabel('OBPOS_MsgMoreThanAvailable'));
+        if (errorCallback) {
+          errorCallback(OB.I18N.getLabel('OBPOS_MsgMoreThanAvailable'));
+        }
         return;
       }
 
@@ -99,7 +103,12 @@
           callback();
         }
       }, function () {
-        OB.error("Could not save payment information");
+        var errorMsg = 'Could not save payment information';
+        if (errorCallback) {
+          errorCallback(errorMsg);
+        } else {
+          OB.error(errorMsg);
+        }
       });
     }, this);
 
@@ -201,12 +210,14 @@
 
         setCashupObjectInCashMgmt = function (depdrops, cashUp, index) {
           if (index === depdrops.length) {
-            OB.UTIL.calculateCurrentCash();
-            runSync();
+            OB.UTIL.calculateCurrentCash(function () {
+              runSync();
+            });
           } else {
             var depdrop = depdrops[index];
+            var depDropJson = JSON.stringify(depdrop.serializeToJSON());
             depdrop.set('cashUpReportInformation', JSON.parse(cashUp.models[0].get('objToSend')));
-            depdrop.set('json', JSON.stringify(depdrop.serializeToJSON()));
+            depdrop.set('json', depDropJson);
             OB.Dal.save(depdrop, function () {
               setCashupObjectInCashMgmt(depdrops, cashUp, index + 1);
             }, function () {
diff -r 4585ba9f88ce -r 4b82add38cba web/org.openbravo.retail.posterminal/js/cashmgmt/view/cashmgmt.js
--- a/web/org.openbravo.retail.posterminal/js/cashmgmt/view/cashmgmt.js	Wed Jun 27 14:21:24 2018 +0200
+++ b/web/org.openbravo.retail.posterminal/js/cashmgmt/view/cashmgmt.js	Thu Jun 28 17:08:10 2018 +0200
@@ -160,13 +160,21 @@
     // cashMgmtDepositEvents or cashMgmtDropEvents Collection is shown by OB.UI.Table, when selecting an option 'click' event
     // is triggered, propagating this UI event to model here
     this.model.get('cashMgmtDepositEvents').on('click', function (model) {
-      this.model.depsdropstosave.trigger('paymentDone', model, this.currentPayment);
-      delete this.currentPayment;
+      var me = this;
+      this.model.depsdropstosave.trigger('paymentDone', model, this.currentPayment, function () {
+        delete me.currentPayment;
+      }, function () {
+        delete me.currentPayment;
+      });
     }, this);
 
     this.model.get('cashMgmtDropEvents').on('click', function (model) {
-      this.model.depsdropstosave.trigger('paymentDone', model, this.currentPayment);
-      delete this.currentPayment;
+      var me = this;
+      this.model.depsdropstosave.trigger('paymentDone', model, this.currentPayment, function () {
+        delete me.currentPayment;
+      }, function () {
+        delete me.currentPayment;
+      });
     }, this);
 
     //finished

changeset:   9551:2028a4884b06
tag:         tip
user:        Guillermo Alvarez de Eulate <guillermo.alvarez@openbravo.com>
date:        Mon Jul 02 13:00:19 2018 +0200
summary:     Related to issue 38847: generate json after save cashuprepoinfo

diff -r 33f632122fce -r 2028a4884b06 web/org.openbravo.retail.posterminal/js/cashmgmt/model/cashmgmt-model.js
--- a/web/org.openbravo.retail.posterminal/js/cashmgmt/model/cashmgmt-model.js	Fri Jun 29 15:48:52 2018 +0200
+++ b/web/org.openbravo.retail.posterminal/js/cashmgmt/model/cashmgmt-model.js	Mon Jul 02 13:00:19 2018 +0200
@@ -234,8 +234,9 @@
             });
           } else {
             var depdrop = depdrops[index];
-            var depDropJson = JSON.stringify(depdrop.serializeToJSON());
+            var depDropJson;
             depdrop.set('cashUpReportInformation', JSON.parse(cashUp.models[0].get('objToSend')));
+            depDropJson = JSON.stringify(depdrop.serializeToJSON());
             depdrop.set('json', depDropJson);
             OB.info('[CashMgmntSync][setCashupObjectInCashMgmt][saveCashMgmnt] execute save for deposit/drop in local DB:' + depDropJson);
             OB.Dal.save(depdrop, function () {