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

12
app/controllers/origami/bank_integration_controller.rb
View File

@@ -3,8 +3,8 @@ class Origami::BankIntegrationController < ApplicationController #BaseOrigamiCon
def settle_trans
if(params[:type] == 'request')
card_settle_trans = CardSettleTran.new()
card_settle_trans.req_date = Time.now.strftime("%Y-%m-%d")
card_settle_trans.req_time = Time.now.utc
card_settle_trans.req_date = Time.current.strftime("%Y-%m-%d")
card_settle_trans.req_time = Time.current
card_settle_trans.req_cmd = params[:data][:cmd_type]
card_settle_trans.req_type = params[:data][:payment_type]
card_settle_trans.save()
@@ -13,8 +13,8 @@ class Origami::BankIntegrationController < ApplicationController #BaseOrigamiCon
response = {status: 'success', card_settle_trans_id: card_settle_trans_id}
else
card_settle_trans = CardSettleTran.find(params[:card_settle_trans_id])
card_settle_trans.res_date = Time.now.strftime("%Y-%m-%d")
card_settle_trans.res_time = Time.now.utc
card_settle_trans.res_date = Time.current.strftime("%Y-%m-%d")
card_settle_trans.res_time = Time.current
card_settle_trans.res_cmd = params[:data][:CMD]
card_settle_trans.res_type = params[:data][:TYPE]
card_settle_trans.status = params[:data][:STATUS]
@@ -42,8 +42,8 @@ class Origami::BankIntegrationController < ApplicationController #BaseOrigamiCon
if(params[:type] == 'request')
card_sale_trans = CardSaleTran.new()
card_sale_trans.sale_id = params[:data][:sale_id]
card_sale_trans.req_date = Time.now.strftime("%Y-%m-%d")
card_sale_trans.req_time = Time.now.utc
card_sale_trans.req_date = Time.current.strftime("%Y-%m-%d")
card_sale_trans.req_time = Time.current
card_sale_trans.req_amt = params[:data][:amt]
card_sale_trans.req_inv_no = params[:data][:inv_no]
card_sale_trans.req_cmd = params[:data][:cmd_type]

10
app/controllers/origami/check_in_process_controller.rb
View File

@@ -2,14 +2,14 @@ class Origami::CheckInProcessController < BaseOrigamiController
def check_in_process
lookup_checkout_time = Lookup.collection_of("checkout_time")
today = Time.now
checkout_at = Time.now
today = Time.current
checkout_at = Time.current
if !lookup_checkout_time.empty?
lookup_checkout_time.each do |checkout_time|
arr_time = checkout_time[0].split("-")
start_time = Time.parse(arr_time[0].strip).strftime("%H:%M%p")
end_time = Time.parse(arr_time[1].strip).strftime("%H:%M%p")
start_time = Time.zone.parse(arr_time[0].strip).strftime("%H:%M%p")
end_time = Time.zone.parse(arr_time[1].strip).strftime("%H:%M%p")
if start_time <= checkout_at.strftime("%H:%M%p") && checkout_at.strftime("%H:%M%p") <= end_time
checkout_at = checkout_at + (checkout_time[1]).to_i.minutes
end
@@ -25,7 +25,7 @@ class Origami::CheckInProcessController < BaseOrigamiController
# end
@booking = Booking.create({:dining_facility_id => params[:dining_id],:type => "TableBooking",
:checkin_by=>current_login_employee.name,:checkin_at => Time.now.utc,:checkout_at =>checkout_at, :booking_status => "assign", :reserved_at => checkout_at, :reserved_by => current_login_employee.name })
:checkin_by=>current_login_employee.name,:checkin_at => Time.current,:checkout_at =>checkout_at, :booking_status => "assign", :reserved_at => checkout_at, :reserved_by => current_login_employee.name })
cashier_terminal = CashierTerminal.find_by_id(@dining_facility.zone_id)

4
app/controllers/origami/food_court_controller.rb
View File

