Pull from master

app/controllers/origami/addorders_controller.rb

@@ -96,8 +96,8 @@ class Origami::AddordersController < BaseOrigamiController
   end
 
   def create
-    Rails.logger.debug "Order Source - " + params[:order_source].to_s
-    Rails.logger.debug "Table ID - " + params[:table_id].to_s
+    # Rails.logger.debug "Order Source - " + params[:order_source].to_s
+    # Rails.logger.debug "Table ID - " + params[:table_id].to_s
     is_extra_time = false
     extra_time = ''
 

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/models/order.rb

@@ -44,8 +44,9 @@ class Order < ApplicationRecord
      
       if self.table_id.to_i > 0
         table =  DiningFacility.find(self.table_id)
-        table.status = "occupied"
-        table.save
+        table.update_attributes(status:"occupied")
+        # table.status = "occupied"
+        # table.save
       end
       
     else
@@ -144,7 +145,7 @@ class Order < ApplicationRecord
         end
 
         #if (!menu_item.nil?)
-          Rails.logger.debug menu_item
+          # Rails.logger.debug menu_item
           set_order_items = Array.new
           ##If menu Item set item - must add child items to order as well, where price is only take from menu_item
           if (menu_item[:type] == "SetMenuItem")            

app/models/order_queue_station.rb

@@ -232,12 +232,15 @@ class OrderQueueStation < ApplicationRecord
     order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
     order_queue_printer.print_order_summary(print_settings, oqs,order.order_id, order_items, print_status="")
 
-    AssignedOrderItem.where("order_id = '#{ order.order_id }'").find_each do |ai|
-    # update print status for order items
-      ai.print_status=true
-      ai.save       
-    end  
+    assigned =AssignedOrderItem.where("order_id = '#{ order.order_id }'").pluck(:assigned_order_item_id)
+    AssignedOrderItem.where({ order_id: '#{assigned}'}).update_all(print_status: true)
+    # assigned_items =AssignedOrderItem.where("order_id = '#{ order.order_id }'")
     
+    # assigned_items.each do |ai|
+    # # update print status for order items
+    #   ai.print_status=true
+    #   ai.save       
+    # end   
   end
 
   #Print order_item in 1 slip per item
@@ -273,9 +276,12 @@ class OrderQueueStation < ApplicationRecord
       end
     end
     # update print status for completed same order items
-    AssignedOrderItem.where("order_id = '#{ order.order_id }'").find_each do |ai|
-      ai.print_status=true
-      ai.save       
-    end
+    # AssignedOrderItem.where("order_id = '#{ order.order_id }'").update_all(print_status: true)
+    # AssignedOrderItem.where("order_id = '#{ order.order_id }'").find_each do |ai|
+    #   ai.print_status=true
+    #   ai.save       
+    # end
+    assigned =AssignedOrderItem.where("order_id = '#{ order.order_id }'").pluck(:assigned_order_item_id)
+    AssignedOrderItem.where({ order_id: '#{assigned}'}).update_all(print_status: true)
   end
 end

app/models/sale_order.rb

@@ -8,10 +8,10 @@ class SaleOrder < ApplicationRecord
   belongs_to :order
 
   def create_sale_order(sale, order)
-    self.sale_id = sale
-    self.order_id = order
-    self.save
-
+    sale_order = SaleOrder.new
+    sale_order.sale_id = sale
+    sale_order.order_id = order
+    sale_order.save!
   end
 
   private

app/models/shift_sale.rb

@@ -17,8 +17,8 @@ class ShiftSale < ApplicationRecord
   belongs_to :employee, :foreign_key => 'employee_id'
 
   def self.current_shift
-    today_date = DateTime.now.strftime("%Y-%m-%d")
-    shift = ShiftSale.where("shift_started_at is not null and shift_closed_at is null").take
+    # today_date = DateTime.now.strftime("%Y-%m-%d")
+    shift = ShiftSale.where("shift_started_at is not null and shift_closed_at is null").first
     return shift
   end
 

app/views/api/restaurant/zones/index.json.jbuilder

@@ -6,25 +6,21 @@ if @zones
       #List all tables
       json.tables zone.tables do |table|
         if table.is_active
-          booking = table.get_current_booking
           json.id table.id
           json.name table.name
           json.status table.status
           json.zone_id table.zone_id #Add this zone_id to keep data structure consistance
-          json.current_booking booking.booking_id rescue ""
-          json.sale_id booking.sale_id rescue ""
+          json.current_booking table.get_current_booking.booking_id rescue ""
         end
       end
 
       json.rooms zone.rooms do |room|
         if room.is_active
-          booking = room.get_current_booking
           json.id room.id
           json.name room.name
           json.status room.status
           json.zone_id room.zone_id #Add this zone_id to keep data structure consistance
-          json.current_booking booking.booking_id rescue ""
-          json.sale_id booking.sale_id rescue ""
+          json.current_booking room.get_current_booking.booking_id rescue ""
         end
       end
     end
@@ -32,25 +28,21 @@ if @zones
 else #list all tables and rooms with out zones
   json.tables @all_tables do |table|
     if table.is_active
-      booking = table.get_current_booking
       json.id table.id
       json.name table.name
       json.status table.status
       json.zone_id table.zone_id #Add this zone_id to keep data structure consistance
-      json.current_booking booking.booking_id rescue ""
-      json.sale_id booking.sale_id rescue ""
+      json.current_booking table.get_current_booking.booking_id rescue ""
     end
   end
 
   json.rooms @all_rooms do |room|
     if room.is_active
-      booking = room.get_current_booking
       json.id room.id
       json.name room.name
       json.status room.status
       json.zone_id room.zone_id #Add this zone_id to keep data structure consistance
-      json.current_booking booking.booking_id rescue ""
-      json.sale_id booking.sale_id rescue ""
+      json.current_booking room.get_current_booking.booking_id rescue ""
     end
   end
 end

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>