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

total account discount for close shift sale

Browse Source
This commit is contained in:
phyusin
2017-12-01 15:15:58 +06:30
parent c5958f1599
commit 24284b4361
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/shift_sale.rb
View File

@@ -121,7 +121,7 @@ class ShiftSale < ApplicationRecord
"JOIN accounts acc ON acc.id = i.account_id" + "JOIN accounts acc ON acc.id = i.account_id" +
" JOIN shift_sales sh ON sh.`id` = sales.shift_sale_id") " JOIN shift_sales sh ON sh.`id` = sales.shift_sale_id")
if type == 'discount' if type == 'discount'
query = query.where("sales.shift_sale_id =? and sale_status = 'completed' and i.is_taxable = false and i.remark = 'Discount'", shift.id) query = query.where("sales.shift_sale_id =? and sale_status = 'completed' and i.remark = 'Discount'", shift.id)
.group("acc.title").order("acc.id") .group("acc.title").order("acc.id")
else else
query = query.where("sales.shift_sale_id =? and sale_status = 'completed'", shift.id) query = query.where("sales.shift_sale_id =? and sale_status = 'completed'", shift.id)