diff --git a/app/models/sale.rb b/app/models/sale.rb index 8e7f0b92..fe43ea69 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -1690,7 +1690,7 @@ end end if current_user.present? && !(current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' || current_user.role == 'supervisor') if shift = ShiftSale.current_open_shift(current_user.id) - query = query.joins("sales.shift_sale_id = ?", shift.id) + query = query.where("sales.shift_sale_id = ?", shift.id) end end query = query.first() @@ -1710,7 +1710,7 @@ end end if current_user.present? && !(current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' || current_user.role == 'supervisor') if shift = ShiftSale.current_open_shift(current_user.id) - query = query.joins("sales.shift_sale_id = ?", shift.id) + query = query.where("sales.shift_sale_id = ?", shift.id) end end return query @@ -1784,7 +1784,7 @@ end end if current_user.present? && !(current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' || current_user.role == 'supervisor') if shift = ShiftSale.current_open_shift(current_user.id) - query = query.joins("sales.shift_sale_id = ?", shift.id) + query = query.where("sales.shift_sale_id = ?", shift.id) end end query = query.first() @@ -1804,7 +1804,7 @@ end end if current_user.present? && !(current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' || current_user.role == 'supervisor') if shift = ShiftSale.current_open_shift(current_user.id) - query = query.joins("sales.shift_sale_id = ?", shift.id) + query = query.where("sales.shift_sale_id = ?", shift.id) end end query = query.first() @@ -1893,7 +1893,7 @@ end end if current_user.present? && !(current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' || current_user.role == 'supervisor') if shift = ShiftSale.current_open_shift(current_user.id) - query = query.joins("sales.shift_sale_id = ?", shift.id) + query = query.where("sales.shift_sale_id = ?", shift.id) end end return query @@ -1913,7 +1913,7 @@ end end if current_user.present? && !(current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' || current_user.role == 'supervisor') if shift = ShiftSale.current_open_shift(current_user.id) - query = query.joins("sales.shift_sale_id = ?", shift.id) + query = query.where("sales.shift_sale_id = ?", shift.id) end end query = query.first @@ -1933,7 +1933,7 @@ end end if current_user.present? && !(current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' || current_user.role == 'supervisor') if shift = ShiftSale.current_open_shift(current_user.id) - query = query.joins("sales.shift_sale_id = ?", shift.id) + query = query.where("sales.shift_sale_id = ?", shift.id) end end query = query.group("a.product_code") @@ -1954,7 +1954,7 @@ end end if current_user.present? && !(current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' || current_user.role == 'supervisor') if shift = ShiftSale.current_open_shift(current_user.id) - query = query.joins("sales.shift_sale_id = ?", shift.id) + query = query.where("sales.shift_sale_id = ?", shift.id) end end query = query.count()