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

fix timezone

Browse Source
This commit is contained in:
Thein Lin Kyaw
2023-02-10 14:50:30 +06:30
parent 944f7a7259
commit 5d9281e196
18 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/card_sale_tran.rb
View File

@@ -23,7 +23,7 @@ class CardSaleTran < ApplicationRecord
if from.present? && to.present?
# cardSale = CardSaleTran.where("DATE_FORMAT(CONVERT_TZ(req_date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') >= ?" + " AND DATE_FORMAT(CONVERT_TZ(req_date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') <= ? and status IS NULL ", from,to)
# cardSale = CardSaleTran.where("DATE_FORMAT(CONVERT_TZ(req_date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') >= ?" + " AND DATE_FORMAT(CONVERT_TZ(req_date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') <= ? and status IS NULL ", from,to)
from_date = from.strftime("%Y-%m-%d")
to_date = to.strftime("%Y-%m-%d")
query = CardSaleTran.joins("Join sales s ON s.sale_id = card_sale_trans.sale_id"+
@@ -48,7 +48,7 @@ class CardSaleTran < ApplicationRecord
query = CardSaleTran.joins("Join sales s ON s.sale_id = card_sale_trans.sale_id"+
" JOIN customers c ON c.customer_id = s.customer_id")
cardSale = query.where("DATE_FORMAT(CONVERT_TZ(req_date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') >= ? and DATE_FORMAT(CONVERT_TZ(req_date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') <= ? and status = 'Approved'",from,to)
cardSale = query.where("DATE_FORMAT(CONVERT_TZ(req_date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') >= ? and DATE_FORMAT(CONVERT_TZ(req_date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') <= ? and status = 'Approved'",from,to)
if shift.present?
query1 = cardSale.where("s.shift_sale_id in (?)", shift.to_a)