diff options
| author | Jacky (trj) <trj@odoo.com> | 2021-01-27 15:10:36 +0000 |
|---|---|---|
| committer | Jacky (trj) <trj@odoo.com> | 2021-04-08 12:41:56 +0000 |
| commit | 455f49fe74611849ee1ff6addc875352d1b6c386 (patch) | |
| tree | 2d958d9b1bb5d4d42bdf4c0e570b93659bcc2c28 /addons/point_of_sale | |
| parent | 819321c3a129613890ce49e3efe9a903c3218070 (diff) | |
[REF] point_of_sale + pos_restaurant: adjusted code for German POS localization
These changes have been made to be able to add some behaviors in some specific points of the flow when overridden.
Diffstat (limited to 'addons/point_of_sale')
| -rw-r--r-- | addons/point_of_sale/static/src/js/Screens/TicketScreen/TicketScreen.js | 4 | ||||
| -rw-r--r-- | addons/point_of_sale/static/src/js/models.js | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/addons/point_of_sale/static/src/js/Screens/TicketScreen/TicketScreen.js b/addons/point_of_sale/static/src/js/Screens/TicketScreen/TicketScreen.js index dd7adce4e07..f59b72d0b0a 100644 --- a/addons/point_of_sale/static/src/js/Screens/TicketScreen/TicketScreen.js +++ b/addons/point_of_sale/static/src/js/Screens/TicketScreen/TicketScreen.js @@ -91,6 +91,7 @@ odoo.define('point_of_sale.TicketScreen', function (require) { if (!confirmed) return; } if (order) { + await this._canDeleteOrder(order); order.destroy({ reason: 'abandon' }); } posbus.trigger('order-deleted'); @@ -191,6 +192,9 @@ odoo.define('point_of_sale.TicketScreen', function (require) { screenToStatusMap: this._screenToStatusMap, }); } + async _canDeleteOrder(order) { + return true; + } getOrderStates() { return { AllTickets: this.env._t('All Tickets'), diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index eedae8d9a8c..a2cd058ac06 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -1157,9 +1157,8 @@ exports.PosModel = Backbone.Model.extend({ timeout: timeout, shadow: true, }) - .then(function (ids) { - self.db.set_ids_removed_from_server(server_ids); - return server_ids; + .then(function (data) { + return self._post_remove_from_server(server_ids, data) }).catch(function (reason){ var error = reason.message; if(error.code === 200 ){ // Business Logic Error, not a connection problem @@ -1175,6 +1174,12 @@ exports.PosModel = Backbone.Model.extend({ }); }, + // to override + _post_remove_from_server(server_ids, data) { + this.db.set_ids_removed_from_server(server_ids); + return server_ids; + }, + scan_product: function(parsed_code){ var selectedOrder = this.get_order(); var product = this.db.get_product_by_barcode(parsed_code.base_code); |
