# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1451284853 -19800
# Node ID 0bafd370e8a3b6e6943ad703751ca0c977d13273
# Parent  26730e72b2410660dbe6bdcd2914b87f60ba1e27
Related to issue 31703 : Load Receipt in Popup Selector if it is already opened in receipt list

diff --git a/web/org.openbravo.retail.posterminal/js/components/modalpaidreceipts.js b/web/org.openbravo.retail.posterminal/js/components/modalpaidreceipts.js
--- a/web/org.openbravo.retail.posterminal/js/components/modalpaidreceipts.js
+++ b/web/org.openbravo.retail.posterminal/js/components/modalpaidreceipts.js
@@ -396,7 +396,12 @@
           } else if (me.model.get('orderList').models[i].get('isQuotation')) {
             orderTypeMsg = OB.I18N.getLabel('OBPOS_Quotation');
           }
-          OB.UTIL.showWarning(enyo.format(OB.I18N.getLabel('OBPOS_ticketAlreadyOpened'), orderTypeMsg, model.get('documentNo')));
+          me.doShowPopup({
+            popup: 'OB_UI_MessageDialog',
+            args: {
+              message: (enyo.format(OB.I18N.getLabel('OBPOS_ticketAlreadyOpened'), orderTypeMsg, model.get('documentNo')))
+            }
+          });
           if (OB.MobileApp.model.receipt.get('documentNo') !== model.get('documentNo')) {
             me.doChangeCurrentOrder({
               newCurrentOrder: me.model.get('orderList').models[i]
@@ -413,27 +418,29 @@
         if (ordersNotProcessed.length > 0) {
           var orderExists = false;
           _.each(ordersNotProcessed.models, function (order) {
-            if (order && order.get('id') === model.get('id') && ((order.get('isLayaway') && !order.get('isPaid')) || (order.get('isQuotation') && order.get('hasbeenpaid') === 'N'))) {
-              var orderTypeMsg = OB.I18N.getLabel('OBPOS_ticket');
-              if (order.get('isLayaway')) {
-                orderTypeMsg = OB.I18N.getLabel('OBPOS_LblLayaway');
-              } else if (order.get('isQuotation')) {
-                orderTypeMsg = OB.I18N.getLabel('OBPOS_Quotation');
+            if (order && (order.get('id') === model.get('id') || order.get('oldId') === model.get('id'))) {
+              if ((order.get('isLayaway') && !order.get('isPaid')) || (order.get('isQuotation') && order.get('hasbeenpaid') === 'N')) {
+                var orderTypeMsg = OB.I18N.getLabel('OBPOS_ticket');
+                if (order.get('isLayaway')) {
+                  orderTypeMsg = OB.I18N.getLabel('OBPOS_LblLayaway');
+                } else if (order.get('isQuotation')) {
+                  orderTypeMsg = OB.I18N.getLabel('OBPOS_Quotation');
+                }
+                // Getting Other Session User's username
+                OB.Dal.find(OB.Model.User, {
+                  'id': order.get('createdBy')
+                }, function (users) {
+                  if (users.length > 0) {
+                    me.doShowPopup({
+                      popup: 'OB_UI_MessageDialog',
+                      args: {
+                        message: (enyo.format(OB.I18N.getLabel('OBPOS_ticketAlreadyOpenedInSession'), orderTypeMsg, model.get('documentNo'), users.models[0].get('name')))
+                      }
+                    });
+                  }
+                });
+                orderExists = true;
               }
-              // Getting Other Session User's username
-              OB.Dal.find(OB.Model.User, {
-                'id': order.get('createdBy')
-              }, function (users) {
-                if (users.length > 0) {
-                  me.doShowPopup({
-                    popup: 'OB_UI_MessageDialog',
-                    args: {
-                      message: (enyo.format(OB.I18N.getLabel('OBPOS_ticketAlreadyOpenedInSession'), orderTypeMsg, order.get('documentNo'), users.models[0].get('name')))
-                    }
-                  });
-                }
-              });
-              orderExists = true;
             }
           });
           if (orderExists) {
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
@@ -1884,6 +1884,7 @@
       this.set('hasbeenpaid', 'N');
       this.set('isEditable', true);
       this.set('createdBy', OB.MobileApp.model.get('orgUserId'));
+      this.set('session', OB.MobileApp.model.get('session'));
       this.set('orderDate', new Date());
       //Sometimes the Id of Quotation is null.
       if (this.get('id') && !_.isNull(this.get('id'))) {