From 2d1d439234211d2f51224ade2ae0850e8737b2c8 Mon Sep 17 00:00:00 2001
From: AjmalCybro <ajmal@cybrosys.in>
Date: Wed, 13 Sep 2023 16:27:29 +0530
Subject: [PATCH] Sep 13 [FIX] : Bug Fixed 'pos_receipt_extend'

---
 pos_receipt_extend/doc/RELEASE_NOTES.md       |  2 +-
 pos_receipt_extend/static/src/js/payment.js   | 23 +------
 .../static/src/xml/OrderReceipt.xml           | 69 ++++++++++---------
 3 files changed, 37 insertions(+), 57 deletions(-)

diff --git a/pos_receipt_extend/doc/RELEASE_NOTES.md b/pos_receipt_extend/doc/RELEASE_NOTES.md
index 30f521a4f..8e9b84f8f 100755
--- a/pos_receipt_extend/doc/RELEASE_NOTES.md
+++ b/pos_receipt_extend/doc/RELEASE_NOTES.md
@@ -11,7 +11,7 @@
 -Removed the error of not displaying customer details in pos receipt.
 -Changed the index file.
 
-#### 06.09.2023
+#### 11.09.2023
 #### Version 16.0.2.0.1
 ##### FIX
 -Removed the error of not displaying the receipt without choosing the partner.
diff --git a/pos_receipt_extend/static/src/js/payment.js b/pos_receipt_extend/static/src/js/payment.js
index 0ea8a219f..67e9ab9cd 100755
--- a/pos_receipt_extend/static/src/js/payment.js
+++ b/pos_receipt_extend/static/src/js/payment.js
@@ -29,27 +29,6 @@ odoo.define('pos_receipt_extend.PaymentScreen', function (require) {
             var self= this;
             self.env.pos.qr_code = order.qr_code;
             self.env.pos.customer_details = order.customer_details;
-            if (!address) {
-                              this.env.pos.selectedOrder.partner.street = null;
-            }
-            if (!name) {
-                              this.env.pos.selectedOrder.partner.name = null;
-            }
-            if (!mobile) {
-                              this.env.pos.selectedOrder.partner.mobile = null;
-            }
-            if (!phone) {
-                              this.env.pos.selectedOrder.partner.phone = null;
-            }
-            if (!email) {
-                              this.env.pos.selectedOrder.partner.email = null;
-            }
-            if (!vat) {
-                              this.env.pos.selectedOrder.partner.vat = null;
-            }
-            if (!number) {
-                              this.env.pos.selectedOrder.name = null;
-            }
             var self= this;
          rpc.query({
                 model: 'pos.order',
@@ -65,12 +44,12 @@ odoo.define('pos_receipt_extend.PaymentScreen', function (require) {
                    self.env.pos.invoice  = result.invoice_name
                 }
                 });
+                console.log(self.env.pos.invoice,'this.env.pos.invoice')
                 return receipt_order
          }
          }
 
 
-
        Registries.Component.extend(PaymentScreen, PosPaymentReceiptExtend);
 
     return PaymentScreen;
diff --git a/pos_receipt_extend/static/src/xml/OrderReceipt.xml b/pos_receipt_extend/static/src/xml/OrderReceipt.xml
index 20ccb4b91..3f5028dee 100755
--- a/pos_receipt_extend/static/src/xml/OrderReceipt.xml
+++ b/pos_receipt_extend/static/src/xml/OrderReceipt.xml
@@ -3,44 +3,45 @@
     <t t-name="OrderReceipt" t-inherit="point_of_sale.OrderReceipt"
        t-inherit-mode="extension" owl="1">
         <xpath expr="//div[hasclass('pos-receipt-contact')]" position="inside">
-            <t t-if="this.env.pos.selectedOrder.partner" >
+
             <t t-if="env.pos.customer_details" >
-                <t t-if="this.env.pos.selectedOrder.partner.name">
-                    <div style="font-weight:bold;">Customer Name:
-                        <t t-esc="this.env.pos.selectedOrder.partner.name"/>
-                    </div>
-                </t>
-                <t t-if="this.env.pos.selectedOrder.partner.street">
-                        <div style="font-weight:bold;">Customer Address:
-                        <t t-esc="this.env.pos.selectedOrder.partner.street"/>
+                <t t-if="this.env.pos.selectedOrder.partner" >
+                    <t t-if="this.env.pos.selectedOrder.partner.name">
+                        <div style="font-weight:bold;">Customer Name:
+                            <t t-esc="this.env.pos.selectedOrder.partner.name"/>
                         </div>
-                </t>
-                <t t-if="this.env.pos.selectedOrder.partner.mobile">
-                        <div style="font-weight:bold;">Customer Mobile:
-                        <t t-esc="this.env.pos.selectedOrder.partner.mobile"/>
-                    </div>
-                </t>
-                <t t-if="this.env.pos.selectedOrder.partner.phone">
-                    <div style="font-weight:bold;">Customer Phone:
-                        <t t-esc="this.env.pos.selectedOrder.partner.phone"/>
-                    </div>
-                </t>
-                <t t-if="this.env.pos.selectedOrder.partner.email">
-                    <div style="font-weight:bold;">Customer Email:
-                        <t t-esc="this.env.pos.selectedOrder.partner.email"/>
-                    </div>
-                </t>
-                <t t-if="this.env.pos.selectedOrder.partner.vat">
-                    <div style="font-weight:bold;">Customer Vat:
-                        <t t-esc="this.env.pos.selectedOrder.partner.vat"/>
-                    </div>
-                </t>
-                <t t-if="this.env.pos.invoice">
-                    <div style="font-weight:bold;">Invoice Number:
-                        <t t-esc="this.env.pos.invoice"/>
-                    </div>
+                    </t>
+                    <t t-if="this.env.pos.selectedOrder.partner.street">
+                            <div style="font-weight:bold;">Customer Address:
+                            <t t-esc="this.env.pos.selectedOrder.partner.street"/>
+                            </div>
+                    </t>
+                    <t t-if="this.env.pos.selectedOrder.partner.mobile">
+                            <div style="font-weight:bold;">Customer Mobile:
+                            <t t-esc="this.env.pos.selectedOrder.partner.mobile"/>
+                        </div>
+                    </t>
+                    <t t-if="this.env.pos.selectedOrder.partner.phone">
+                        <div style="font-weight:bold;">Customer Phone:
+                            <t t-esc="this.env.pos.selectedOrder.partner.phone"/>
+                        </div>
+                    </t>
+                    <t t-if="this.env.pos.selectedOrder.partner.email">
+                        <div style="font-weight:bold;">Customer Email:
+                            <t t-esc="this.env.pos.selectedOrder.partner.email"/>
+                        </div>
+                    </t>
+                    <t t-if="this.env.pos.selectedOrder.partner.vat">
+                        <div style="font-weight:bold;">Customer Vat:
+                            <t t-esc="this.env.pos.selectedOrder.partner.vat"/>
+                        </div>
+                    </t>
                 </t>
             </t>
+            <t t-if="this.env.pos.invoice">
+                <div style="font-weight:bold;">Invoice Number:
+                    <t t-esc="this.env.pos.invoice"/>
+                </div>
             </t>
             <t t-if="env.pos.qr_code">
                 <t t-if="env.pos.qr_image">