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-09 14:55:43 +06:30
parent c580cc731a
commit 944f7a7259
52 changed files with 238 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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(req_date,'%Y-%m-%d') >= ?" + " AND DATE_FORMAT(req_date,'%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(req_date,'%Y-%m-%d') >= ? and DATE_FORMAT(req_date,'%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)
@@ -63,8 +63,8 @@ class CardSaleTran < ApplicationRecord
end
def self.get_by_shift_sale_by_card(from,to,status)
query = ShiftSale.select("shift_sales.id ,shift_started_at AS opening_date,
shift_closed_at As closing_date,")
query = ShiftSale.select("shift_sales.id ,shift_started_at,
shift_closed_at,")
.order("shift_sales.id DESC")
return query = query.where("shift_sales.shift_started_at >= ?" , from)
end