git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix dashboard error for cashier

Browse Source
This commit is contained in:
Thein Lin Kyaw
2019-11-18 11:16:14 +06:30
parent 8e462901ad
commit 5702819b8b
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/models/sale.rb
View File

@@ -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()