Merge branch 'adminbsb_material_ui'

README.md

@@ -254,6 +254,9 @@ For Customer Settings On/Off
 For TaxProfiles On/Off
 	1) settings/lookups => {type:changable_tax, name:change, value: {1 or 0}}
 
+For Add Kitchen Role
+	1) settings/lookups => {type:employee_roles, name:Kitchen, value:kitchen}
+
 * ToDo list
 
 1. Migration

app/models/order_queue_station.rb

@@ -234,7 +234,7 @@ class OrderQueueStation < ApplicationRecord
     order_queue_printer.print_order_summary(print_settings, oqs,order.order_id, order_items, print_status="")
 
     assigned =AssignedOrderItem.where("order_id = '#{ order.order_id }'").pluck(:assigned_order_item_id)
-    AssignedOrderItem.where({ order_id: '#{assigned}'}).update_all(print_status: true)
+    AssignedOrderItem.where('assigned_order_item_id IN (?)', assigned).update_all(print_status: true)
     # assigned_items =AssignedOrderItem.where("order_id = '#{ order.order_id }'")
     
     # assigned_items.each do |ai|
@@ -283,6 +283,6 @@ class OrderQueueStation < ApplicationRecord
     #   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)
+    AssignedOrderItem.where('assigned_order_item_id IN (?)', assigned).update_all(print_status: true)
   end
 end

app/models/sale_payment.rb

@@ -98,7 +98,7 @@ class SalePayment < ApplicationRecord
       booking = Booking.find_by_sale_id(sale_id)
       booking.booking_orders.each do |sodr|
         assigned =AssignedOrderItem.where("order_id = '#{ sodr.order_id }'").pluck(:assigned_order_item_id)
-        AssignedOrderItem.where({ order_id: '#{assigned}'}).update_all(print_status: true)
+        AssignedOrderItem.where('assigned_order_item_id IN (?)', assigned).update_all(delivery_status: true)
         # AssignedOrderItem.where("order_id = '#{ sodr.order_id }'").find_each do |aoi|
         #   aoi.delivery_status = 1
         #   aoi.save