May 23 : [UPDT] Bug Fixed 'pos_receipt_extend'

pos_receipt_extend/__manifest__.py

@@ -19,8 +19,6 @@
 #    If not, see <http://www.gnu.org/licenses/>.
 #
 #############################################################################
-
-
 {
     'name': "Advanced POS Receipt",
     "description": """Advanced POS Receipt with Customer Details and Invoice Details""",
@@ -42,8 +40,7 @@
             'pos_receipt_extend/static/src/js/payment.js',
         ]
     },
-    'images': [
+    'images': ['static/description/banner.png', ],
-        'static/description/banner.png', ],
     'license': 'LGPL-3',
     'installable': True,
     'application': False,

pos_receipt_extend/doc/RELEASE_NOTES.md

@@ -4,3 +4,9 @@
 #### Version 16.0.1.0.0
 #### ADD
 - Initial commit for pos_receipt_extend
+
+#### 23.05.2023
+#### Version 16.0.2.0.1
+##### FIX
+-Removed the error of not displaying customer details in pos receipt.
+-Changed the index file.

pos_receipt_extend/models/pos_session.py

@@ -19,7 +19,6 @@
 #    If not, see <http://www.gnu.org/licenses/>.
 #
 #############################################################################
-
 import re
 
 from odoo import models, fields, api
@@ -40,10 +39,9 @@ class PosSessionLoadFields(models.Model):
     def _loader_params_res_config_settings(self):
         return {
             'search_params': {
-                'fields': ['barcode', 'invoice_number',
+                'fields': ['qr_code', 'invoice_number', 'customer_name',
                            'customer_address', 'customer_mobile',
-                           'customer_phone', 'customer_email', 'customer_vat',
+                           'customer_phone', 'customer_email', 'customer_vat'],
-                           'barcode_type'],
 
             },
         }
@@ -68,7 +66,7 @@ class PosOrder(models.Model):
             'invoice_id': invoice_id.id,
             'invoice_name': invoice_id.name,
             'base_url': base_url,
-            'barcode': invoice_id.account_barcode,
+            'qr_code': invoice_id.account_barcode,
         }
 
 

pos_receipt_extend/models/res_config_settings.py

@@ -26,7 +26,7 @@ from odoo import fields, models, api
 class ResConfigSettings(models.TransientModel):
     _inherit = "res.config.settings"
 
-    barcode = fields.Boolean(string='Order Barcode')
+    qr_code = fields.Boolean(string='Order QRCode')
     invoice_number = fields.Boolean()
     customer_details = fields.Boolean()
     customer_name = fields.Boolean()
@@ -35,7 +35,6 @@ class ResConfigSettings(models.TransientModel):
     customer_phone = fields.Boolean()
     customer_email = fields.Boolean()
     customer_vat = fields.Boolean()
-    barcode_type = fields.Selection(selection=[('barcode', 'Barcode'), ('qr_code', 'QRCode')])
 
     def set_values(self):
         super(ResConfigSettings, self).set_values()
@@ -54,13 +53,10 @@ class ResConfigSettings(models.TransientModel):
                   int(self.customer_email))
         set_param('res.config.settings.customer_vat',
                   int(self.customer_vat))
-        set_param('res.config.settings.barcode',
+        set_param('res.config.settings.qr_code',
-                  int(self.barcode))
+                  int(self.qr_code))
         set_param('res.config.settings.invoice_number',
                   int(self.invoice_number))
-        set_param('res.config.settings.barcode_type',
-                  (self.barcode_type))
-
     @api.model
     def get_values(self):
         res = super(ResConfigSettings, self).get_values()
@@ -79,10 +75,8 @@ class ResConfigSettings(models.TransientModel):
             get_param('res.config.settings.customer_email'))
         res['customer_vat'] = int(
             get_param('res.config.settings.customer_vat'))
