deisy пре 5 година
родитељ
комит
ab0a62bfe5

+ 1 - 0
__openerp__.py

@@ -14,6 +14,7 @@
         "hr",
     ],
     "data": [
+        "data/data.xml",
         "security/ir.model.access.csv",
         "views/pos_table_views.xml",
         "views/pos_floor_views.xml",

+ 68 - 0
data/data.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<openerp>
+  <data noupdate="1">
+    <!-- Task Types -->
+    <record model="pos.floor" id="floor1">
+      <field name="id">1001</field>
+      <field name="name">Salón</field>
+      <field name="type">table</field>
+    </record>
+    <record model="pos.floor" id="floor2">
+      <field name="id">1002</field>
+      <field name="name">Delivery</field>
+      <field name="type">delivery</field>
+    </record>
+
+    <record model="pos.table" id="table1">
+      <field name="name">Mesa 1</field>
+      <field name="type">table</field>
+      <field name="floor_id" ref="floor1"/>
+    </record>
+    <record model="pos.table" id="table2">
+      <field name="name">Mesa 2</field>
+      <field name="type">table</field>
+      <field name="floor_id" ref="floor1"/>
+    </record>
+    <record model="pos.table" id="table3">
+      <field name="name">Mesa 3</field>
+      <field name="type">table</field>
+      <field name="floor_id" ref="floor1"/>
+    </record>
+    <record model="pos.table" id="table4">
+      <field name="name">Mesa 4</field>
+      <field name="type">table</field>
+      <field name="floor_id" ref="floor1"/>
+    </record>
+    <record model="pos.table" id="table5">
+      <field name="name">Mesa 5</field>
+      <field name="type">table</field>
+      <field name="floor_id" ref="floor1"/>
+    </record>
+    <record model="pos.table" id="table6">
+      <field name="name">Mesa 6</field>
+      <field name="type">table</field>
+      <field name="floor_id" ref="floor1"/>
+    </record>
+    <record model="pos.table" id="table7">
+      <field name="name">Mesa 7</field>
+      <field name="type">table</field>
+      <field name="floor_id" ref="floor1"/>
+    </record>
+    <record model="pos.table" id="table8">
+      <field name="name">Mesa 8</field>
+      <field name="type">table</field>
+      <field name="floor_id" ref="floor1"/>
+    </record>
+    <record model="pos.table" id="table9">
+      <field name="name">Mesa 9</field>
+      <field name="type">table</field>
+      <field name="floor_id" ref="floor1"/>
+    </record>
+    <record model="pos.table" id="table10">
+      <field name="name">Mesa 10</field>
+      <field name="type">table</field>
+      <field name="floor_id" ref="floor1"/>
+    </record>
+
+  </data>
+</openerp>

BIN
static/src/img/bike2.png


BIN
static/src/img/car.png


BIN
static/src/img/table.png


BIN
static/src/img/table1.png


+ 13 - 1
static/src/js/models.js

@@ -58,7 +58,19 @@ function pos_restaurant_table_management_models(instance, module){
         // Lihat T-7
         get_table_name: function(){
             var table = this.get('table');
-            return table ? table.name : "";
+            var vals;
+            if (table){
+              vals =  {
+                'name': table.name,
+                'type': table.type
+              }
+            }else {
+              vals =  {
+                'name': "",
+                'type': ""
+              }
+            }
+            return vals
         },
 
         // M-3.4

+ 13 - 4
static/src/xml/pos_restaurant_table_management.xml

@@ -21,7 +21,7 @@
     -->
     <t t-name="FloorPopupWidget">
         <div class="modal-dialog custom-dialog">
-            <div class="popup popup-select-floors" >
+            <div class="popup popup-select-floors" style="height: auto !important; min-height: 400px;">
                 <div class="floor-header">
                     <!-- <div class="floor-heading">
                         Elegir salon o piso
@@ -85,7 +85,7 @@
 
     <t t-name="TablePopupWidget">
         <div class="modal-dialog custom-dialog">
-            <div class="popup popup-select-table" >
+            <div class="popup popup-select-table" style="height: auto !important; min-height: 400px;">
                 <div class="floor-heading">
                 </div>
                 <span class='button' id='table-back'>
@@ -131,6 +131,10 @@
           transform: translate(-50%, -50%);
           color: black;
         }
+        .img-button{
+          width:28px;
+          transform: translate(0px,10px)
+        }
       </style>
         <span class='table_list_widget' t-att-data-floor-id="widget.model_table.id">
             <button class="table-button2" style="position:relative">
@@ -159,8 +163,13 @@
             <span class='order-table'>
                 <t t-if="widget.order.get_table()">
                     <i class='fa'/>
-                    <img src="/pos_restaurant_table_and_delivery/static/src/img/table.png"/>
-                    <t t-esc="widget.order.get_table_name()"/>
+                    <t t-if="widget.order.get_table_name().type == 'table'">
+                      <img src="/pos_restaurant_table_and_delivery/static/src/img/table1.png" class="img-button" />
+                    </t>
+                    <t t-if="widget.order.get_table_name().type == 'delivery'">
+                      <img src="/pos_restaurant_table_and_delivery/static/src/img/bike2.png" class="img-button" />
+                    </t>
+                    <t t-esc="widget.order.get_table_name().name"/>
                 </t>
             </span>
         </t>