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

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 "Order Source - " + params[:order_source].to_s
-    Rails.logger.debug "Table ID - " + params[:table_id].to_s
+    # Rails.logger.debug "Table ID - " + params[:table_id].to_s
     is_extra_time = false
     extra_time = ''
 

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.update_attributes(status:"occupied")
-        table.save
+        # 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|
+    assigned =AssignedOrderItem.where("order_id = '#{ order.order_id }'").pluck(:assigned_order_item_id)
-    # update print status for order items
+    AssignedOrderItem.where({ order_id: '#{assigned}'}).update_all(print_status: true)
-      ai.print_status=true
+    # assigned_items =AssignedOrderItem.where("order_id = '#{ order.order_id }'")
-      ai.save       
-    end  
     
+    # 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|
+    # AssignedOrderItem.where("order_id = '#{ order.order_id }'").update_all(print_status: true)
-      ai.print_status=true
+    # AssignedOrderItem.where("order_id = '#{ order.order_id }'").find_each do |ai|
-      ai.save       
+    #   ai.print_status=true
-    end
+    #   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
+    sale_order = SaleOrder.new
-    self.order_id = order
+    sale_order.sale_id = sale
-    self.save
+    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")
+    # today_date = DateTime.now.strftime("%Y-%m-%d")
-    shift = ShiftSale.where("shift_started_at is not null and shift_closed_at is null").take
+    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.current_booking table.get_current_booking.booking_id rescue ""
-          json.sale_id booking.sale_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.current_booking room.get_current_booking.booking_id rescue ""
-          json.sale_id booking.sale_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.current_booking table.get_current_booking.booking_id rescue ""
-      json.sale_id booking.sale_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.current_booking room.get_current_booking.booking_id rescue ""
-      json.sale_id booking.sale_id rescue ""
     end
   end
 end