0032917: [SERQA 1001] Unable to do payment for Verified Return Service

# HG changeset patch
# User Prakash M <prakash@qualiantech.com>
# Date 1462865065 -19800
#      Tue May 10 12:54:25 2016 +0530
# Node ID 50d33b039009454effa9b156ad552ddffac0d38f
# Parent  a0f5f469eef6289aa25ba6f311eacde5f1b329a0
Fixes Issue 1001 :  Fix for verified return payment error for line with service and undergone approval

diff --git a/web/org.openbravo.retail.posterminal/js/model/order.js b/web/org.openbravo.retail.posterminal/js/model/order.js
--- a/web/org.openbravo.retail.posterminal/js/model/order.js
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js
@@ -1480,10 +1480,16 @@
         });
       }
       if (((options && options.line) ? options.line.get('qty') + qty : qty) < 0 && p.get('productType') === 'S') {
+        OB.UTIL.showLoading(false);
         OB.UTIL.Approval.requestApproval(
         OB.MobileApp.view.$.containerWindow.getRoot().model, 'OBPOS_approval.returnService', function (approved, supervisor, approvalType) {
+          OB.UTIL.showLoading(true);
           if (approved) {
             addProductToOrder();
+          } else {
+            if (callback) {
+              callback(true);
+            }
           }
         });
       } else {

# HG changeset patch
# User Prakash M <prakash@qualiantech.com>
# Date 1462882764 -19800
#      Tue May 10 17:49:24 2016 +0530
# Node ID 45e643034ca9b0c71f3d6f72b2d2a97064e8ed5e
# Parent  5e859ac5b1b36f003dd5ceda9c7f8c42a7c567c0
Fixes Issue 1001 :  Fix for verified return payment error for line with service and undergone approval

diff --git a/web/org.openbravo.retail.returns/js/modalReturnLines.js b/web/org.openbravo.retail.returns/js/modalReturnLines.js
--- a/web/org.openbravo.retail.returns/js/modalReturnLines.js
+++ b/web/org.openbravo.retail.returns/js/modalReturnLines.js
@@ -497,18 +497,19 @@
                               'relatedLines': line.relatedLines,
                               'obposEpccode': line.obposEpccode,
                               'obposSerialNumber': line.obposSerialNumber
+                            }, function () {
+                              me.args.args.cancelOperation = true;
+                              bp.set('locId', me.args.args.order.bpLocId);
+                              bp.set('locName', me.nameLocation);
+                              me.args.args.context.model.get('order').calculateReceipt();
+                              //Change Document No of Return
+                              me.args.args.context.model.get('order').setReturnDocumentNo();
+
+                              me.args.args.context.model.get('order').save();
+                              me.args.args.context.model.get('orderList').saveCurrent();
+                              OB.UTIL.HookManager.callbackExecutor(me.args.args, me.args.callbacks);
+                              showLoading();
                             });
-                            me.args.args.cancelOperation = true;
-                            bp.set('locId', me.args.args.order.bpLocId);
-                            bp.set('locName', me.nameLocation);
-                            me.args.args.context.model.get('order').calculateReceipt();
-                            //Change Document No of Return
-                            me.args.args.context.model.get('order').setReturnDocumentNo();
-
-                            me.args.args.context.model.get('order').save();
-                            me.args.args.context.model.get('orderList').saveCurrent();
-                            OB.UTIL.HookManager.callbackExecutor(me.args.args, me.args.callbacks);
-                            showLoading();
                             };
 
                         _.each(line.promotions, function (promotion) {