0046065: Message Missing in Customer Display

From ec39694112b14d4bfb1f4b88f98e391176eb1bb9 Mon Sep 17 00:00:00 2001
From: Ranjith S R <ranjith@qualiantech.com>
Date: Thu, 22 Apr 2021 17:15:41 +0530
Subject: [PATCH] Fixed ISSUE-46065: Replaced Receipt displayTotal by StateAPI
 * When Adding, removing payment, displayTotal should be triggered from State

---
 .../ticket/actions/AddPayment.js              | 23 +++++++++++++++-
 .../ticket/actions/DeletePayment.js           | 23 +++++++++++++++-
 .../js/model/order.js                         | 26 +++++++++----------
 .../js/pointofsale/view/pointofsale.js        | 13 +++-------
 .../js/pointofsale/view/toolbar-left.js       | 11 ++++----
 5 files changed, 67 insertions(+), 29 deletions(-)

diff --git a/web/org.openbravo.retail.posterminal/app/model/business-object/ticket/actions/AddPayment.js b/web/org.openbravo.retail.posterminal/app/model/business-object/ticket/actions/AddPayment.js
index e13ac58f5..1a6e04f9a 100644
--- a/web/org.openbravo.retail.posterminal/app/model/business-object/ticket/actions/AddPayment.js
+++ b/web/org.openbravo.retail.posterminal/app/model/business-object/ticket/actions/AddPayment.js
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2020 Openbravo S.L.U.
+ * Copyright (C) 2020-2021 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -74,4 +74,25 @@
       return newPayload;
     }
   );
+
+  OB.App.StateAPI.Ticket.addPayment.addPostHook(
+    (ticket, payload, options) => {
+      const newState = { ...options.globalState };
+      const data = {
+        ticket: { ...ticket }
+      };
+      const displayTotalMsg = OB.App.State.Messages.Utils.createNewMessage(
+        '',
+        '',
+        data,
+        { type: 'displayTotal', consumeOffline: true }
+      );
+      newState.Messages = [...newState.Messages, displayTotalMsg];
+      return newState;
+    },
+    100,
+    {
+      isAfterModelHook: true
+    }
+  );
 })();
diff --git a/web/org.openbravo.retail.posterminal/app/model/business-object/ticket/actions/DeletePayment.js b/web/org.openbravo.retail.posterminal/app/model/business-object/ticket/actions/DeletePayment.js
index e9b9f7098..1cda1a648 100644
--- a/web/org.openbravo.retail.posterminal/app/model/business-object/ticket/actions/DeletePayment.js
+++ b/web/org.openbravo.retail.posterminal/app/model/business-object/ticket/actions/DeletePayment.js
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2020 Openbravo S.L.U.
+ * Copyright (C) 2020-2021 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -70,4 +70,25 @@
 
     return newTicket;
   });
+
+  OB.App.StateAPI.Ticket.deletePayment.addPostHook(
+    (ticket, payload, options) => {
+      const newState = { ...options.globalState };
+      const data = {
+        ticket: { ...ticket }
+      };
+      const displayTotalMsg = OB.App.State.Messages.Utils.createNewMessage(
+        '',
+        '',
+        data,
+        { type: 'displayTotal', consumeOffline: true }
+      );
+      newState.Messages = [...newState.Messages, displayTotalMsg];
+      return newState;
+    },
+    100,
+    {
+      isAfterModelHook: true
+    }
+  );
 })();
