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)

6
app/models/card_settle_tran.rb
View File

@@ -25,7 +25,7 @@ class CardSettleTran < ApplicationRecord
query = CardSettleTran.joins("Join shift_sales ss ON ss.id = card_settle_trans.shift_sale_id"+
" JOIN employees e ON e.id = ss.employee_id")
cardSettle = 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') <= ?",from,to)
cardSettle = 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') <= ?",from,to)
query1 = cardSettle.where(keyword)
query2 = query1.where(payment)
query3 = query2.where(status)
@@ -45,14 +45,14 @@ class CardSettleTran < ApplicationRecord
query = CardSettleTran.joins("Join shift_sales ss ON ss.id = card_settle_trans.shift_sale_id"+
" JOIN employees e ON e.id = ss.employee_id")
cardSettle = 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)
cardSettle = 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 = cardSettle.where("ss.id in (?)", shift.to_a)
elsif shift_sale_range.present?
query1 = cardSettle.where("ss.id in (?)",shift_sale_range.to_a)
else
query1 = cardSettle.where("DATE_FORMAT(CONVERT_TZ(req_date,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') between ? and ?",from,to)
query1 = cardSettle.where("DATE_FORMAT(CONVERT_TZ(req_date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') between ? and ?",from,to)
end
query2 = query1.where(payment)

2
app/models/customer.rb
View File

@@ -389,7 +389,7 @@ class Customer < ApplicationRecord
def self.search(search)
if search
# find(:all, :conditions => ['name LIKE ? OR contact_no LIKE ?', "%#{search}%", "%#{search}%"])
where("name LIKE ? OR customer_type LIKE ? OR contact_no LIKE ? OR card_no LIKE ? OR DATE_FORMAT(CONVERT_TZ(date_of_birth,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') LIKE ? OR nrc_no LIKE ? OR gender LIKE ? OR paypar_account_no ='#{search}'", "%#{search}%", "%#{search}%", "%#{search}%", "%#{search}%", "%#{search}%", "%#{search}%", "%#{search}%")
where("name LIKE ? OR customer_type LIKE ? OR contact_no LIKE ? OR card_no LIKE ? OR DATE_FORMAT(CONVERT_TZ(date_of_birth, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') LIKE ? OR nrc_no LIKE ? OR gender LIKE ? OR paypar_account_no ='#{search}'", "%#{search}%", "%#{search}%", "%#{search}%", "%#{search}%", "%#{search}%", "%#{search}%", "%#{search}%")
else
find(:all)
end

2
app/models/dining_queue.rb
View File

@@ -2,7 +2,7 @@ class DiningQueue < ApplicationRecord
belongs_to :dining_facility, :optional => true
def self.generate_queue_no
today = Time.current.strftime('%Y-%m-%d')
dining_queues = DiningQueue.where("DATE_FORMAT(CONVERT_TZ(created_at,'+00:00', Time.zone.formatted_offset),'%Y-%m-%d') = ? ", today).order("queue_no desc")
dining_queues = DiningQueue.where("DATE_FORMAT(CONVERT_TZ(created_at, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') = ? ", today).order("queue_no desc")
queue_no = dining_queues.count + 1
return queue_no
end

2
app/models/promotion.rb
View File

@@ -31,7 +31,7 @@ class Promotion < ApplicationRecord
end
def self.is_between_promo_datetime(current_day,current_time) #database is not local time
promoList = Promotion.where("(Date_Format(CONVERT_TZ(promo_start_date, '+00:00', Time.zone.formatted_offset), '%Y-%m-%d') <=? AND Date_Format(CONVERT_TZ(promo_start_date, '+00:00', Time.zone.formatted_offset), '%Y-%m-%d') >=?) AND (promo_start_hour < ? AND promo_end_hour > ?)", current_day, current_day, current_time, current_time)
promoList = Promotion.where("(Date_Format(CONVERT_TZ(promo_start_date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') <=? AND Date_Format(CONVERT_TZ(promo_start_date, '+00:00', '<%= Time.zone.formatted_offset %>'), '%Y-%m-%d') >=?) AND (promo_start_hour < ? AND promo_end_hour > ?)", current_day, current_day, current_time, current_time)
return promoList
end