thirdparty
/
CybroAddons
mirror of https://github.com/CybroOdoo/CybroAddons.git
5
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Sep 6 [FIX] : Bug Fixed 'pos_receipt_extend'

pull/277/head
AjmalCybro 2 years ago
parent
517b716444
commit
ec40b7ad41
4 changed files with 43 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      pos_receipt_extend/doc/RELEASE_NOTES.md
  2. 2
      pos_receipt_extend/models/pos_session.py
  3. 11
      pos_receipt_extend/static/src/js/payment.js
  4. 52
      pos_receipt_extend/static/src/xml/OrderReceipt.xml

5
pos_receipt_extend/doc/RELEASE_NOTES.md
View File

@ -10,3 +10,8 @@
##### FIX
-Removed the error of not displaying customer details in pos receipt.
-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.

2
pos_receipt_extend/models/pos_session.py
View File

@ -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'],
},
}

11
pos_receipt_extend/static/src/js/payment.js
View File

@ -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;

52
pos_receipt_extend/static/src/xml/OrderReceipt.xml
View File

@ -3,44 +3,46 @@
<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="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"/>
</div>
</t>
<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>
<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>
<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>
<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>
<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>
<div style="font-weight:bold;">Invoice Number:
<t t-esc="this.env.pos.invoice"/>
</div>
</t>
</t>
</t>
<t t-if="this.env.pos.session_orders[0].qr_code">
<t t-if="env.pos.qr_code">
<t t-if="env.pos.qr_image">
<div style="font-weight:bold;">
<img t-attf-src="{{env.pos.qr_image}}"

Write Preview
Loading…
Cancel
Save