Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

app/controllers/origami/home_controller.rb

@@ -7,7 +7,7 @@ class Origami::HomeController < BaseOrigamiController
     @tables   = Table.unscoped.all.active.order('status desc')
     @rooms    = Room.unscoped.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders   = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
+    @orders   = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
     @shop     = Shop.first
 
     # @shift = ShiftSale.current_open_shift(current_user.id)

app/controllers/origami/rooms_controller.rb

@@ -3,7 +3,7 @@ class Origami::RoomsController < BaseOrigamiController
     @tables = Table.unscoped.all.active.order('status desc')
     @rooms = Room.unscoped.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
+    @orders = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
     # @shift = ShiftSale.current_open_shift(current_user.id)
     @webview = false
     if check_mobile
@@ -20,7 +20,7 @@ class Origami::RoomsController < BaseOrigamiController
     @tables = Table.unscoped.all.active.order('status desc')
     @rooms = Room.unscoped.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
+    @orders = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
 
     @room = DiningFacility.find(params[:room_id])
 

app/views/origami/home/index.html.erb

@@ -50,8 +50,8 @@
                      <div class="card tables orange text-white" data-id="<%= table.id %>">
                     <% end %>
                        <div class="card-block">
-                          Zone <%= table.zone_id %> <br>
-                          Table <%= table.name %>  ( <%= table.seater %> Seat )
+                          Table <%= table.name %>  ( <%= table.seater %> Seat ) <br>
+                          Zone <%= table.zone_id %>
                        </div>
                      </div>
                  <% else %>
@@ -61,16 +61,16 @@
                       <div class="card tables orange text-white" data-id="<%= table.id %>">
                     <% end %>
                         <div class="card-block">
-                          Zone <%= table.zone_id %> <br>
-                          Table <%= table.name %>  ( <%= table.seater %> Seat )
+                          Table <%= table.name %>  ( <%= table.seater %> Seat ) <br>
+                          Zone <%= table.zone_id %> 
                         </div>
                       </div>
                  <% end %>
              <% else %>
                  <div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>">
                    <div class="card-block">
-                     Zone <%= table.zone_id %> <br>
-                     Table <%= table.name %>  ( <%= table.seater %> Seat )
+                     Table <%= table.name %>  ( <%= table.seater %> Seat ) <br>
+                     Zone <%= table.zone_id %>
                    </div>
                  </div>
              <% end %>
@@ -107,11 +107,26 @@
      <div class="tab-pane dining" id="orders" role="tabpanel">
        <div class="card-columns">
          <% @orders.each do |order| %>
-         <div class="card orders red text-white" data-id = "<%= order.order_id %>">
-           <div class="card-block">
-              <%= order.order_id %>
-           </div>
-         </div>
+          <div class="card orders <%=(order.status=="new") ? 'blue' : 'red'%> text-white" data-id="<%= order.order_id %>">
+            <div class="card-block">
+              <%
+                order_status = ""
+                sale_order = order.sale_orders.first
+                if sale_order
+                  unless sale_order.sale_id.nil?
+                    sale = Sale.find(sale_order.sale_id)
+                    order_status = sale.sale_status
+                    if order_status == 'new'
+                      order_status  = order.status
+                    end
+                  end
+                else
+                  order_status = order.status
+                end
+              %>
+              <%= order.order_id %> <% if !order_status.empty? %>| <%= order_status %> <% end %>
+            </div>
+          </div>
          <% end %>
        </div>
      </div>

app/views/origami/home/show.html.erb

@@ -371,7 +371,9 @@
                 <% else %>
                   No Tax
                 <% end %></strong><br>
-                <button class="btn btn-link waves-effect bg-info change_tax">Change Tax</button>
+                <%if !@webview %>
+                  <button class="btn btn-link waves-effect bg-info change_tax">Change Tax</button>
+                <% end %>
                 </td>
                <td class="item-attr"><strong id="order-Tax"><%= @obj_sale.total_tax rescue 0%></strong></td>
              </tr>

app/views/origami/rooms/show.html.erb

@@ -144,25 +144,25 @@
          <div class="card-columns">
            <% @orders.each do |order| %>
              <div class="card orders <%=(order.status=="new") ? 'blue' : 'red'%> text-white" data-id="<%= order.order_id %>">
-             <div class="card-block">
-              <%
-                order_status = ""
-                sale_order = SaleOrder.find_by_order_id(order)
-                if sale_order
-                  unless sale_order.sale_id.nil?
-                    sale = Sale.find(sale_order.sale_id)
-                    order_status = sale.sale_status
-                    if order_status == 'new'
-                      order_status  = order.status
+              <div class="card-block">
+                <%
+                  order_status = ""
+                  sale_order = order.sale_orders.first
+                  if sale_order
+                    unless sale_order.sale_id.nil?
+                      sale = Sale.find(sale_order.sale_id)
+                      order_status = sale.sale_status
+                      if order_status == 'new'
+                        order_status  = order.status
+                      end
                     end
+                  else
+                    order_status = order.status
                   end
-                else
-                  order_status = order.status
-                end
-              %>
+                %>
                 <%= order.order_id %> <% if !order_status.empty? %>| <%= order_status %> <% end %>
-             </div>
-           </div>
+              </div>
+            </div>
            <% end %>
          </div>
        </div>
@@ -360,7 +360,9 @@
                 <% else %>
                   No Tax
                 <% end %></strong><br>
-                <button class="btn btn-link waves-effect bg-info change_tax">Change Tax</button>
+                <%if !@webview %>
+                  <button class="btn btn-link waves-effect bg-info change_tax">Change Tax</button>
+                <% end %>
               </td>
                <td class="item-attr"><strong id="order-Tax"><%= @obj_sale.total_tax rescue 0%></strong></td>
              </tr>