Skip to content

[FIX] pos_tare : raise an error if the gross weight is not correct #566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OCA-git-bot merged 2 commits into from
Dec 15, 2020
Merged

[FIX] pos_tare : raise an error if the gross weight is not correct #566

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fc6dce
[FIX] pos_tare : raise an error if the gross weight is not correct
legalsylvain Nov 16, 2020
c761cb1
[FIX] pos_tare : move the confirm popup regarding null or negative qu…
legalsylvain Nov 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 25 additions & 26 deletions pos_tare/static/src/js/screens.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ odoo.define('pos_tare.screens', function (require) {
},
});

var _super_ScaleScreenWidget_order_product = screens.ScaleScreenWidget.prototype.order_product;

screens.ScaleScreenWidget.include({

// /////////////////////////////
Expand Down Expand Up @@ -74,12 +76,34 @@ odoo.define('pos_tare.screens', function (require) {
},

order_product: function () {
var self = this;
if (this.tare === undefined) {
this.gui.show_popup('error', {
'title': _t('Incorrect Tare Value'),
'body': _t('Please set a numeric value' +
' in the tare field, or let empty.'),
});
} else if (isNaN(this.gross_weight)) {
this.gui.show_popup('error', {
'title': _t('Incorrect Gross Weight Value'),
'body': _t('Please set a numeric value' +
' in the gross weight field.'),
});
} else if (this.weight <= 0) {
this.gui.show_popup('confirm', {
title: _t('Quantity lower or equal to zero'),
body: _t(
"The quantity is lower or equal to" +
" zero. Are you sure you want to continue ?"),
confirm: function() {
_super_ScaleScreenWidget_order_product.apply(self);
if (self.tare > 0.0) {
var order = self.pos.get_order();
var orderline = order.get_last_orderline();
orderline.set_tare(self.tare, false);
}
},
});
} else {
this._super();
if (this.tare > 0.0) {
Expand Down Expand Up @@ -133,31 +157,6 @@ odoo.define('pos_tare.screens', function (require) {

});

screens.PaymentScreenWidget.include({
validate_order: function(options) {
var order = this.pos.get_order();
var orderlines = Array.from(order.get_orderlines());

if (orderlines.some(leq_zero_qty)) {
var _super_validate_order = this._super.bind(this);
var wrong_orderline = orderlines.find(leq_zero_qty);
var wrong_product = wrong_orderline.get_product().display_name;
this.gui.show_popup('confirm', {
title: _t('Quantity lower or equal to zero'),
body: _.str.sprintf(
_t("The quantity for \"%s\" is lower or equal to" +
" zero. Call for help unless you're perfectly" +
" sure you are doing right."), wrong_product),
confirm: function() {
_super_validate_order();
},
});
return;
}
return this._super(options);
},
});

screens.OrderWidget.include({
set_value: function (val) {
var order = this.pos.get_order();
Expand All @@ -180,7 +179,7 @@ odoo.define('pos_tare.screens', function (require) {
} else if (mode === 'tare') {
if (this.pos.config.iface_tare_method === 'barcode') {
this.gui.show_popup('error',
{'title': _t('Incorrect Tare Value'),
{'title': _t('Feature Disabled'),
'body': _t('You can not set the tare.' +
' To be able to set the tare manually' +
' you have to change the tare input method' +
Expand Down