diff --git a/pos_receipt_extend/doc/RELEASE_NOTES.md b/pos_receipt_extend/doc/RELEASE_NOTES.md index fe9b0dcf5..30f521a4f 100755 --- a/pos_receipt_extend/doc/RELEASE_NOTES.md +++ b/pos_receipt_extend/doc/RELEASE_NOTES.md @@ -9,4 +9,9 @@ #### Version 16.0.2.0.1 ##### FIX -Removed the error of not displaying customer details in pos receipt. --Changed the index file. \ No newline at end of file +-Changed the index file. + +#### 06.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/models/pos_session.py b/pos_receipt_extend/models/pos_session.py index ad36b6efc..6e7dc7634 100755 --- a/pos_receipt_extend/models/pos_session.py +++ b/pos_receipt_extend/models/pos_session.py @@ -41,7 +41,7 @@ class PosSessionLoadFields(models.Model): 'search_params': { 'fields': ['qr_code', 'invoice_number', 'customer_name', 'customer_address', 'customer_mobile', - 'customer_phone', 'customer_email', 'customer_vat'], + 'customer_phone', 'customer_email', 'customer_vat', 'customer_details'], }, } diff --git a/pos_receipt_extend/static/src/js/payment.js b/pos_receipt_extend/static/src/js/payment.js index fc02e1c54..0ea8a219f 100755 --- a/pos_receipt_extend/static/src/js/payment.js +++ b/pos_receipt_extend/static/src/js/payment.js @@ -12,7 +12,6 @@ odoo.define('pos_receipt_extend.PaymentScreen', function (require) { 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; @@ -26,6 +25,10 @@ odoo.define('pos_receipt_extend.PaymentScreen', function (require) { var name = order.customer_name; var number = order.invoice_number; var qr_code = order.qr_code; + var customer_details = order.customer_details; + 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; } @@ -55,7 +58,9 @@ odoo.define('pos_receipt_extend.PaymentScreen', function (require) { }).then(function(result){ const address = `${result.base_url}/my/invoices/${result.invoice_id}?` let qr_code_svg = new XMLSerializer().serializeToString(codeWriter.write(address, 150, 150)); - self.env.pos.qr_image = "data:image/svg+xml;base64,"+ window.btoa(qr_code_svg); + if (qr_code) { + self.env.pos.qr_image = "data:image/svg+xml;base64,"+ window.btoa(qr_code_svg); + } if (number) { self.env.pos.invoice = result.invoice_name } @@ -64,6 +69,8 @@ odoo.define('pos_receipt_extend.PaymentScreen', function (require) { } } + + 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 1cc312d93..20ccb4b91 100755 --- a/pos_receipt_extend/static/src/xml/OrderReceipt.xml +++ b/pos_receipt_extend/static/src/xml/OrderReceipt.xml @@ -3,44 +3,46 @@ - + +
Customer Name:
-
Customer Address: - -
-
+
Customer Address: + +
+
-
Customer Mobile: - -
-
+
Customer Mobile: + +
+
-
Customer Phone: - -
-
+
Customer Phone: + +
+
-
Customer Email: - -
-
+
Customer Email: + +
+
-
Customer Vat: - -
-
+
Customer Vat: + +
+ -
Invoice Number: - -
+
Invoice Number: + +
+
- +