diff --git a/pos_kitchen_screen_odoo/__manifest__.py b/pos_kitchen_screen_odoo/__manifest__.py index 266a5e08a..9d344de92 100644 --- a/pos_kitchen_screen_odoo/__manifest__.py +++ b/pos_kitchen_screen_odoo/__manifest__.py @@ -21,7 +21,7 @@ ############################################################################# { 'name': 'POS Kitchen Screen', - 'version': '17.0.1.0.1', + 'version': '17.0.1.0.2', 'category': 'Point Of Sale', 'summary': 'POS Kitchen Screen facilitates sending certain orders ' 'automatically to the kitchen.The POS Kitchen Screen allows for' diff --git a/pos_kitchen_screen_odoo/doc/RELEASE_NOTES.md b/pos_kitchen_screen_odoo/doc/RELEASE_NOTES.md index 3482d1124..04a3cdd82 100644 --- a/pos_kitchen_screen_odoo/doc/RELEASE_NOTES.md +++ b/pos_kitchen_screen_odoo/doc/RELEASE_NOTES.md @@ -4,3 +4,10 @@ #### Version 17.0.1.0.0 #### ADD - Initial commit for Pos Kitchen Screen + +#### 27.08.2024 +#### Version 17.0.1.0.2 +#### BUG FIX +- Fix the issue where the total amount changes to the amount without tax after + refreshing the page. +- Fix the issue of creating two records in the backend for a single order. diff --git a/pos_kitchen_screen_odoo/models/pos_session.py b/pos_kitchen_screen_odoo/models/pos_session.py index 5923e0fc5..0f0d2050b 100644 --- a/pos_kitchen_screen_odoo/models/pos_session.py +++ b/pos_kitchen_screen_odoo/models/pos_session.py @@ -57,5 +57,7 @@ class PosSession(models.Model): def _get_pos_ui_pos_order_line(self, params): """Get pos ui pos order line""" + data = self.env['pos.order.line'].search_read( + **params['search_params']) return self.env['pos.order.line'].search_read( **params['search_params']) diff --git a/pos_kitchen_screen_odoo/static/src/js/order_button.js b/pos_kitchen_screen_odoo/static/src/js/order_button.js index 66041e44b..32943437b 100644 --- a/pos_kitchen_screen_odoo/static/src/js/order_button.js +++ b/pos_kitchen_screen_odoo/static/src/js/order_button.js @@ -15,7 +15,6 @@ setup() { super.setup(); this.orm = useService("orm"); this.popup = useService("popup"); - }, get swapButton() { return this.props.actionType === "payment" && this.pos.config.module_pos_restaurant; @@ -30,13 +29,14 @@ setup() { !this.currentOrder?.hasChangesToPrint() && this.currentOrder?.hasSkippedChanges(), }; }, + async submitOrder() { - var line = [] - var self = this; + var line = [] + var self = this; if (!this.clicked) { this.clicked = true; try { - var order_name=this.pos.selectedOrder.uid + var order_name=this.pos.selectedOrder.name await this.orm.call("pos.order", "check_order_status", ["", order_name]).then(function(result){ if (result==false){ self.kitchen_order_status=false @@ -48,20 +48,21 @@ setup() { else{ self.kitchen_order_status=true } - }); - if ( self.kitchen_order_status){ - await this.pos.sendOrderInPreparationUpdateLastChange(this.currentOrder); - for (const orders of this.pos.get_order().orderlines) { + }); + if ( self.kitchen_order_status){ + await this.pos.sendOrderInPreparationUpdateLastChange(this.currentOrder); + for (const orders of this.pos.get_order().orderlines) { line.push([0, 0, { 'qty': orders.quantity, 'price_unit': orders.price, 'price_subtotal': orders.quantity * orders.price, - 'price_subtotal_incl': orders.quantity * orders.price, + 'price_subtotal_incl': orders.get_display_price(), 'discount': orders.discount, 'product_id': orders.product.id, 'tax_ids': [ - [6, false, []] + [6, 0, orders.get_taxes().map((tax) => tax.id)] ], + 'id': 29, 'pack_lot_ids': [], 'full_product_name': orders.product.display_name, @@ -72,7 +73,7 @@ setup() { }]) } var orders = [{ - 'pos_reference': this.pos.get_order().uid, + 'pos_reference': this.pos.get_order().name, 'session_id':1, 'amount_total': 0, 'amount_paid': 0, @@ -89,8 +90,8 @@ setup() { 'floor':this.pos.get_order().pos.currentFloor.name, 'config_id':this.pos.get_order().pos.config.id }] - await self.orm.call("pos.order", "get_details", ["", self.pos.config.id, orders]) - } + await self.orm.call("pos.order", "get_details", ["", self.pos.config.id, orders]) + } } finally { this.clicked = false; } diff --git a/pos_kitchen_screen_odoo/static/src/js/order_payment.js b/pos_kitchen_screen_odoo/static/src/js/order_payment.js index bd8063857..5f39179d9 100644 --- a/pos_kitchen_screen_odoo/static/src/js/order_payment.js +++ b/pos_kitchen_screen_odoo/static/src/js/order_payment.js @@ -22,7 +22,7 @@ patch(Order.prototype, { * Override of the pay method to handle payment logic. */ async pay() { - var order_name = this.pos.selectedOrder.uid; + var order_name = this.pos.selectedOrder.name; var self = this; await this.orm.call("pos.order", "check_order", ["", order_name]).then(function (result) { if (result.category) {