diff --git a/app/models/order.rb b/app/models/order.rb
index bac7cd20..a53ba3cf 100644
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -25,7 +25,7 @@ class Order < ApplicationRecord
     booking = nil
 
     if self.new_booking
-      
+
       booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking",
                                 :checkin_at => Time.now.utc, :checkin_by =>  self.employee_name,
                                 :booking_status => "assign" })
@@ -228,11 +228,11 @@ class Order < ApplicationRecord
                         bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name")
                     .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id")
                     .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id")
-                    .joins("left join orders on orders.order_id = booking_orders.order_id")                  
+                    .joins("left join orders on orders.order_id = booking_orders.order_id")
                     .joins("left join sales on sales.sale_id = bookings.sale_id")
                     .where("(orders.status = 'new' or orders.status = 'billed') and (dining_facilities.type=? and dining_facilities.is_active=?)",DiningFacility::TABLE_TYPE,true)
                     .group("bookings.booking_id")
-                    # For PG 
+                    # For PG
                     # booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true
                     # sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id
   end
@@ -247,7 +247,7 @@ class Order < ApplicationRecord
                     .joins("left join sales on sales.sale_id = bookings.sale_id")
                     .where("sales.sale_status='completed'")
                     .group("sales.sale_id")
-                    # For PG 
+                    # For PG
                     #bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id
   end
 
@@ -263,7 +263,7 @@ class Order < ApplicationRecord
                     .joins("left join sales on sales.sale_id = bookings.sale_id")
                     .where("(orders.status = 'new' or orders.status = 'billed') and (dining_facilities.type=? and dining_facilities.is_active=?)",DiningFacility::ROOM_TYPE,true)
                     .group("bookings.booking_id")
-                    # For PG 
+                    # For PG
                     # booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true
                     # sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id,orders.order_id
   end
@@ -292,7 +292,7 @@ class Order < ApplicationRecord
                     .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id")
                     .joins("left join orders on orders.order_id = booking_orders.order_id")
                     .joins("left join sales on sales.sale_id = bookings.sale_id")
-                    .where("(orders.status = 'new' or orders.status = 'billed')")                                     
+                    .where("(orders.status = 'new' or orders.status = 'billed')")
 
     # orders = Order.select("orders.order_id as order_id,sales.receipt_no,orders.status as order_status, sales.sale_status as sale_status,
     #            orders.order_id as order_id,sales.customer_id as sale_customer_id,orders.customer_id as order_customer_id
@@ -305,7 +305,7 @@ class Order < ApplicationRecord
     #       left join sales on sales.sale_id = sale_orders.sale_id")
     #       .where("(orders.status = 'new' or orders.status = 'billed')")
     #       .group("orders.order_id")
-          # For PG 
+          # For PG
           # .where("dining_facilities.is_active=? and orders.date between ? and ?",true,from,to)
           # .group("orders.order_id,order_items.order_items_id,dining_facilities.name,sales.receipt_no,bookings.booking_id,sales.sale_id,orders.customer_id")
 
@@ -314,7 +314,7 @@ class Order < ApplicationRecord
   def self.search(search)
     if search
       # find(:all, :conditions => ['name LIKE ? OR contact_no LIKE ?', "%#{search}%", "%#{search}%"])
-      where("order_id LIKE ?", "%#{search}%") 
+      where("order_id LIKE ?", "%#{search}%")
     else
       find(:all)
     end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 426ece2d..67953c14 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -13,7 +13,7 @@ class Sale < ApplicationRecord
   has_many :sale_payments
   has_many :sale_orders
   has_many :bookings
-  
+
   scope :open_invoices, -> { where("sale_status = 'new' and receipt_date BETWEEN '#{DateTime.now.utc.end_of_day}' AND '#{DateTime.now.utc.beginning_of_day}'") }
 
   def generate_invoice_from_booking(booking_id, requested_by)
@@ -57,11 +57,11 @@ class Sale < ApplicationRecord
       self.tax_type = "exclusive"
 
       # set cashier by current login
-      self.cashier_id = requested_by.id
-      self.cashier_name = requested_by.name
-      
+      # TODO: requested_by is string , can't cast to id. error occur. please fix
+      # self.cashier_id = requested_by.id
+      self.cashier_name = requested_by
+      self.requested_by = requested_by
 
-      self.requested_by = requested_by.name
       self.requested_at = DateTime.now.utc
 
       Rails.logger.debug "Order -> #{order.id} | order_status -> #{order.status}"
@@ -267,7 +267,7 @@ class Sale < ApplicationRecord
   def self.search(search)
     if search
       # find(:all, :conditions => ['name LIKE ? OR contact_no LIKE ?', "%#{search}%", "%#{search}%"])
-      where("receipt_no LIKE ?", "%#{search}%",) 
+      where("receipt_no LIKE ?", "%#{search}%",)
     else
       find(:all)
     end