@@ -189,7 +189,7 @@
->
We can enable the checkbox for invoice number to view invoice number on the receipt
-
+
@@ -209,7 +209,7 @@
Go to Point of Sale -> Configuration ->settings
->
We can enable the checkbox for QR code and select QR code option
-
+
QR code in receipt
diff --git a/pos_receipt_extend/static/src/js/payment.js b/pos_receipt_extend/static/src/js/payment.js
old mode 100644
new mode 100755
index c6d62007b..0e33fd208
--- a/pos_receipt_extend/static/src/js/payment.js
+++ b/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));
- 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);
- self.env.pos.barcode = barcode
- self.env.pos.invoice = result.invoice_name
+ 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
+ }
});
return receipt_order
}
}
+
Registries.Component.extend(PaymentScreen, PosPaymentReceiptExtend);
return PaymentScreen;
diff --git a/pos_receipt_extend/static/src/js/pos_order_receipt.js b/pos_receipt_extend/static/src/js/pos_order_receipt.js
old mode 100644
new mode 100755
index db5ddb90d..dff7c0d0d
--- a/pos_receipt_extend/static/src/js/pos_order_receipt.js
+++ b/pos_receipt_extend/static/src/js/pos_order_receipt.js
@@ -13,13 +13,11 @@ const { batched, uuidv4 } = require("point_of_sale.utils");
var json = {
access_token: this.access_token || '',
};
- const options = {pos:this};
- this.pos = options.pos;
- this.access_token = uuidv4();
- const address = `${this.pos.base_url}/pos/ticket/validate?access_token=${this.access_token}`
+ const options = {pos:this};
+ this.pos = options.pos;
+ 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}`
});
diff --git a/pos_receipt_extend/static/src/xml/OrderReceipt.xml b/pos_receipt_extend/static/src/xml/OrderReceipt.xml
old mode 100644
new mode 100755
index 5c6e6b563..2ec8e577c
--- a/pos_receipt_extend/static/src/xml/OrderReceipt.xml
+++ b/pos_receipt_extend/static/src/xml/OrderReceipt.xml
@@ -3,66 +3,44 @@
-
-
-
+
Customer Name:
-
-
-
-
-
+
+
Customer Address:
-
-
+
+ 
@@ -170,7 +170,7 @@
->
We can enable the checkbox for customer details and we can enable the required data to visible in the receipt
- 
+ 