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

fix timezone - time with local timezone to default timezone

Browse Source
This commit is contained in:
pyaephyoeaung
2022-05-19 14:20:55 +06:30
parent 7598a96e60
commit 214712fd2d
48 changed files with 294 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/transactions/bookings_controller.rb
View File

@@ -12,6 +12,8 @@ class Transactions::BookingsController < ApplicationController
@bookings = Booking.order("sale_id desc")
@bookings = Kaminari.paginate_array(@bookings).page(params[:page]).per(20)
else
from = Time.zone.parse(params[:from]).beginning_of_day
to = Time.zone.parse(params[:to]).end_of_day
booking = Booking.search(filter,from,to)
if booking.count > 0
@bookings = booking

67
app/controllers/transactions/card_sale_trans_controller.rb
View File

@@ -50,54 +50,49 @@ class Transactions::CardSaleTransController < ApplicationController
def get_date_range_from_params
period_type = params[:period_type]
period = params[:period]
from = params[:from]
to = params[:to]
day_ref = Time.now
if from.present? && to.present?
f_date = DateTime.parse(from)
t_date = DateTime.parse(to)
f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec)
t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec)
from = f_time.beginning_of_day
to = t_time.end_of_day
else
if params[:from].present? && params[:to].present?
from = Time.zone.parse(params[:from])
to = Time.zone.parse(params[:to])
else
case period.to_i
when PERIOD["today"]
from = day_ref.beginning_of_day.utc
to = day_ref.end_of_day.utc
from = Time.current
to = Time.current
when PERIOD["yesterday"]
from = (day_ref - 1.day).beginning_of_day.utc
to = (day_ref - 1.day).end_of_day.utc
from = 1.day.ago
to = 1.day.ago
when PERIOD["this_week"]
from = Time.now.beginning_of_week.utc
to = Time.now.utc
from = Time.current.beginning_of_week
to = Time.current
when PERIOD["last_week"]
from = (day_ref - 7.day).beginning_of_week.utc
to = (day_ref - 7.day).end_of_week.utc
from = 1.week.ago.beginning_of_week
to = 1.week.ago.end_of_week
when PERIOD["last_7"]
from = (day_ref - 7.day).utc
to = Time.now.utc
from = 7.day.ago
to = Time.current
when PERIOD["this_month"]
from = Time.now.beginning_of_month.utc
to = Time.now.utc
from = Time.current.beginning_of_month
to = Time.current
when PERIOD["last_month"]
from = (day_ref - 1.month).beginning_of_month.utc
to = (day_ref - 1.month).end_of_month.utc
from = 1.month.ago.beginning_of_month
to = 1.month.ago.end_of_month
when PERIOD["last_30"]
from = (day_ref - 30.day).utc
to = Time.now.utc
from = 30.day.ago
to = Time.current
when PERIOD["this_year"]
from = Time.now.beginning_of_year.utc
to = Time.now.utc
from = Time.current.beginning_of_year
to = Time.current
when PERIOD["last_year"]
from = (day_ref - 1.year).beginning_of_year.utc
to = (day_ref - 1.year).end_of_year.utc
end
from = 1.year.ago.beginning_of_year
to = 1.year.ago.end_of_year
end
end
return from, to
from = from.beginning_of_day
to = to.end_of_day
return from, to
end
end

67
app/controllers/transactions/card_settle_trans_controller.rb
View File

