From 97b8f6558d5d2cee32d2be53f086dd99947a43e5 Mon Sep 17 00:00:00 2001 From: Juliana Date: Wed, 13 Jan 2021 11:28:15 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Modif=20TARE=20sur=20=C3=A9cran=20produit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/src/js/container.js | 105 ++++++++++++++++++++++++++++--------- 1 file changed, 79 insertions(+), 26 deletions(-) diff --git a/static/src/js/container.js b/static/src/js/container.js index c2446dd..af6b636 100644 --- a/static/src/js/container.js +++ b/static/src/js/container.js @@ -37,31 +37,31 @@ odoo.define('vracoop_pos_free_balance_v2.container_balance', function (require) var scale_screen = this.gui.screen_instances['balancescale']; var price = scale_screen.format_price(scale_screen.get_product_price()); - if (container) { - // format tare - var tare = this.format_tare(container); - queue.schedule(function () { - return self.pos.proxy.scale_read_data_price_tare(price, tare).then(function (scale_answer) { - self.set_weight(scale_answer.weight); + // if (container) { + // // format tare + // var tare = this.format_tare(container); + // queue.schedule(function () { + // return self.pos.proxy.scale_read_data_price_tare(price, tare).then(function (scale_answer) { + // self.set_weight(scale_answer.weight); - if ((scale_answer.error === '30' || scale_answer.error === '31') && scale_answer.weight !== 0) { - self.set_weight(0); - self.pos.proxy.reset_tare(); - } - }); - }, {duration: 500, repeat: true}); - - } else { - queue.schedule(function () { - return self.pos.proxy.scale_read_data_price(price).then(function (scale_answer) { - self.set_weight(scale_answer.weight); - // self.set_price(scale_answer.price); - if ((scale_answer.error === '30' || scale_answer.error === '31') && scale_answer.weight !== 0) { - self.set_weight(0); - } - }); - }, {duration: 500, repeat: true}); - } + // if ((scale_answer.error === '30' || scale_answer.error === '31') && scale_answer.weight !== 0) { + // self.set_weight(0); + // self.pos.proxy.reset_tare(); + // } + // }); + // }, {duration: 500, repeat: true}); + + // } else { + queue.schedule(function () { + return self.pos.proxy.scale_read_data_price(price).then(function (scale_answer) { + self.set_weight(scale_answer.weight); + // self.set_price(scale_answer.price); + if ((scale_answer.error === '30' || scale_answer.error === '31') && scale_answer.weight !== 0) { + self.set_weight(0); + } + }); + }, {duration: 500, repeat: true}); + // } this._super(); @@ -733,7 +733,53 @@ odoo.define('vracoop_pos_free_balance_v2.container_balance', function (require) previous_screen: 'presentation', show: function(){ - + var self = this; + var queue = this.pos.proxy_queue; + + var container = this.gui.get_current_screen_param('container'); + + queue.schedule(function () { + return self.pos.proxy.reset_weight().then(function () { + self.set_weight(0); + self.set_price(0); + }); + }, {duration: 500}); + + // format price + var scale_screen = this.gui.screen_instances['balancescale']; + var price = scale_screen.format_price(scale_screen.get_product_price()); + // var price = this.format_price(this.get_product_price()); + + if (container) { + // format tare + var tare = this.format_tare(container); + queue.schedule(function () { + return self.pos.proxy.scale_read_data_price_tare(price, tare).then(function (scale_answer) { + self.set_weight(scale_answer.weight); + self.set_price(scale_answer.price); + if ((scale_answer.error === '30' || scale_answer.error === '31') && scale_answer.weight !== 0) { + self.gui.show_screen(self.next_screen); + // add product *after* switching screen to scroll properly + self.order_product(); + self.pos.proxy.reset_tare(); + } + }); + }, {duration: 500, repeat: true}); + + } else { + queue.schedule(function () { + return self.pos.proxy.scale_read_data_price(price).then(function (scale_answer) { + self.set_weight(scale_answer.weight); + self.set_price(scale_answer.price); + if ((scale_answer.error === '30' || scale_answer.error === '31') && scale_answer.weight !== 0) { + self.gui.show_screen(self.next_screen); + // add product *after* switching screen to scroll properly + self.order_product(); + } + }); + }, {duration: 500, repeat: true}); + } + // this._super(); this._super(); var self = this; @@ -747,7 +793,14 @@ odoo.define('vracoop_pos_free_balance_v2.container_balance', function (require) this.$('.back').click(function(){ self.gui.show_screen('presentation'); }); - + + // Ajout pour le pb de tare + var container = this.gui.get_current_screen_param('container'); + if (container) { + this.pos.proxy.reset_tare(); + } + // Ajout pour le pb de tare + $("#pos-header-text-prod").removeClass('oe_hidden'); }, From 2ab3a4a3404e599905f69cebcd20945b15974ddb Mon Sep 17 00:00:00 2001 From: Juliana Date: Wed, 13 Jan 2021 17:08:57 +0100 Subject: [PATCH 2/3] =?UTF-8?q?Suppression=20action=20si=20contenant=20enl?= =?UTF-8?q?ev=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/src/js/container.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/static/src/js/container.js b/static/src/js/container.js index af6b636..04e973d 100644 --- a/static/src/js/container.js +++ b/static/src/js/container.js @@ -757,12 +757,6 @@ odoo.define('vracoop_pos_free_balance_v2.container_balance', function (require) return self.pos.proxy.scale_read_data_price_tare(price, tare).then(function (scale_answer) { self.set_weight(scale_answer.weight); self.set_price(scale_answer.price); - if ((scale_answer.error === '30' || scale_answer.error === '31') && scale_answer.weight !== 0) { - self.gui.show_screen(self.next_screen); - // add product *after* switching screen to scroll properly - self.order_product(); - self.pos.proxy.reset_tare(); - } }); }, {duration: 500, repeat: true}); @@ -771,11 +765,6 @@ odoo.define('vracoop_pos_free_balance_v2.container_balance', function (require) return self.pos.proxy.scale_read_data_price(price).then(function (scale_answer) { self.set_weight(scale_answer.weight); self.set_price(scale_answer.price); - if ((scale_answer.error === '30' || scale_answer.error === '31') && scale_answer.weight !== 0) { - self.gui.show_screen(self.next_screen); - // add product *after* switching screen to scroll properly - self.order_product(); - } }); }, {duration: 500, repeat: true}); } From 6eefa81a2651d0d1ebd111c10b8bd71801398d1c Mon Sep 17 00:00:00 2001 From: Juliana Date: Thu, 14 Jan 2021 10:24:37 +0100 Subject: [PATCH 3/3] Ajout set weight 0 lors du retirage du contenant --- static/src/js/container.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/static/src/js/container.js b/static/src/js/container.js index 04e973d..c31152e 100644 --- a/static/src/js/container.js +++ b/static/src/js/container.js @@ -757,6 +757,9 @@ odoo.define('vracoop_pos_free_balance_v2.container_balance', function (require) return self.pos.proxy.scale_read_data_price_tare(price, tare).then(function (scale_answer) { self.set_weight(scale_answer.weight); self.set_price(scale_answer.price); + if ((scale_answer.error === '30' || scale_answer.error === '31') && scale_answer.weight !== 0) { + self.set_weight(0); + } }); }, {duration: 500, repeat: true}); @@ -765,6 +768,9 @@ odoo.define('vracoop_pos_free_balance_v2.container_balance', function (require) return self.pos.proxy.scale_read_data_price(price).then(function (scale_answer) { self.set_weight(scale_answer.weight); self.set_price(scale_answer.price); + if ((scale_answer.error === '30' || scale_answer.error === '31') && scale_answer.weight !== 0) { + self.set_weight(0); + } }); }, {duration: 500, repeat: true}); }