diff --git a/web/org.openbravo.retail.posterminal/js/model/order.js b/web/org.openbravo.retail.posterminal/js/model/order.js
index 384aa8007..8eda2bda7 100644
--- a/web/org.openbravo.retail.posterminal/js/model/order.js
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js
@@ -6617,7 +6617,6 @@
           var executeFinalCallback = function(saveChanges) {
             if (saveChanges && !payment.get('changePayment')) {
               order.trigger('updatePending');
-              order.trigger('displayTotal');
             }
             OB.UTIL.HookManager.executeHooks(
               'OBPOS_postAddPayment',
@@ -8709,13 +8708,20 @@
               receipt: me
             },
             function(args) {
-              var executeFinalCallback = function() {
+              var executeFinalCallback = function(saveChanges) {
+                if (saveChanges) {
+                  order.adjustPayment();
+                  OB.App.State.Global.displayTotal({
+                    ticket: OB.UTIL.TicketUtils.toMultiTicket(me)
+                  });
+                }
                 OB.UTIL.HookManager.executeHooks(
                   'OBPOS_postAddPayment',
                   {
                     paymentAdded: payment,
                     payments: payments,
-                    receipt: order
+                    receipt: order,
+                    saveChanges: saveChanges
                   },
                   function(args2) {
                     finalCallback();
@@ -8724,7 +8730,7 @@
               };
 
               if (args && args.cancellation) {
-                executeFinalCallback();
+                executeFinalCallback(false);
                 return;
               }
 
@@ -8757,9 +8763,7 @@
                       p.set('origAmount', p.get('amount'));
                     }
                     payment.set('date', new Date());
-                    order.adjustPayment();
-                    order.trigger('displayTotal');
-                    executeFinalCallback();
+                    executeFinalCallback(true);
                     return;
                   }
                 }
@@ -8790,9 +8794,7 @@
                       );
                     }
                     payment.set('date', new Date());
-                    order.adjustPayment();
-                    order.trigger('displayTotal');
-                    executeFinalCallback();
+                    executeFinalCallback(true);
                     return;
                   }
                 }
@@ -8812,9 +8814,7 @@
                   .set('roundedPaymentId', payment.get('id'));
               }
               payments.add(payment);
-              order.adjustPayment();
-              order.trigger('displayTotal');
-              executeFinalCallback();
+              executeFinalCallback(true);
               return;
             }
           );
diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js
index 5aad471b0..cf414939c 100644
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2019-2020 Openbravo S.L.U.
+ * Copyright (C) 2019-2021 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -1725,14 +1725,8 @@ enyo.kind({
       paymentProvider;
 
     var removeTransaction = function() {
-      //      if (!me.model.get('multiOrders').get('isMultiOrders')) {
-      //        me.model.get('order').removePayment(inEvent.payment);
-      //      } else {
-      //        me.model.get('multiOrders').removePayment(inEvent.payment);
-      //      }
       if (me.model.get('leftColumnViewManager').isOrder()) {
         me.model.get('order').removePayment(inEvent.payment, null, function() {
-          me.model.get('order').trigger('displayTotal');
           if (inEvent.removeCallback) {
             inEvent.removeCallback();
           }
@@ -1743,7 +1737,9 @@ enyo.kind({
         me.model
           .get('multiOrders')
           .removePayment(inEvent.payment, inEvent.removeCallback);
-        me.model.get('multiOrders').trigger('displayTotal');
+        OB.App.State.Global.displayTotal({
+          ticket: OB.UTIL.TicketUtils.toMultiTicket(me.model.get('multiOrders'))
+        });
         return;
       }
     };
@@ -1919,7 +1915,6 @@ enyo.kind({
           inEvent.sender,
           inEvent.reverseCallback
         );
-      me.model.get('order').trigger('displayTotal');
       return;
     }
   },
diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-left.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-left.js
index 7dea26406..901122e81 100644
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-left.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-left.js
@@ -567,11 +567,12 @@ enyo.kind({
         edit: false
       });
     }
-    if (this.model.get('leftColumnViewManager').isMultiOrder()) {
-      this.model.get('multiOrders').trigger('displayTotal');
-    } else {
-      receipt.trigger('displayTotal');
-    }
+
+    OB.App.State.Global.displayTotal({
+      ticket: this.model.get('leftColumnViewManager').isMultiOrder()
+        ? OB.UTIL.TicketUtils.toMultiTicket(this.model.get('multiOrders'))
+        : null
+    });
 
     me.doTabChange({
       tabPanel: me.tabPanel,
-- 
2.20.1