@@ -51,54 +51,49 @@ class Transactions::CardSettleTransController < ApplicationController
def get_date_range_from_params
period_type = params[:period_type]
period = params[:period]
from = params[:from]
to = params[:to]
day_ref = Time.now
if from.present? && to.present?
f_date = DateTime.parse(from)
t_date = DateTime.parse(to)
f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec)
t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec)
from = f_time.beginning_of_day
to = t_time.end_of_day
else
if params[:from].present? && params[:to].present?
from = Time.zone.parse(params[:from])
to = Time.zone.parse(params[:to])
else
case period.to_i
when PERIOD["today"]
from = day_ref.beginning_of_day.utc
to = day_ref.end_of_day.utc
from = Time.current
to = Time.current
when PERIOD["yesterday"]
from = (day_ref - 1.day).beginning_of_day.utc
to = (day_ref - 1.day).end_of_day.utc
from = 1.day.ago
to = 1.day.ago
when PERIOD["this_week"]
from = Time.now.beginning_of_week.utc
to = Time.now.utc
from = Time.current.beginning_of_week
to = Time.current
when PERIOD["last_week"]
from = (day_ref - 7.day).beginning_of_week.utc
to = (day_ref - 7.day).end_of_week.utc
from = 1.week.ago.beginning_of_week
to = 1.week.ago.end_of_week
when PERIOD["last_7"]
from = (day_ref - 7.day).utc
to = Time.now.utc
from = 7.day.ago
to = Time.current
when PERIOD["this_month"]
from = Time.now.beginning_of_month.utc
to = Time.now.utc
from = Time.current.beginning_of_month
to = Time.current
when PERIOD["last_month"]
from = (day_ref - 1.month).beginning_of_month.utc
to = (day_ref - 1.month).end_of_month.utc
from = 1.month.ago.beginning_of_month
to = 1.month.ago.end_of_month
when PERIOD["last_30"]
from = (day_ref - 30.day).utc
to = Time.now.utc
from = 30.day.ago
to = Time.current
when PERIOD["this_year"]
from = Time.now.beginning_of_year.utc
to = Time.now.utc
from = Time.current.beginning_of_year
to = Time.current
when PERIOD["last_year"]
from = (day_ref - 1.year).beginning_of_year.utc
to = (day_ref - 1.year).end_of_year.utc
end
from = 1.year.ago.beginning_of_year
to = 1.year.ago.end_of_year
end
end
return from, to
from = from.beginning_of_day
to = to.end_of_day
return from, to
end
end

7
app/controllers/transactions/credit_notes_controller.rb
View File

@@ -12,10 +12,13 @@ class Transactions::CreditNotesController < ApplicationController
filter = params[:filter]
customer = params[:customer]
from = params[:from]
to = params[:to]
order_source = params[:order_source]
if params[:from].present? && params[:to].present?
from = Time.zone.parse(params[:from]).beginning_of_day
to = Time.zone.parse(params[:to]).end_of_day
end
if filter.nil? && from.nil? && to.nil? && customer.nil? && order_source.nil?
order_source_query = "(select orders.source FROM orders JOIN sale_orders so ON so.order_id=orders.order_id WHERE so.sale_id=sales.sale_id GROUP BY so.sale_id)"

58
app/controllers/transactions/order_reservations_controller.rb
View File

@@ -73,54 +73,48 @@ class Transactions::OrderReservationsController < ApplicationController
def get_date_range_from_params
period_type = params[:period_type]
period = params[:period]
from = params[:from]
to = params[:to]
day_ref = Time.now
if from.present? && to.present?
f_date = DateTime.parse(from)
t_date = DateTime.parse(to)
f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec)
t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec)
from = f_time.beginning_of_day
to = t_time.end_of_day
if params[:from].present? && params[:to].present?
from = Time.zone.parse(params[:from])
to = Time.zone.parse(params[:to])
else
case period.to_i
when PERIOD["today"]
from = day_ref.beginning_of_day.utc
to = day_ref.end_of_day.utc
from = Time.current
to = Time.current
when PERIOD["yesterday"]
from = (day_ref - 1.day).beginning_of_day.utc
to = (day_ref - 1.day).end_of_day.utc
from = 1.day.ago
to = 1.day.ago
when PERIOD["this_week"]
from = Time.now.beginning_of_week.utc
to = Time.now.utc
from = Time.current.beginning_of_week
to = Time.current
when PERIOD["last_week"]
from = (day_ref - 7.day).beginning_of_week.utc
to = (day_ref - 7.day).end_of_week.utc
from = 1.week.ago.beginning_of_week
to = 1.week.ago.end_of_week
when PERIOD["last_7"]
from = (day_ref - 7.day).utc
to = Time.now.utc
from = 7.day.ago
to = Time.current
when PERIOD["this_month"]
from = Time.now.beginning_of_month.utc
to = Time.now.utc
from = Time.current.beginning_of_month
to = Time.current
when PERIOD["last_month"]
from = (day_ref - 1.month).beginning_of_month.utc
to = (day_ref - 1.month).end_of_month.utc
from = 1.month.ago.beginning_of_month
to = 1.month.ago.end_of_month
when PERIOD["last_30"]
from = (day_ref - 30.day).utc
to = Time.now.utc
from = 30.day.ago
to = Time.current
when PERIOD["this_year"]
from = Time.now.beginning_of_year.utc
to = Time.now.utc
from = Time.current.beginning_of_year
to = Time.current
when PERIOD["last_year"]
from = (day_ref - 1.year).beginning_of_year.utc
to = (day_ref - 1.year).end_of_year.utc
from = 1.year.ago.beginning_of_year
to = 1.year.ago.end_of_year
end
end
from = from.beginning_of_day
to = to.end_of_day
return from, to
end

