0039282: callback property coming in args from OBPOS_preAddPayment hook is not any more executed because it is overriden

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1537265783 -19800
#      Tue Sep 18 15:46:23 2018 +0530
# Node ID 2e659bccdb5e8ba61e18b9457f4cda09e8951e25
# Parent  2950727650885f990c0d412518a66ed03446e7d8
Related to issue 39282 : Removed callback property in PrePayment hook

diff -r 295072765088 -r 2e659bccdb5e web/org.openbravo.retail.posterminal/js/model/order.js
--- a/web/org.openbravo.retail.posterminal/js/model/order.js	Tue Sep 18 12:50:47 2018 +0530
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js	Tue Sep 18 15:46:23 2018 +0530
@@ -4562,7 +4562,7 @@
     },
 
     addPayment: function (payment, callback) {
-      var payments, total, i, max, p, order, paymentSign;
+      var payments, total, i, max, p, order, paymentSign, finalCallback;
 
       if (this.get('isPaid') && !payment.get('isReversePayment') && !this.get('doCancelAndReplace') && this.getPrePaymentQty() === OB.DEC.sub(this.getTotal(), this.getCredit()) && !this.isNewReversed()) {
         OB.UTIL.showWarning(OB.I18N.getLabel('OBPOS_CannotIntroducePayment'));
@@ -4588,13 +4588,18 @@
         return;
       }
 
+      finalCallback = function () {
+        if (callback instanceof Function) {
+          callback(order);
+        }
+      };
+
       payments = this.get('payments');
       total = OB.DEC.abs(this.getTotal());
       OB.UTIL.HookManager.executeHooks('OBPOS_preAddPayment', {
         paymentToAdd: payment,
         payments: payments,
-        receipt: this,
-        callback: callback
+        receipt: this
       }, function (args) {
         var executeFinalCallback = function (saveChanges) {
             if (saveChanges) {
@@ -4608,9 +4613,7 @@
               payments: payments,
               receipt: order
             }, function (args2) {
-              if (args.callback instanceof Function) {
-                args.callback(order);
-              }
+              finalCallback();
             });
             };
 
@@ -6992,8 +6995,7 @@
       }
     },
     addPayment: function (payment, callback) {
-      var payments, total;
-      var i, max, p, order;
+      var i, max, p, order, payments, total, finalCallback;
 
       if (!OB.DEC.isNumber(payment.get('amount'))) {
         OB.UTIL.showWarning(OB.I18N.getLabel('OBPOS_MsgPaymentAmountError'));
@@ -7009,14 +7011,19 @@
         return;
       }
 
+      finalCallback = function () {
+        if (callback instanceof Function) {
+          callback(order);
+        }
+      };
+
       payments = this.get('payments');
       total = OB.DEC.abs(this.getTotal());
       order = this;
       OB.UTIL.HookManager.executeHooks('OBPOS_preAddPayment', {
         paymentToAdd: payment,
         payments: payments,
-        receipt: this,
-        callback: callback
+        receipt: this
       }, function (args) {
         var executeFinalCallback = function () {
             OB.UTIL.HookManager.executeHooks('OBPOS_postAddPayment', {
@@ -7024,9 +7031,7 @@
               payments: payments,
               receipt: order
             }, function (args2) {
-              if (args.callback instanceof Function) {
-                args.callback(order);
-              }
+              finalCallback();
             });
             };