# HG changeset patch
# User Asier Martirena <asier.martirena@openbravo.com>
# Date 1452862476 -3600
#      Fri Jan 15 13:54:36 2016 +0100
# Node ID 28dde484254df5eeaec0d2acfbaef1bca1a292eb
# Parent  22d168dadc71475402440f344fb6ecba8f4f4677
Backout for 31673 issue

diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js b/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js
@@ -407,7 +407,7 @@
       });
     }, this);
 
-    receipt.on('paymentDone', function (openDrawer, doneProcessCallback) {
+    receipt.on('paymentDone', function (openDrawer) {
       if (receipt.overpaymentExists()) {
         var symbol = OB.MobileApp.model.get('terminal').symbol;
         var symbolAtRight = OB.MobileApp.model.get('terminal').currencySymbolAtTheRight;
@@ -430,13 +430,7 @@
           }
         }, {
           label: OB.I18N.getLabel('OBMOBC_LblCancel')
-        }], {
-          onHideFunction: function () {
-            if (!_.isUndefined(doneProcessCallback)) {
-              doneProcessCallback(false);
-            }
-          }
-        });
+        }]);
       } else if (receipt.get('orderType') === 3) {
         receipt.trigger('voidLayaway');
       } else if ((OB.DEC.abs(receipt.getPayment()) !== OB.DEC.abs(receipt.getGross())) && (!receipt.isLayaway() && !receipt.get('paidOnCredit'))) {
@@ -448,13 +442,7 @@
           }
         }, {
           label: OB.I18N.getLabel('OBMOBC_LblCancel')
-        }], {
-          onHideFunction: function () {
-            if (!_.isUndefined(doneProcessCallback)) {
-              doneProcessCallback(false);
-            }
-          }
-        });
+        }]);
       } else {
         if (openDrawer) {
           OB.POS.hwserver.openDrawer({
diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js
@@ -885,11 +885,7 @@
         if (this.drawerOpened) {
           this.setDisabled(true);
           enyo.$.scrim.show();
-          me.owner.model.get('order').trigger('paymentDone', false, function (result) {
-            if (!result) {
-              me.setDisabled(false);
-            }
-          });
+          me.owner.model.get('order').trigger('paymentDone', false);
           this.drawerOpened = false;
           this.setContent(OB.I18N.getLabel('OBPOS_LblOpen'));
         } else {
@@ -903,21 +899,13 @@
       } else {
         this.setDisabled(true);
         enyo.$.scrim.show();
-        me.owner.receipt.trigger('paymentDone', this.allowOpenDrawer, function (result) {
-          if (!result) {
-            me.setDisabled(false);
-          }
-        });
+        me.owner.receipt.trigger('paymentDone', this.allowOpenDrawer);
       }
     } else {
       if (this.drawerpreference && this.allowOpenDrawer) {
         if (this.drawerOpened) {
           enyo.$.scrim.show();
-          this.owner.model.get('multiOrders').trigger('paymentDone', false, function (result) {
-            if (!result) {
-              me.setDisabled(false);
-            }
-          });
+          this.owner.model.get('multiOrders').trigger('paymentDone', false);
           this.owner.model.get('multiOrders').set('openDrawer', false);
           this.drawerOpened = false;
           this.setContent(OB.I18N.getLabel('OBPOS_LblOpen'));
@@ -931,11 +919,7 @@
         }
       } else {
         enyo.$.scrim.show();
-        this.owner.model.get('multiOrders').trigger('paymentDone', this.allowOpenDrawer, function (result) {
-          if (!result) {
-            me.setDisabled(false);
-          }
-        });
+        this.owner.model.get('multiOrders').trigger('paymentDone', this.allowOpenDrawer);
         this.owner.model.get('multiOrders').set('openDrawer', false);
       }
     }