@@ -9,7 +9,7 @@ class Origami::FoodCourtController < ApplicationController
def index
today = DateTime.now
day = Date.today.wday
day = Date.current.wday
# if params[:menu] == "true"
@menus = []
@menu = []
@@ -48,7 +48,7 @@ class Origami::FoodCourtController < ApplicationController
def modify_order
@cashier_type = "food_court"
today = DateTime.now
day = Date.today.wday
day = Date.current.wday
# if params[:menu] == "true"
@menus = []
@menu = []

2
app/controllers/origami/moveroom_controller.rb
View File

@@ -14,7 +14,7 @@ class Origami::MoveroomController < BaseOrigamiController
@status_sale = ""
@sale_array = Array.new
@dining = DiningFacility.find(params[:dining_id])
@dining_room = @dining.bookings.active.where("DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.today.prev_day}' ")
@dining_room = @dining.bookings.active.where("DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.current.prev_day}' ")
@dining_room.each do |booking|
if booking.sale_id.nil?
@order_items = Array.new

4
app/controllers/origami/movetable_controller.rb
View File

@@ -15,7 +15,7 @@ class Origami::MovetableController < BaseOrigamiController
@status_sale = ""
@sale_array = Array.new
@dining_booking = @dining.bookings.active.where("DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.today.prev_day}' ")
@dining_booking = @dining.bookings.active.where("DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.current.prev_day}' ")
@dining_booking.each do |booking|
if booking.sale_id.nil?
@@ -73,7 +73,7 @@ class Origami::MovetableController < BaseOrigamiController
# bookings = Booking.where('dining_facility_id=?',change_from)
bookings = Booking.where("((DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.today.prev_day}')) AND dining_facility_id='#{change_from}'")
bookings = Booking.where("((DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.current.prev_day}')) AND dining_facility_id='#{change_from}'")
booking_array = Array.new
order_items = Array.new

4
app/controllers/origami/quick_service_controller.rb
View File

@@ -9,7 +9,7 @@ class Origami::QuickServiceController < ApplicationController
def index
today = DateTime.now
day = Date.today.wday
day = Date.current.wday
@menus = []
@menu = []
@@ -47,7 +47,7 @@ class Origami::QuickServiceController < ApplicationController
def modify_order
@cashier_type = "quick_service"
today = DateTime.now
day = Date.today.wday
day = Date.current.wday
# if params[:menu] == "true"
@menus = []
@menu = []

4
app/controllers/origami/request_bills_controller.rb
View File

@@ -12,7 +12,7 @@ class Origami::RequestBillsController < ApplicationController
order_id = params[:id] # order_id
order = Order.find(order_id)
booking = order.booking
if booking.checkin_at.utc > Time.now.utc && booking.checkout_at.nil?
if booking.checkin_at > Time.current && booking.checkout_at.nil?
@status = false
@error_message = "Operation failed, Could not request bill!"
else
@@ -26,7 +26,7 @@ class Origami::RequestBillsController < ApplicationController
in_duties.each do |in_duty|
induty = InDuty.find(in_duty.id)
induty.sale_id = sale_data.sale_id
induty.out_time = Time.now.utc
induty.out_time = Time.current
induty.save
end
end

2
app/controllers/origami/rooms_controller.rb
View File

@@ -34,7 +34,7 @@ class Origami::RoomsController < BaseOrigamiController
@membership = MembershipSetting::MembershipSetting
@payment_methods = PaymentMethodSetting.all
@dining_room = @room.bookings.active.where("DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.today.prev_day}' ")
@dining_room = @room.bookings.active.where("DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.current.prev_day}' ")
@order_items = Array.new
@dining_room.each do |booking|
if booking.sale_id.nil? && booking.booking_status != 'moved'

2
app/controllers/origami/split_bill_controller.rb
View File

@@ -62,7 +62,7 @@ class Origami::SplitBillController < BaseOrigamiController
split_orders = []
new_order = nil
booking = Booking.create({:dining_facility_id => table.id, :type => type, :checkin_at => Time.now.utc, :checkin_by => current_user.name, :booking_status => "assign" })
booking = Booking.create({:dining_facility_id => table.id, :type => type, :checkin_at => Time.current, :checkin_by => current_user.name, :booking_status => "assign" })
if orders.present?
split_orders += orders.map { |x| x["id"] }