diff options
| author | Frederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com> | 2014-10-02 14:06:55 +0200 |
|---|---|---|
| committer | Frédéric van der Essen <fvdessen@gmail.com> | 2014-11-25 19:16:29 +0100 |
| commit | 07c07b2a346f68733caf906fe5d4e7aee595aeeb (patch) | |
| tree | 5ba7192cc3f5d26aac4f64c7e934b0ce7ed84822 | |
| parent | d44080bd0210faffba6748f764b036c9e9f1a967 (diff) | |
[IMP] pos_restaurant: add table / floor info to kitchen receipts
| -rw-r--r-- | addons/pos_restaurant/static/src/js/floors.js | 8 | ||||
| -rw-r--r-- | addons/pos_restaurant/static/src/js/multiprint.js | 3 | ||||
| -rw-r--r-- | addons/pos_restaurant/static/src/xml/multiprint.xml | 6 |
3 files changed, 15 insertions, 2 deletions
diff --git a/addons/pos_restaurant/static/src/js/floors.js b/addons/pos_restaurant/static/src/js/floors.js index b4728af2702..437d1e96103 100644 --- a/addons/pos_restaurant/static/src/js/floors.js +++ b/addons/pos_restaurant/static/src/js/floors.js @@ -588,7 +588,13 @@ function openerp_restaurant_floors(instance,module){ initialize: function(attr) { _super_order.initialize.call(this,attr); this.table = this.pos.table; - } + }, + export_as_JSON: function() { + var json = _super_order.export_as_JSON.apply(this,arguments); + json.table = this.table.name; + json.floor = this.table ? this.table.floor.name : false; + return json; + }, }); // We need to modify the OrderSelector to hide itself when we're on diff --git a/addons/pos_restaurant/static/src/js/multiprint.js b/addons/pos_restaurant/static/src/js/multiprint.js index 81b0e34053a..90302870133 100644 --- a/addons/pos_restaurant/static/src/js/multiprint.js +++ b/addons/pos_restaurant/static/src/js/multiprint.js @@ -148,7 +148,8 @@ function openerp_restaurant_multiprint(instance,module){ return { 'new': add, 'cancelled': rem, - 'table': json.table || 'unknown table', + 'table': json.table || false, + 'floor': json.floor || false, 'name': json.name || 'unknown order', }; diff --git a/addons/pos_restaurant/static/src/xml/multiprint.xml b/addons/pos_restaurant/static/src/xml/multiprint.xml index 8f3027dd552..c8cb50a38ee 100644 --- a/addons/pos_restaurant/static/src/xml/multiprint.xml +++ b/addons/pos_restaurant/static/src/xml/multiprint.xml @@ -19,6 +19,12 @@ value-autoint='on' > <div><t t-esc="changes.name" /></div> + <t t-if="changes.floor || changes.table"> + <br /> + <div><span><t t-esc="changes.floor" /></span> / <span bold='on'><t t-esc="changes.table"/></span></div> + </t> + <t t-if="changes.table"> + </t> <br /> <br /> <t t-if="changes.cancelled.length > 0"> |