|
@ -313,7 +313,9 @@ odoo.define('vracoop_pos_free_balance_v2.container_balance', function (require) |
|
|
self.set_weight(scale_answer.weight); |
|
|
self.set_weight(scale_answer.weight); |
|
|
if ((scale_answer.error === '30' || scale_answer.error === '31') && scale_answer.weight !== 0) { |
|
|
if ((scale_answer.error === '30' || scale_answer.error === '31') && scale_answer.weight !== 0) { |
|
|
self.gui.show_screen(self.next_screen); |
|
|
self.gui.show_screen(self.next_screen); |
|
|
self.create_container(); |
|
|
|
|
|
|
|
|
if (this.pos.config.is_comptoir) { |
|
|
|
|
|
self.create_container(); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
}, {duration: 500, repeat: true}); |
|
|
}, {duration: 500, repeat: true}); |
|
@ -367,15 +369,21 @@ odoo.define('vracoop_pos_free_balance_v2.container_balance', function (require) |
|
|
|
|
|
|
|
|
selected_order.add_container(container); |
|
|
selected_order.add_container(container); |
|
|
|
|
|
|
|
|
self.gui.show_popup('confirm-pesee',{ |
|
|
|
|
|
'title': _t('Merci'), |
|
|
|
|
|
'body': _t('Contenant ajouté, vous pouvez vous servir'), |
|
|
|
|
|
confirm: function(){ |
|
|
|
|
|
self.gui.show_screen(self.next_screen); |
|
|
|
|
|
}, |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
if (this.pos.config.is_comptoir) { |
|
|
|
|
|
self.gui.show_screen(self.next_screen); |
|
|
|
|
|
} |
|
|
|
|
|
else{ |
|
|
|
|
|
self.gui.show_popup('confirm-pesee',{ |
|
|
|
|
|
'title': _t('Merci'), |
|
|
|
|
|
'body': _t('Contenant ajouté, vous pouvez vous servir'), |
|
|
|
|
|
confirm: function(){ |
|
|
|
|
|
self.gui.show_screen(self.next_screen); |
|
|
|
|
|
}, |
|
|
|
|
|
}); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
close: function(){ |
|
|
close: function(){ |
|
|
this._super(); |
|
|
this._super(); |
|
|
if (this.pos.config.iface_vkeyboard && this.chrome.widget.keyboard) { |
|
|
if (this.pos.config.iface_vkeyboard && this.chrome.widget.keyboard) { |
|
|