diff --git a/static/src/css/style.css b/static/src/css/style.css index 4141d76..1dbe0de 100644 --- a/static/src/css/style.css +++ b/static/src/css/style.css @@ -116,6 +116,7 @@ } .pos .presentation-screen .bypass-container, +.pos .product-balance-screen .add-new-container, .pos .confirmation-screen .btn-back, .pos .balancecontainerscale-screen .add-container, .pos .scale-screen-custo .add-transaction{ @@ -131,6 +132,14 @@ cursor: pointer; } +.pos .product-balance-screen .add-new-container{ + border: solid 0px #d1d1d1; + margin: 0 auto; + width: 250px; + font-size: 20px; + padding: 2px; +} + .pos .presentation-screen .bypass-container{ width: 400px; font-size: 25px; diff --git a/static/src/js/container.js b/static/src/js/container.js index 3a35b98..64b1e5e 100644 --- a/static/src/js/container.js +++ b/static/src/js/container.js @@ -505,6 +505,17 @@ odoo.define('vracoop_pos_free_balance_v2.container_balance', function (require) this.product_categories_widget.reset_category(); this.numpad.state.reset(); +// Ajout de la fonctionnalité Pesée sans contenant + if (this.pos.config.allow_without_container){ + $("#add-new-container").removeClass('oe_hidden'); + } + else { + $("#add-new-container").addClass('oe_hidden'); + } + this.$('.add-new-container').click(function(){ + self.gui.show_screen('balancecontainerscale', {barcode: 'CONTAINER'}); + }); + this.$('.back').click(function(){ self.gui.show_screen('presentation'); }); @@ -523,6 +534,7 @@ odoo.define('vracoop_pos_free_balance_v2.container_balance', function (require) hide: function(){ this._super(); $("#pos-header-text-prod").addClass('oe_hidden'); + $("#add-new-container").addClass('oe_hidden'); var screen = this.gui.screen_instances['products-balance']; }, @@ -823,7 +835,7 @@ odoo.define('vracoop_pos_free_balance_v2.container_balance', function (require) next_screen: 'products-balance', // Ignore products, discounts, and client barcodes - // barcode_product_action: function(code){}, + barcode_product_action: function(code){}, barcode_discount_action: function(code){}, barcode_client_action: function(code){}, @@ -845,6 +857,7 @@ odoo.define('vracoop_pos_free_balance_v2.container_balance', function (require) screen.$el.removeClass('oe_hidden'); $("#pos-header-text-selec").removeClass('oe_hidden'); $("#pos-header-text-confirm").addClass('oe_hidden'); + $("#add-new-container").addClass('oe_hidden'); // Ajout de la fonctionnalité Pesée sans contenant if (this.pos.config.allow_without_container){ @@ -865,6 +878,9 @@ odoo.define('vracoop_pos_free_balance_v2.container_balance', function (require) var screen = this.gui.screen_instances['products-balance']; screen.$el.addClass('oe_hidden'); $("#pos-header-text-selec").addClass('oe_hidden'); + if (this.pos.config.allow_without_container){ + $("#add-new-container").removeClass('oe_hidden'); + } }, }); diff --git a/static/src/xml/pos.xml b/static/src/xml/pos.xml index d36e51e..c1c0cff 100644 --- a/static/src/xml/pos.xml +++ b/static/src/xml/pos.xml @@ -265,6 +265,9 @@ Retour +
+ Créer un contenant +