-        res['barcode'] = int(
+        res['qr_code'] = int(
-            get_param('res.config.settings.barcode'))
+            get_param('res.config.settings.qr_code'))
         res['invoice_number'] = int(
             get_param('res.config.settings.invoice_number'))
-        res['barcode_type'] = (
-            get_param('res.config.settings.barcode_type'))
         return res

pos_receipt_extend/static/description/index.html

@@ -18,9 +18,9 @@
         <!-- APP HERO -->
         <h1 style="color: #FFFFFF; font-weight: bolder; font-size: 50px; text-align: center; margin-top: 50px;"> ADVANCED POS RECEIPT
           </h1>
-        <p style="color:#FFFFFF; padding: 8px 15px; text-align: center; font-size: 24px;">Advanced POS Receipt with Customer Details, Invoice Details and QR/Barcode</p>
+        <p style="color:#FFFFFF; padding: 8px 15px; text-align: center; font-size: 24px;">Advanced POS Receipt with Customer Details, Invoice Details and QR</p>
         <!-- END OF APP HERO -->
-        <img src="assets/screenshots/hero.gif" class="img-responsive"
+        <img src="assets/screenshots/herov16.gif" class="img-responsive"
           style="width: 100%; margin-left: auto; margin-right: auto;" />
       </div>
     </div>
@@ -170,7 +170,7 @@
         ->
         We can enable the checkbox for customer details and we can enable the required data to visible in the receipt
         </p>
-      <img src="assets/screenshots/pos_receipt_05.png" class="img-thumbnail">
+      <img src="assets/screenshots/receipt1.png" class="img-thumbnail">
     </div>
 
     <div style="display: block; margin: 30px auto;">
@@ -189,7 +189,7 @@
         ->
         We can enable the checkbox for invoice number to view invoice number on the receipt
         </p>
-      <img src="assets/screenshots/pos_receipt_04.png" class="img-thumbnail">
+      <img src="assets/screenshots/receipt3.png" class="img-thumbnail">
     </div>
 
     <div style="display: block; margin: 30px auto;">
@@ -209,7 +209,7 @@
         Go to Point of Sale -> Configuration ->settings
         ->
         We can enable the checkbox for QR code and select QR code option </p>
-      <img src="assets/screenshots/pos_receipt_03.png" class="img-thumbnail">
+      <img src="assets/screenshots/receipt2.png" class="img-thumbnail">
 
       <h3 style="font-family: 'Montserrat', sans-serif; font-size: 18px; font-weight: bold;">QR code in receipt
       </h3>

pos_receipt_extend/static/src/js/payment.js

@@ -8,36 +8,66 @@ odoo.define('pos_receipt_extend.PaymentScreen', function (require) {
     const PosPaymentReceiptExtend = PaymentScreen => class extends PaymentScreen {
         setup() {
         super.setup();
-
-
         }
          async validateOrder(isForceValidate) {
             var receipt_number = this.env.pos.selectedOrder.name
             var orders = this.env.pos.selectedOrder
+            var datas = this.env.pos.session_orders
             const receipt_order = await super.validateOrder(...arguments);
             const codeWriter = new window.ZXing.BrowserQRCodeSvgWriter();
+            const data = this.env.pos.session_orders;
+            var length = data.length-1
+            var order = data[length]
+            var mobile = order.customer_mobile;
+            var phone = order.customer_phone;
+            var email = order.customer_email;
+            var vat = order.customer_vat;
+            var address = order.customer_address;
+            var name = order.customer_name;
+            var number = order.invoice_number;
+            var qr_code = order.qr_code;
+            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',
                 method: 'get_invoice',
                 args: [receipt_number]
                 }).then(function(result){
                 const address = `${result.base_url}/my/invoices/${result.invoice_id}?`
-                const barcode = result.barcode
                 let qr_code_svg = new XMLSerializer().serializeToString(codeWriter.write(address, 150, 150));
+                if (qr_code) {
                    self.env.pos.qr_image = "data:image/svg+xml;base64,"+ window.btoa(qr_code_svg);
-                let barcode_svg = new XMLSerializer().serializeToString(codeWriter.write(barcode, 150, 150));
+                }
-                self.env.pos.barcode_image = "data:image/svg+xml;base64,"+ window.btoa(barcode_svg);
+                if (number) {
-                self.env.pos.barcode = barcode
                    self.env.pos.invoice  = result.invoice_name
+                }
                 });
                 return receipt_order
          }
          }
 
 
