diff --git a/app/models/sale.rb b/app/models/sale.rb index c7c06cc2..550ab4c1 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -747,13 +747,13 @@ class Sale < ApplicationRecord if filter.blank? keyword = '' else - keyword = "and receipt_no LIKE ? OR cashier_name LIKE ? OR sale_status ='#{filter}'","%#{filter}%","%#{filter}%" + keyword = "and sales.receipt_no LIKE ? OR sales.cashier_name LIKE ? OR sales.sale_status ='#{filter}'","%#{filter}%","%#{filter}%" end if customer.blank? custo = '' else - custo = "and customer_id = '#{customer}'" + custo = "and sales.customer_id = '#{customer}'" end if order_source.blank?