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

change query for credit payment report

Browse Source
This commit is contained in:
phyusin
2018-09-19 10:40:45 +06:30
parent 7256469c4a
commit e7ef645200
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/sale.rb
View File

@@ -1219,7 +1219,6 @@ def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to,filter,
sub_query2 = "SELECT (CASE WHEN shift_closed_at IS NOT NULL AND credit_payment > 0
THEN CONCAT(DATE_FORMAT(CONVERT_TZ(shift_started_at,'+00:00','+06:30'),'%d %b %y %h:%i%p'),' - ',DATE_FORMAT(CONVERT_TZ(shift_closed_at,'+00:00','+06:30'),'%d %b %y %h:%i%p'))
WHEN shift_started_at IS NOT NULL AND shift_closed_at IS NULL AND credit_payment > 0 THEN DATE_FORMAT(CONVERT_TZ(shift_started_at,'+00:00','+06:30'),'%d %b %y %h:%i%p')
ELSE '-' END)
FROM shift_sales
WHERE shift_sales.id = s.shift_sale_id"