0044842: 'Cancel & Replace': error in payment form tags in printed receipts

From c96de06e125e7e190418acb5af1ea26cd40dea96 Mon Sep 17 00:00:00 2001
From: Prakash M <prakash@qualiantech.com>
Date: Thu, 17 Sep 2020 09:35:59 +0530
Subject: [PATCH] Fixed BUG-44842 : Fixed payment form tags in printed receipts
 of Cancel and Replace * Displayed cancelled label in place of payment name on
 cancelled amount

---
 .../res/printclosedreceipt.xml                  | 17 +++++++++++++++--
 .../res/printreturn.xml                         | 16 ++++++++++++++--
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/web/org.openbravo.retail.posterminal/res/printclosedreceipt.xml b/web/org.openbravo.retail.posterminal/res/printclosedreceipt.xml
index 5619ff955..eb481338d 100644
--- a/web/org.openbravo.retail.posterminal/res/printclosedreceipt.xml
+++ b/web/org.openbravo.retail.posterminal/res/printclosedreceipt.xml
@@ -101,8 +101,9 @@
     </line>   
       <%
         var payments = order.get('payments');
+        var isCancelled = order.get('iscancelled');
         for (var i = 0; i < payments.length; i++) {
-          var paymentDate;
+          var paymentDate, isCancelledPayment;
           var paymentName = payments.at(i).get('name');
           if(_.isUndefined(payments.at(i).get('paymentDate')) || _.isNull(payments.at(i).get('paymentDate'))){
               paymentDate = OB.I18N.formatDate(new Date());
@@ -112,6 +113,10 @@
           if (payments && payments.at(i) && payments.at(i).get('paymentData') && payments.at(i).get('paymentData').name && payments.at(i).get('paymentData').name.length > 0) {
             paymentName = paymentName + ' (' + payments.at(i).get('paymentData').name + ')';
           }
+          if(isCancelled && payments.at(i).get('paymentAmount') === 0){
+            isCancelledPayment = true;
+          }
+          
          if(payments.at(i).get('rate') && payments.at(i).get('rate')!=='1'){
       %>
         <line>
@@ -124,7 +129,15 @@
          }else {
      %>
         <line>
-          <text align="left" length="15"><%= paymentName %></text>
+          <%
+            if(isCancelledPayment){
+          %>
+            <text align="left" length="15"><%= OB.I18N.getLabel('OBPOS_Cancelled') %></text>
+          <%
+           } else {
+          %>
+            <text align="left" length="15"><%= paymentName %></text>
+          <% } %>
           <text align="left" length="10"><%= OB.I18N.formatDate(paymentDate) %></text>
           <text align="right" length="15"><%= OB.I18N.formatCurrency(payments.at(i).get('amount')) %></text>
         </line>
diff --git a/web/org.openbravo.retail.posterminal/res/printreturn.xml b/web/org.openbravo.retail.posterminal/res/printreturn.xml
index e967501dc..10c358646 100644
--- a/web/org.openbravo.retail.posterminal/res/printreturn.xml
+++ b/web/org.openbravo.retail.posterminal/res/printreturn.xml
@@ -155,11 +155,15 @@
     </line>
       <%
         var payments = order.get('payments');
+        var isCancelled = order.get('iscancelled');
         for (var i = 0; i < payments.length; i++) {
-          var paymentName = payments.at(i).get('name');
+          var paymentName = payments.at(i).get('name'), isCancelledPayment;
           if (payments && payments.at(i) && payments.at(i).get('paymentData') && payments.at(i).get('paymentData').name && payments.at(i).get('paymentData').name.length > 0) {
             paymentName = paymentName + ' (' + payments.at(i).get('paymentData').name + ')';
           }
+          if(isCancelled && payments.at(i).get('paymentAmount') === 0){
+            isCancelledPayment = true;
+          }
       if(payments.at(i).get('rate') && payments.at(i).get('rate')!=='1'){
       %>
         <line>
@@ -171,7 +175,15 @@
          }else {
      %>
         <line>
-          <text align="left" length="20"><%= paymentName %></text>
+          <%
+            if(isCancelledPayment){
+          %>
+            <text align="left" length="20"><%= OB.I18N.getLabel('OBPOS_Cancelled') %></text>
+          <%
+           } else {
+          %>
+            <text align="left" length="20"><%= paymentName %></text>
+          <% } %>
           <text align="right" length="20"><%= OB.I18N.formatCurrency(payments.at(i).get('amount')) %></text>
         </line>
       <%
-- 
2.20.1