diff --git a/app/controllers/api/check_in_process_controller.rb b/app/controllers/api/check_in_process_controller.rb
index d8b4113c..cc04e280 100644
--- a/app/controllers/api/check_in_process_controller.rb
+++ b/app/controllers/api/check_in_process_controller.rb
@@ -64,13 +64,13 @@ class Api::CheckInProcessController < Api::ApiController
 					end
 
 					if checkout_at.strftime("%Y-%m-%d %H:%M%p") > today.strftime("%Y-%m-%d %H:%M%p")
-						if dining_facility.type == "Table"
-							type = "TableBooking"
-						else
-							type = "RoomBooking"
-						end
+						# if dining_facility.type == "Table"
+						# 	type = "TableBooking"
+						# else
+						# 	type = "RoomBooking"
+						# 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 })
 						if booking.save!
 							dining_facility.status = "occupied"
diff --git a/app/controllers/origami/check_in_process_controller.rb b/app/controllers/origami/check_in_process_controller.rb
index 2ef98bf4..3d6b6d14 100644
--- a/app/controllers/origami/check_in_process_controller.rb
+++ b/app/controllers/origami/check_in_process_controller.rb
@@ -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")
 				@dining_facility = DiningFacility.find(params[:dining_id])
 
-				if @dining_facility.type == "Table"
-					type = "TableBooking"
-				else
-					type = "RoomBooking"
-				end
+				# if @dining_facility.type == "Table"
+				# 	type = "TableBooking"
+				# else
+				# 	type = "RoomBooking"
+				# 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 })
 
 				if @booking.save!
diff --git a/app/models/booking.rb b/app/models/booking.rb
index 7392d74c..7e5470d0 100755
--- a/app/models/booking.rb
+++ b/app/models/booking.rb
@@ -60,6 +60,6 @@ class Booking < ApplicationRecord
 
   private
   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