# HG changeset patch
# User Asier Martirena <asier.martirena@openbravo.com>
# Date 1452862512 -3600
#      Fri Jan 15 13:55:12 2016 +0100
# Node ID cde46b546ec1381fc08e1902addba2d2f9187bd1
# Parent  28dde484254df5eeaec0d2acfbaef1bca1a292eb
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
@@ -416,23 +416,17 @@
           label: OB.I18N.getLabel('OBMOBC_LblOk'),
           isConfirmButton: true,
           action: function () {
-            if (receipt.get('orderType') === 3) {
-              receipt.trigger('voidLayaway');
-            } else {
-              if (openDrawer) {
-                OB.POS.hwserver.openDrawer({
-                  openFirst: false,
-                  receipt: receipt
-                }, OB.MobileApp.model.get('permissions').OBPOS_timeAllowedDrawerSales);
-              }
-              receipt.trigger('paymentAccepted');
+            if (openDrawer) {
+              OB.POS.hwserver.openDrawer({
+                openFirst: false,
+                receipt: receipt
+              }, OB.MobileApp.model.get('permissions').OBPOS_timeAllowedDrawerSales);
             }
+            receipt.trigger('paymentAccepted');
           }
         }, {
           label: OB.I18N.getLabel('OBMOBC_LblCancel')
         }]);
-      } 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'))) {
         OB.UTIL.showConfirmation.display(OB.I18N.getLabel('OBPOS_PaymentAmountDistinctThanReceiptAmountTitle'), OB.I18N.getLabel('OBPOS_PaymentAmountDistinctThanReceiptAmountBody'), [{
           label: OB.I18N.getLabel('OBMOBC_LblOk'),
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
@@ -883,9 +883,13 @@
     if (myModel.get('leftColumnViewManager').isOrder()) {
       if (this.drawerpreference && this.allowOpenDrawer) {
         if (this.drawerOpened) {
-          this.setDisabled(true);
-          enyo.$.scrim.show();
-          me.owner.model.get('order').trigger('paymentDone', false);
+          if (this.owner.receipt.get('orderType') === 3) {
+            this.owner.receipt.trigger('voidLayaway');
+          } else {
+            this.setDisabled(true);
+            enyo.$.scrim.show();
+            me.owner.model.get('order').trigger('paymentDone', false);
+          }
           this.drawerOpened = false;
           this.setContent(OB.I18N.getLabel('OBPOS_LblOpen'));
         } else {
@@ -897,9 +901,14 @@
           this.setContent(OB.I18N.getLabel('OBPOS_LblDone'));
         }
       } else {
-        this.setDisabled(true);
-        enyo.$.scrim.show();
-        me.owner.receipt.trigger('paymentDone', this.allowOpenDrawer);
+        //Void Layaway
+        if (this.owner.receipt.get('orderType') === 3) {
+          this.owner.receipt.trigger('voidLayaway');
+        } else {
+          this.setDisabled(true);
+          enyo.$.scrim.show();
+          me.owner.receipt.trigger('paymentDone', this.allowOpenDrawer);
+        }
       }
     } else {
       if (this.drawerpreference && this.allowOpenDrawer) {