From 0d60e970146a14e2267594927804510547867324 Mon Sep 17 00:00:00 2001
From: Aung Kyaw Phyoe <aungkyawphyoe@code2lab.com>
Date: Mon, 14 Jan 2019 09:15:30 +0630
Subject: [PATCH] change ui not same for table, room and order

---
 app/assets/stylesheets/reset.css           | 15 ++--
 app/views/crm/customers/_new_form.html.erb | 11 ++-
 app/views/layouts/_header.html.erb         | 15 ++--
 app/views/origami/customers/index.html.erb | 11 ++-
 app/views/origami/home/show.html.erb       | 18 +++--
 app/views/origami/orders/show.html.erb     | 22 ++++--
 app/views/origami/rooms/show.html.erb      | 85 +++++++++++++---------
 app/views/origami/sales/show.html.erb      | 20 +++--
 config/routes.rb                           |  4 +-
 9 files changed, 126 insertions(+), 75 deletions(-)

diff --git a/app/assets/stylesheets/reset.css b/app/assets/stylesheets/reset.css
index 35b88ab8..4f983969 100644
--- a/app/assets/stylesheets/reset.css
+++ b/app/assets/stylesheets/reset.css
@@ -286,14 +286,15 @@ section.content {
 
 /* shop name margin */
 .shop-name-margin {
-  margin-left : 10%;
+  text-align: center;
+  width: 50%;
+  margin: auto;
 }
 /* shop name margin */
 
 /* online order margin */
 .online-order-margin {
-  margin-left : 10%;
-  margin-bottom : 9.9999px;
+  margin: auto;
 }
 /* online order margin */
 /* default-header-color */
@@ -303,18 +304,18 @@ div.online-order-margin > div > span {
 /* default-header-color */
 /* order-no color */
 .order-badge {
-  position: absolute;
+  position: relative;
   background: #ff6600;
   height: 1.8rem;
-  bottom: -0.1rem;
-  right: -1.3rem;
+  bottom: 0.9rem;
+  right: 1.7rem;
   width: 1.8rem;
   text-align: center;
   line-height: 1.7rem;
   font-size: 0.9rem;
   border-radius: 50%;
   color: white;
-  border: 1px solid #ff6600;
+  border: 5px solid #ff6600;
   font-family: sans-serif;
   font-weight: bold;
 }
diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb
index 3ca71c39..e401aef6 100644
--- a/app/views/crm/customers/_new_form.html.erb
+++ b/app/views/crm/customers/_new_form.html.erb
@@ -246,7 +246,16 @@
 <script type="text/javascript">
   var paypar_account_no = [];
   $(function() {
-    paypar_account_no = JSON.parse('<%= @paypar_accountno.to_json.html_safe %>');
+    paypar_account_no = JSON.parse('<%= @paypar_accountno.to_json.html_safe %>', function (key, value) {
+      var type;
+      if (value && typeof value === 'object') {
+          type = value.type;
+          if (typeof type === 'string' && typeof window[type] === 'function') {
+              return new(window[type])(value);
+          }
+      }
+      return value;
+    });
     console.log(paypar_account_no);
 
 // Read Card Reader
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 1854a1df..0d8efe48 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -37,20 +37,21 @@
         </div>
         <!-- Start Shop Info -->
         <div class="navbar-right shop-name-margin">
-            <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 navbar-brand">
-                <span class="navbar-brand-txt"><%= shop_detail.name %></span>
-            </div>
+            <span class="navbar-brand navbar-brand-txt"><%= shop_detail.name %></span>
         </div>
         <!-- End Shop Info -->
         
         <div class="navbar-right online-order-margin">
             <% if order_reservation %>
-            <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 online_order">
-                <span class="navbar-brand-txt header-default-color"><%= t :order_reservation %></span>
-                <span class="order_no"></span>
-            </div>
+                <div class="online_order">
+                    <span class="navbar-brand navbar-brand-txt header-default-color"><%= t :order_reservation %></span>
+                    <span class="order_no"></span>
+                </div>
             <% end %>
         </div>
+
+        <!-- Start Quick Access for Cashier -->
+        <!-- End Quick Access for Cashier -->
         
         <!-- Start Delete confirrm text !-->
         <div class="navbar-right">
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index e7d81539..72650ba3 100644
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -366,7 +366,16 @@
   var page     = "<%= @page %>"; 
   var paypar_account_no = [];
   $(function() {
-    paypar_account_no = JSON.parse('<%= @paypar_accountno.to_json.html_safe %>');
+    paypar_account_no = JSON.parse('<%= @paypar_accountno.to_json.html_safe %>', function (key, value) {
+      var type;
+      if (value && typeof value === 'object') {
+          type = value.type;
+          if (typeof type === 'string' && typeof window[type] === 'function') {
+              return new(window[type])(value);
+          }
+      }
+      return value;
+    });
     console.log(paypar_account_no);
     /* check webview loaded*/
     var webview = <%= @webview %>;
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index d4f0c8fd..f314d0ee 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -52,7 +52,8 @@
                         <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
                       <% end %>                         
                           <div class="card-block">
-                            <%= table.name %>
+                            <%= table.name %> <br>
+                            <%= table.zone.name %>
                             <span class="float-right font-12 new_text_<%= table.id %>"> billed</span>
                             <div style="font-size:12px;"></div>
                           </div>
@@ -64,7 +65,8 @@
                         <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
                       <% end %>                   
                             <div class="card-block">
-                            <%= table.name %> 
+                            <%= table.name %> <br>
+                            <%= table.zone.name %>
                             <span class="float-right font-12 new_text_<%= table.id %>"> new</span>
                           </div>
                         </div>
@@ -72,7 +74,8 @@
                   <% else %>
                     <div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>">
                       <div class="card-block">
-                        <%= table.name %>
+                        <%= table.name %>  <br>
+                        <%= table.zone.name %>
                         <span class="float-right font-12 new_text_<%= table.id %> hide"> new</span>
                       </div>
                     </div>
@@ -93,7 +96,8 @@
                         <div class="card rooms orange text-white table_<%= room.id %>" data-id="<%= room.id %>">
                       <% end %>
                           <div class="card-block">
-                            <%= room.name %>
+                            <%= room.name %> <br>
+                            <%= room.zone.name %> 
                             <span class="float-right font-12 new_text_<%= room.id %>"> billed</span>
                           </div>
                         </div>
@@ -104,7 +108,8 @@
                         <div class="card rooms orange text-white table_<%= room.id %>" data-id="<%= room.id %>">
                       <% end %>
                           <div class="card-block">
-                          <%= room.name %>
+                            <%= room.name %> <br>
+                            <%= room.zone.name %> 
                             <span class="float-right font-12 new_text_<%= room.id %>"> new</span>
                           </div>
                         </div>
@@ -112,7 +117,8 @@
                     <% else %>
                       <div class="card rooms green text-white table_<%= room.id %>" data-id="<%= room.id %>">
                         <div class="card-block">
-                          <%= room.name %>
+                          <%= room.name %> <br>
+                          <%= room.zone.name %> 
                           <span class="float-right font-12 new_text_<%= room.id %> hide"> 
                         </div>
                       </div>
diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb
index cae8c4c6..b3b9ae51 100755
--- a/app/views/origami/orders/show.html.erb
+++ b/app/views/origami/orders/show.html.erb
@@ -49,7 +49,8 @@
                 <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
               <% end %>                         
                   <div class="card-block">
-                    <%= table.name %>
+                    <%= table.name %> <br>
+                    <%= table.zone.name %>
                     <span class="float-right font-12 new_text_<%= table.id %>"> billed</span>
                     <div style="font-size:12px;"></div>
                   </div>
@@ -61,7 +62,8 @@
                 <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
               <% end %>                   
               <div class="card-block">
-                  <%= table.name %> 
+                  <%= table.name %> <br>
+                  <%= table.zone.name %>
                   <span class="float-right font-12 new_text_<%= table.id %>"> new</span>
                 </div>
               </div>
@@ -69,7 +71,8 @@
         <% else %>
             <div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>">
               <div class="card-block">
-                <%= table.name %>
+                <%= table.name %> <br>
+                <%= table.zone.name %>
                 <span class="float-right font-12 new_text_<%= table.id %> hide"> new</span>
               </div>
             </div>
@@ -86,22 +89,25 @@
             <% if room.get_booking.nil? %>
               <div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
                 <div class="card-block">
-                  <%= room.name %>
-                      <span class="float-right font-12 new_text_<%= room.id %>"> billed</span>
+                  <%= room.name %> <br>
+                  <%= room.zone.name %>
+                  <span class="float-right font-12 new_text_<%= room.id %>"> billed</span>
                 </div>
               </div>
               <% else %>
                 <div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
                   <div class="card-block">
-                    <%= room.name %>
-                        <span class="float-right font-12 new_text_<%= room.id %>"> new</span>
+                    <%= room.name %> <br>
+                    <%= room.zone.name %>
+                    <span class="float-right font-12 new_text_<%= room.id %>"> new</span>
                   </div>
                 </div>
               <% end %>
           <% else %>
               <div class="card rooms green text-white table_<%= room.id %>" data-id="<%= room.id %>">
                 <div class="card-block">
-                  <%= room.name %>
+                  <%= room.name %> <br>
+                  <%= room.zone.name %>
                   <span class="float-right font-12 new_text_<%= room.id %> hide"> 
                 </div>
               </div>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 311927c5..f90729c9 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -52,13 +52,14 @@
                   <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">  
                 <% end %>              
                     <div class="card-block">
-                       <%= table.name %>
+                      <%= table.name %> <br>
+                      <%= table.zone.name %>
                       <!-- <% if !@order_items_count.nil? %>
                         <% if @order_items_count.key?(table.id) %>
                           (Orders : <%= @order_items_count[table.id] %>)
                         <% end %>
                       <% end %> -->
-                         <span class="pull-right font-12 new_text_<%= table.id %>"> billed</span>
+                         <span class="float-right font-12 new_text_<%= table.id %>"> billed</span>
                     </div>
                   </div>
               <% else %>                
@@ -68,21 +69,23 @@
                     <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">      
                   <% end %>           
                     <div class="card-block">
-                       <%= table.name %>
+                      <%= table.name %> <br>
+                      <%= table.zone.name %>
                        <!-- <% if !@order_items_count.nil? %>
                         <% if @order_items_count.key?(table.id) %>
                           (Orders : <%= @order_items_count[table.id] %>)
                         <% end %>
                       <% end %> -->
-                         <span class="pull-right font-12 new_text_<%= table.id %>"> new</span>
+                         <span class="float-right font-12 new_text_<%= table.id %>"> new</span>
                     </div>
                   </div>
               <% end %>
            <% else %>
            <div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>">
              <div class="card-block">
-                <%= table.name %>
-                <span class="pull-right font-12 new_text_<%= table.id %> hide">
+              <%= table.name %> <br>
+              <%= table.zone.name %>
+              <span class="float-right font-12 new_text_<%= table.id %> hide">
              </div>
            </div>
            <% end %>
@@ -103,13 +106,14 @@
                  <div class="card rooms orange text-white table_<%= room.id %>" data-id="<%= room.id %>">
                 <% end %>
                    <div class="card-block">
-                      <%= room.name %>
+                      <%= room.name %> <br>
+                      <%= room.zone.name %>
                       <!-- <% if !@order_items_count.nil? %>
                         <% if @order_items_count.key?(room.id) %>
                           (Orders : <%= @order_items_count[room.id] %>)
                         <% end %>
                       <% end %> -->
-                      <span class="pull-right font-12 new_text_<%= room.id %>"> billed</span>
+                      <span class="float-right font-12 new_text_<%= room.id %>"> billed</span>
                       <div  style="font-size:12px;"></div>
                    </div>
                  </div>
@@ -120,7 +124,8 @@
                  <div class="card rooms orange text-white table_<%= room.id %>" data-id="<%= room.id %>">
                 <% end %>
                    <div class="card-block">
-                      <%= room.name %>
+                      <%= room.name %> <br>
+                      <%= room.zone.name %>
                       <!-- <% if !@order_items_count.nil? %>
                         <% if @order_items_count.key?(room.id) %>
                           (Orders : <%= @order_items_count[room.id] %>)
@@ -133,7 +138,8 @@
            <% else %>
            <div class="card rooms green text-white table_<%= room.id %>" data-id="<%= room.id %>">
              <div class="card-block">
-                <%= room.name %>
+                <%= room.name %> <br>
+                <%= room.zone.name %>
                 <span class="pull-right font-12 new_text_<%= room.id %> hide">
              </div>
            </div>
@@ -220,7 +226,7 @@
           <%end%>
         <%end%>
         <div class="card-header <%= existing_class %>" <%= tooltip %>>
-         <% if @status_order == 'order' %>
+         <% if @status_order == 'order' && @status_sale != 'sale' %>
           <% if !@obj_order.nil? %>
             <div id="save_order_id" data-order="<%= @obj_order.order_id %>">
           <% else %>
@@ -242,44 +248,51 @@
               <span class="float-right">Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span>
             <% end %>
             </div>
-
+          <% else %>
+            <strong id="order-title">ORDER DETAILS </strong> | Room <%= @room.name rescue "" %>
          <% end %>
 
        </div>
        <div class="card-block">
          <div class="card-title row p-l-5 p-r-5">
-           
-            <% if @status_sale == 'sale' %>
-            <div class="col-lg-8 col-md-8 col-sm-8">
-            &nbsp;  Receipt No: 
-              <span id="receipt_no">
-                 <%= @obj_sale.receipt_no rescue '' %>
-              </span>
+           <% if (!@sale_array.empty?) && (!@date.nil?) %>
+              <div class="col-lg-8 col-md-8 col-sm-8">
+                &nbsp; Receipt No: <span id="receipt_no">
+                   <% if @status_sale == 'sale' %>
+                    <%= @sale_array[0].receipt_no rescue '' %>
+                   <% end %>
+                 </span>
+                 <br>
               </div>
               <div class="col-lg-4 col-md-4 col-sm-4 text-right">
-                Date:  <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span>
-               </div>
-             <% else %>
-             <div class="col-lg-7 col-md-7 col-sm-7">
-             &nbsp; Order No: 
-              <span id="receipt_no">
-                 <%= @obj_order.order_id rescue '' %>
-              </span>
+                Date: <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y-%I:%M %p") rescue '-' %></span>
+                <br>
+              </div>
+            <% elsif !@date.nil? %>
+              <div class="col-lg-7 col-md-7 col-sm-7">
+                &nbsp; Order No: <span id="order_no">
+                   <% if @status_order == 'order' %>
+                     <%= @obj_order.order_id rescue '' %>
+                   <% end %>
+                 </span>
+                 <br>
               </div>
               <div class="col-lg-5 col-md-5 col-sm-5 text-right">
-                Date:  <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y") rescue '-'%></span>
-               </div>
+                Date: <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y") rescue '-' %></span>
+                <br>
+              </div>
             <% end %>
          </div>
          <div class="card-title row customer_detail p-l-5 p-r-5" >
            <div class="col-lg-6 col-md-6 col-sm-6">
              <% if @status_sale == 'sale' %>
-              <p class="hidden customer-id"><%= @obj_sale.customer_id rescue '' %></p>
-              &nbsp; Customer : <%= @obj_sale.customer.name rescue '-' %>
-             <%else%>
-               <p class="hidden customer-id"><%= @obj_order.customer_id rescue "-" %></p>
-              &nbsp; Customer : <%= @customer.name rescue "-" %>
-             <%end%>
+              <p class="hidden customer-id"><%= @sale_array[0].customer_id rescue '' %></p>
+              &nbsp; Customer : <%= @sale_array[0].customer.name rescue '' %>
+              <% elsif @status_order == 'order'
+              %>
+              <p class="hidden customer-id"><%= @customer.customer_id rescue "" %></p>
+              &nbsp; Customer : <%= @customer.name rescue "" %>
+              <% end %>
            </div>
 
          </div>
@@ -288,7 +301,7 @@
              <table class="table table-striped" id="order-items-table">
                <thead>
                  <tr>
-                   <th></th>
+                   <th>#</th>
                    <th class="item-name">Items</th>
                    <th class="item-attr">QTY</th>
                    <th class="item-attr">Price</th>
diff --git a/app/views/origami/sales/show.html.erb b/app/views/origami/sales/show.html.erb
index bfe1f0a9..cc033f9b 100755
--- a/app/views/origami/sales/show.html.erb
+++ b/app/views/origami/sales/show.html.erb
@@ -50,7 +50,8 @@
                   <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
                 <% end %>                         
                 <div class="card-block">
-                  <%= table.name %>
+                  <%= table.name %> <br>
+                  <%= table.zone.name %>
                     <!-- <% if !@order_items_count.nil? %>
                       <% if @order_items_count.key?(table.id) %>
                         (Orders : <%= @order_items_count[table.id] %>)
@@ -67,7 +68,8 @@
                   <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
                 <% end %>                   
                 <div class="card-block">
-                  <%= table.name %> 
+                  <%= table.name %> <br>
+                  <%= table.zone.name %>
                     <!-- <% if !@order_items_count.nil? %>
                       <% if @order_items_count.key?(table.id) %>
                         (Orders : <%= @order_items_count[table.id] %>)
@@ -79,8 +81,9 @@
               <% end %>
             <% else %>
               <div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>">
-              <div class="card-block">
-                <%= table.name %>
+                <div class="card-block">
+                  <%= table.name %> <br>
+                  <%= table.zone.name %>
                   <span class="float-right font-12 new_text_<%= table.id %> hide"> new</span>
                 </div>
               </div>
@@ -97,7 +100,8 @@
             <% if room.get_booking.nil? %>
               <div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
                 <div class="card-block">
-                  <%= room.name %>
+                  <%= room.name %> <br>
+                  <%= room.zone.name %>
                   <!-- <% if !@order_items_count.nil? %>
                     <% if @order_items_count.key?(room.id) %>
                       (Orders : <%= @order_items_count[room.id] %>)
@@ -109,7 +113,8 @@
             <% else %>
               <div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
                 <div class="card-block">
-                  <%= room.name %>
+                  <%= room.name %><br>
+                  <%= room.zone.name %>
                     <!-- <% if !@order_items_count.nil? %>
                       <% if @order_items_count.key?(room.id) %>
                         (Orders : <%= @order_items_count[room.id] %>)
@@ -122,7 +127,8 @@
             <% else %>
               <div class="card rooms green text-white table_<%= room.id %>" data-id="<%= room.id %>">
                 <div class="card-block">
-                  <%= room.name %>
+                  <%= room.name %><br>
+                  <%= room.zone.name %>
                   <span class="float-right font-12 new_text_<%= room.id %> hide"> 
                 </div>
               </div>
diff --git a/config/routes.rb b/config/routes.rb
index e68fc76d..89963f1e 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -106,6 +106,7 @@ scope "(:locale)", locale: /en|mm/ do
 
   #--------- Cashier ------------#
   namespace :origami do    
+    root "home#index"
 
     post '/check_emp_access_code/:code' => 'home#check_emp_access_code', :defaults => { :format => 'json' }
 
@@ -127,7 +128,6 @@ scope "(:locale)", locale: /en|mm/ do
 
     #food court routes
     get "food_court" => "food_court#index"
-
     get "food_court/modify_order/:id/:sale_id" => "food_court#modify_order"
     get "food_court/modify_order/:sale_id" => "food_court#modify_order"
     post 'food_court/update_modify_order' => "food_court#update_modify_order", :defaults => { :format => 'json' }
@@ -135,7 +135,7 @@ scope "(:locale)", locale: /en|mm/ do
 
     resources :cash_ins, only: [:new, :create]
     resources :cash_outs, only: [:new, :create]
-    root "home#index"
+    
     get "table/:dining_id" => "home#show" do #origami/:booking_id will show
       # resources :discounts, only: [:index,:new, :create ] #add discount type
       resources :customers #add customer type