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

change booking model generate

Browse Source
This commit is contained in:
phyusin
2018-06-22 15:50:43 +06:30
parent 703c4de50e
commit 8ee9434032
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,13 +64,13 @@ class Api::CheckInProcessController < Api::ApiController
end end
if checkout_at.strftime("%Y-%m-%d %H:%M%p") > today.strftime("%Y-%m-%d %H:%M%p") if checkout_at.strftime("%Y-%m-%d %H:%M%p") > today.strftime("%Y-%m-%d %H:%M%p")
if dining_facility.type == "Table" # if dining_facility.type == "Table"
type = "TableBooking" # type = "TableBooking"
else # else
type = "RoomBooking" # type = "RoomBooking"
end # end
booking = Booking.create({:dining_facility_id => params[:dining_id],:type => type, 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.now.utc,:checkout_at =>checkout_at, :booking_status => "assign", :reserved_at => checkout_at, :reserved_by => current_login_employee.name })
if booking.save! if booking.save!
dining_facility.status = "occupied" dining_facility.status = "occupied"

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

@@ -17,13 +17,13 @@ class Origami::CheckInProcessController < BaseOrigamiController
if checkout_at.strftime("%Y-%m-%d %H:%M%p") > today.strftime("%Y-%m-%d %H:%M%p") if checkout_at.strftime("%Y-%m-%d %H:%M%p") > today.strftime("%Y-%m-%d %H:%M%p")
@dining_facility = DiningFacility.find(params[:dining_id]) @dining_facility = DiningFacility.find(params[:dining_id])
if @dining_facility.type == "Table" # if @dining_facility.type == "Table"
type = "TableBooking" # type = "TableBooking"
else # else
type = "RoomBooking" # type = "RoomBooking"
end # end
@booking = Booking.create({:dining_facility_id => params[:dining_id],:type => type, @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.now.utc,:checkout_at =>checkout_at, :booking_status => "assign", :reserved_at => checkout_at, :reserved_by => current_login_employee.name })
if @booking.save! if @booking.save!

2
app/models/booking.rb
View File

@@ -60,6 +60,6 @@ class Booking < ApplicationRecord
private private
def generate_custom_id def generate_custom_id
self.booking_id = SeedGenerator.generate_id("Booking", "BKI") #(self.class.name, "BKI") self.booking_id = SeedGenerator.generate_id(self.class.name, "BKI")
end end
end end