shop code

app/models/sale.rb

@@ -140,8 +140,8 @@ class Sale < ApplicationRecord
     order = Order.find(order_id)
 
     # current cashier login
-    open_cashier = Employee.where("shop_code='#{order.shop_code}' and role = 'cashier' AND token_session <> ''")
-    current_shift = ShiftSale.current_shift(order.shop_code)
+    open_cashier = Employee.where("role = 'cashier' AND token_session <> ''")
+    current_shift = ShiftSale.current_shift
     # shift with terminal zone
 
     # set cashier
@@ -238,7 +238,7 @@ class Sale < ApplicationRecord
 
   #fOR Quick Service pay and create
   def self.request_bill(order,current_user,current_login_employee)
-    if !ShiftSale.current_shift(order.shop_code).nil?
+    if !ShiftSale.current_shift.nil?
       order_id = order.order_id # order_id
       bk_order = BookingOrder.find_by_order_id(order_id)
       check_booking = Booking.find_by_booking_id(bk_order.booking_id)
@@ -2067,7 +2067,7 @@ end
     query = query.joins("join sale_orders as sale_orders on sale_orders.sale_id = sales.sale_id")
                  .joins("join orders as orders on orders.order_id = sale_orders.order_id")
     query = query.where("sales.sale_status != 'new' AND orders.status = 'billed' #{type}")
-    query = query.where("DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? ",DateTime.now.strftime('%Y-%m-%d'))
+    query = query.receipt_date_between(Time.now.beginning_of_day, Time.now.end_of_day)
                   .group("sales.sale_id")
   end