0049770: Cancel and replace ticket not displaying in pay open tickets

From bf07f9a1863dbc60a4f1eb88d4a3b21e512674b6 Mon Sep 17 00:00:00 2001
From: Rafael Queralta <rafaelcuba81@gmail.com>
Date: Mon, 18 Jul 2022 15:57:38 -0400
Subject: [PATCH] Fixed BUG-49770: Fixed problems related with vars references

---
 .../js/model/order.js                                | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/web/org.openbravo.retail.posterminal/js/model/order.js b/web/org.openbravo.retail.posterminal/js/model/order.js
index aa1db396c..1799b2685 100644
--- a/web/org.openbravo.retail.posterminal/js/model/order.js
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js
@@ -11446,6 +11446,11 @@
       },
       loadCurrent: function(isNew) {
         OB.MobileApp.model.set('terminalLogContext', this.current.get('id'));
+        var IndexModelOrder = _.indexOf(
+            OB.MobileApp.model.orderList.models,
+            this.modelorder
+          ),
+          originalModelOrder = this.modelorder.clone();
         // Check if the current order to be loaded should be deleted
         if (this.current.get('obposIsDeleted') && this.current.get('id')) {
           var deletedOrderDocNo = this.current.get('documentNo');
@@ -11474,6 +11479,13 @@
           this.modelorder.trigger('updatePending');
           this.modelorder.setIsCalculateReceiptLockState(false);
           this.modelorder.setIsCalculateGrossLockState(false);
+          if (IndexModelOrder >= 0) {
+            OB.MobileApp.model.orderList.models.splice(
+              IndexModelOrder,
+              1,
+              originalModelOrder
+            );
+          }
         }
       },
       checkOrderListPayment: function() {
-- 
2.25.1

diff --git a/web/org.openbravo.retail.posterminal/js/model/order.js b/web/org.openbravo.retail.posterminal/js/model/order.js
index 2572061ec..c580b39d0 100644
--- a/web/org.openbravo.retail.posterminal/js/model/order.js
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js
@@ -6755,9 +6755,6 @@
       OB.Dal.remove(
         this,
         function() {
-          OB.MobileApp.model.orderList.remove(me, {
-            silent: true
-          });
           var deliveredLine,
             linesWithDeferred = [];
 
@@ -6948,9 +6945,8 @@
                 me.unset('preventServicesUpdate');
                 me.preventOrderSave(false);
                 me.save();
-                OB.MobileApp.model.orderList.unshift(me, {
-                  silent: true
-                });
+                OB.MobileApp.model.orderList.saveCurrent();
+                OB.MobileApp.model.orderList.loadCurrent();
               });
             }
           );