+
        Registries.Component.extend(PaymentScreen, PosPaymentReceiptExtend);
 
     return PaymentScreen;

pos_receipt_extend/static/src/js/pos_order_receipt.js

@@ -18,8 +18,6 @@ const { batched, uuidv4 } = require("point_of_sale.utils");
       this.access_token = uuidv4();
       const address = `${this.pos.base_url}/pos/ticket/validate?access_token=${this.access_token}`
       var receipt_number = this.env.pos.selectedOrder
-
-
     $(".orderlines").change(function (){
     const address = `${this.base_url}/pos/ticket/validate?access_token=${this.access_token}`
     });

pos_receipt_extend/static/src/xml/OrderReceipt.xml

@@ -3,66 +3,44 @@
     <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.name">
-
-
                     <div style="font-weight:bold;">Customer Name:
-                        <!--                         <t t-if="this.env.pos.session_orders[0].customer_name">-->
                         <t t-esc="this.env.pos.selectedOrder.partner.name"/>
-                        <!--                         </t>-->
                     </div>
-
+                </t>
-
+            <t t-if="this.env.pos.selectedOrder.partner.street">
-            <t t-if="this.env.pos.session_orders[0].customer_name">
                     <div style="font-weight:bold;">Customer Address:
-                    <t t-esc="this.env.pos.selectedOrder.partner.name"/>
+                    <t t-esc="this.env.pos.selectedOrder.partner.street"/>
                     </div>
             </t>
-
+            <t t-if="this.env.pos.selectedOrder.partner.mobile">
-
-            <t t-if="this.env.pos.session_orders[0].customer_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">
-
-            <t t-if="this.env.pos.session_orders[0].customer_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">
-
-            <t t-if="this.env.pos.session_orders[0].customer_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">
-
-            <t t-if="this.env.pos.session_orders[0].customer_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">
-            <t t-if="this.env.pos.session_orders[0].invoice_number">
                 <div style="font-weight:bold;">Invoice Number:
                     <t t-esc="this.env.pos.invoice"/>
                 </div>
             </t>
-
-
-            <t t-if="this.env.pos.session_orders[0].barcode_type === 'qr_code' ">
             <div style="font-weight:bold;">
-                                <img t-attf-src="{{this.env.pos.qr_image}}"
+                     <img t-attf-src="{{this.env.pos.qr_image}}" style="width:50%;"/>
-                                     style="width:50%;"/>
             </div>
-                            </t>
-
-
-
         </xpath>
     </t>
 </templates>

pos_receipt_extend/views/res_config_settings.xml

@@ -10,20 +10,13 @@
                        position="inside">
                     <div class="col-12 col-lg-6 o_setting_box">
                         <div class="o_setting_left_pane">
-                            <field name="barcode"/>
+                            <field name="qr_code"/>
                         </div>
                         <div class="o_setting_right_pane">
-                            <label for="barcode"/>
+                            <label for="qr_code"/>
                             <div class="content-group"
                                  id="warning_text_pos_restaurant">
-                                Enable to show barcode on receipt
+                                Enable to show QRCode on receipt
-                            </div>
-
-                            <div class="col-12 col-lg-6 o_setting_box">
-                                <div class="o_setting_left_pane"
-                                     attrs="{'invisible': [('barcode','=',False)]}">
-                                    <field name="barcode_type" widget="radio"/>
-                                </div>
                             </div>
                         </div>
                     </div>