[IMP] pos_restaurant: improve the kitchen receipts based on customer feedback : Put...

diff --git a/addons/pos_restaurant/static/src/js/multiprint.js b/addons/pos_restaurant/static/src/js/multiprint.js
index 8b1f9e9..c617744 100644 (file)
--- a/addons/pos_restaurant/static/src/js/multiprint.js
+++ b/addons/pos_restaurant/static/src/js/multiprint.js
@@ -162,12 +162,25 @@ function openerp_restaurant_multiprint(instance,module){
                 rem = _rem;
             }
 
+            var d = new Date();
+            var hours   = '' + d.getHours();
+                hours   = hours.length < 2 ? ('0' + hours) : hours;
+            var minutes = '' + d.getMinutes();
+                minutes = minutes.length < 2 ? ('0' + minutes) : minutes;
+
+            console.log(hours,minutes);
+
+
             return {
                 'new': add,
                 'cancelled': rem,
                 'table': json.table || false,
                 'floor': json.floor || false,
                 'name': json.name  || 'unknown order',
+                'time': {
+                    'hours':   hours,
+                    'minutes': minutes,
+                },
             };
             
         },

diff --git a/addons/pos_restaurant/static/src/xml/multiprint.xml b/addons/pos_restaurant/static/src/xml/multiprint.xml
index add7c48..babf264 100644 (file)
--- a/addons/pos_restaurant/static/src/xml/multiprint.xml
+++ b/addons/pos_restaurant/static/src/xml/multiprint.xml
@@ -13,7 +13,7 @@
             align='center' 
             width='40' 
             size='double-height' 
-            line-ratio='0.6' 
+            line-ratio='0.4' 
             value-decimals='3' 
             value-thousands-separator=''
             value-autoint='on' 
@@ -21,21 +21,19 @@
             <div size='normal' ><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">
+                <div><span><t t-esc="changes.floor" /></span> / <span bold='on' size='double'><t t-esc="changes.table"/></span></div>
             </t>
             <br />
             <br />
             <t t-if="changes.cancelled.length > 0">
                 <div color='red'>
-                    <div bold='on' size='double'>CANCELLED</div>
+                    <div bold='on' size='double'>CANCELLED <span bold='off' size='double-height'><t t-esc='changes.time.hours' />:<t t-esc='changes.time.minutes' /></span> </div>
                     <br />
                     <br />
                     <t t-foreach="changes.cancelled" t-as="change">
                         <line>
-                            <left><t t-esc="change.name" /></left>
-                            <right><value><t t-esc="change.qty" /></value></right>
+                            <left><value><t t-esc="change.qty" /></value></left>
+                            <right><t t-esc="change.name" /></right>
                         </line>
                         <t t-if="change.note">
                             <line font='b' bold='off' indent='1' line-ratio='1'>
@@ -50,13 +48,13 @@
                 </div>
             </t>
             <t t-if="changes.new.length > 0">
-                <div bold='on' size='double'>NEW</div>
+                <div bold='on' size='double'>NEW <span bold='off' size='double-height'><t t-esc='changes.time.hours' />:<t t-esc='changes.time.minutes' /></span> </div>
                 <br />
                 <br />
                 <t t-foreach="changes.new" t-as="change">
                     <line>
-                        <left><t t-esc="change.name" /></left>
-                        <right><value><t t-esc="change.qty" /></value></right>
+                        <left><value><t t-esc="change.qty" /></value></left>
+                        <right><t t-esc="change.name" /></right>
                     </line>
                     <t t-if="change.note">
                         <line font='b' bold='off' indent='1' line-ratio='1'>