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

check empty for checkout time and checkout alert time

Browse Source
This commit is contained in:
phyusin
2018-01-16 14:59:47 +06:30
parent d152d62e80
commit bc2d6e07f1
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/check_in_process_controller.rb
View File

@@ -15,7 +15,7 @@ class Api::CheckInProcessController < Api::ApiController
lookup_checkout_time = Lookup.collection_of("checkout_alert_time") lookup_checkout_time = Lookup.collection_of("checkout_alert_time")
alert_time_min = 0 alert_time_min = 0
if !lookup_checkout_time.nil? if !lookup_checkout_time.empty?
now = Time.now.utc now = Time.now.utc
lookup_checkout_time.each do |checkout_time| lookup_checkout_time.each do |checkout_time|
arr_time = checkout_time[0].split("-") arr_time = checkout_time[0].split("-")

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

@@ -3,7 +3,7 @@ class Origami::CheckInProcessController < BaseOrigamiController
def check_in_process def check_in_process
lookup_checkout_time = Lookup.collection_of("checkout_time") lookup_checkout_time = Lookup.collection_of("checkout_time")
checkout_at = Time.now.utc checkout_at = Time.now.utc
if !lookup_checkout_time.nil? if !lookup_checkout_time.empty?
lookup_checkout_time.each do |checkout_time| lookup_checkout_time.each do |checkout_time|
arr_time = checkout_time[0].split("-") arr_time = checkout_time[0].split("-")
start_time = Time.parse(arr_time[0].strip).utc.strftime("%H:%M%p") start_time = Time.parse(arr_time[0].strip).utc.strftime("%H:%M%p")

4
app/models/dining_facility.rb
View File

@@ -80,7 +80,7 @@ class DiningFacility < ApplicationRecord
if booking if booking
lookup_checkout_time = Lookup.collection_of("checkout_alert_time") lookup_checkout_time = Lookup.collection_of("checkout_alert_time")
free_time_min = 0 free_time_min = 0
if !lookup_checkout_time.nil? if !lookup_checkout_time.empty?
now = Time.now.utc now = Time.now.utc
lookup_checkout_time.each do |checkout_time| lookup_checkout_time.each do |checkout_time|
arr_time = checkout_time[0].split("-") arr_time = checkout_time[0].split("-")
@@ -119,7 +119,7 @@ class DiningFacility < ApplicationRecord
if bookings if bookings
lookup_checkout_time = Lookup.collection_of("checkout_alert_time") lookup_checkout_time = Lookup.collection_of("checkout_alert_time")
free_time_min = 0 free_time_min = 0
if !lookup_checkout_time.nil? if !lookup_checkout_time.empty?
now = Time.now.utc now = Time.now.utc
lookup_checkout_time.each do |checkout_time| lookup_checkout_time.each do |checkout_time|
arr_time = checkout_time[0].split("-") arr_time = checkout_time[0].split("-")