2
app/controllers/transactions/orders_controller.rb
View File

@@ -11,6 +11,8 @@ class Transactions::OrdersController < ApplicationController
if filter.nil? && from.nil? && to.nil?
orders = Order.order("order_id desc")
else
from = Time.zone.parse(params[:from]).beginning_of_day
to = Time.zone.parse(params[:to]).end_of_day
orders = Order.search(filter,from,to)
end

84
app/controllers/transactions/sales_controller.rb
View File

@@ -181,53 +181,47 @@ class Transactions::SalesController < ApplicationController
def get_date_range_from_params
period_type = params[:period_type]
period = params[:period]
from = params[:from]
to = params[:to]
day_ref = Time.now
if from.present? && to.present?
f_date = DateTime.parse(from)
t_date = DateTime.parse(to)
f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec)
t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec)
from = f_time.beginning_of_day
to = t_time.end_of_day
else
case period.to_i
when PERIOD["today"]
from = day_ref.beginning_of_day.utc
to = day_ref.end_of_day.utc
if params[:from].present? && params[:to].present?
from = Time.zone.parse(params[:from])
to = Time.zone.parse(params[:to])
else
case period.to_i
when PERIOD["today"]
from = Time.current
to = Time.current
when PERIOD["yesterday"]
from = 1.day.ago
to = 1.day.ago
when PERIOD["this_week"]
from = Time.current.beginning_of_week
to = Time.current
when PERIOD["last_week"]
from = 1.week.ago.beginning_of_week
to = 1.week.ago.end_of_week
when PERIOD["last_7"]
from = 7.day.ago
to = Time.current
when PERIOD["this_month"]
from = Time.current.beginning_of_month
to = Time.current
when PERIOD["last_month"]
from = 1.month.ago.beginning_of_month
to = 1.month.ago.end_of_month
when PERIOD["last_30"]
from = 30.day.ago
to = Time.current
when PERIOD["this_year"]
from = Time.current.beginning_of_year
to = Time.current
when PERIOD["last_year"]
from = 1.year.ago.beginning_of_year
to = 1.year.ago.end_of_year
end
end
when PERIOD["yesterday"]
from = (day_ref - 1.day).beginning_of_day.utc
to = (day_ref - 1.day).end_of_day.utc
when PERIOD["this_week"]
from = Time.now.beginning_of_week.utc
to = Time.now.utc
when PERIOD["last_week"]
from = (day_ref - 7.day).beginning_of_week.utc
to = (day_ref - 7.day).end_of_week.utc
when PERIOD["last_7"]
from = (day_ref - 7.day).utc
to = Time.now.utc
when PERIOD["this_month"]
from = Time.now.beginning_of_month.utc
to = Time.now.utc
when PERIOD["last_month"]
from = (day_ref - 1.month).beginning_of_month.utc
to = (day_ref - 1.month).end_of_month.utc
when PERIOD["last_30"]
from = (day_ref - 30.day).utc
to = Time.now.utc
when PERIOD["this_year"]
from = Time.now.beginning_of_year.utc
to = Time.now.utc
when PERIOD["last_year"]
from = (day_ref - 1.year).beginning_of_year.utc
to = (day_ref - 1.year).end_of_year.utc
end
end
from = from.beginning_of_day
to = to.end_of_day
return from, to
end

2
app/controllers/transactions/shift_sales_controller.rb
View File

@@ -13,6 +13,8 @@ class Transactions::ShiftSalesController < ApplicationController
@shift_sales = ShiftSale.all.order("id desc")
@shift_sales = Kaminari.paginate_array(@shift_sales).page(params[:page]).per(20)
else
from = Time.zone.parse(from).beginning_of_day
to = Time.zone.parse(to).end_of_day
shift_sale = ShiftSale.search(filter,from,to)
if shift_sale.count > 0
@shift_sales = shift_sale

2
app/controllers/transactions/surveys_controller.rb
View File

@@ -8,6 +8,8 @@ class Transactions::SurveysController < ApplicationController
if filter.nil? && from.nil? && to.nil?
@surveys = Survey.all
else
from = Time.zone.parse(params[:from]).beginning_of_day
to = Time.zone.parse(params[:to]).end_of_day
@surveys = Survey.search(filter,from,to)
end