diff --git a/app/controllers/api/check_in_process_controller.rb b/app/controllers/api/check_in_process_controller.rb
index 5b5268c2..edaa7596 100644
--- a/app/controllers/api/check_in_process_controller.rb
+++ b/app/controllers/api/check_in_process_controller.rb
@@ -49,9 +49,9 @@ class Api::CheckInProcessController < Api::ApiController
 				else
 					type = "RoomBooking"
 				end
-
+				
 				booking = Booking.create({:dining_facility_id => params[:dining_id],:type => type,
-		                                :checkin_at => Time.now.utc,:checkout_at =>checkout_at, :booking_status => "assign" })
+		                                :checkin_by=>get_cashier[0].name,:checkin_at => Time.now.utc,:checkout_at =>checkout_at, :booking_status => "assign" })
 				booking.save!
 
 				render :json => { :status => true, :checkout_at => booking.checkout_at.utc.strftime("%Y-%m-%d %H:%M") }
diff --git a/app/controllers/origami/check_in_process_controller.rb b/app/controllers/origami/check_in_process_controller.rb
index 8e9a1f38..eab59f5e 100644
--- a/app/controllers/origami/check_in_process_controller.rb
+++ b/app/controllers/origami/check_in_process_controller.rb
@@ -25,9 +25,9 @@ class Origami::CheckInProcessController < BaseOrigamiController
 		else
 			type = "RoomBooking"
 		end
-
+		
 		@booking = Booking.create({:dining_facility_id => params[:dining_id],:type => type,
-                                :checkin_at => Time.now.utc,:checkout_at =>checkout_at, :booking_status => "assign" })
+                                :checkin_by=>current_login_employee.name,:checkin_at => Time.now.utc,:checkout_at =>checkout_at, :booking_status => "assign" })
 		@booking.save!
 
 		respond = {:status => 'ok'}
diff --git a/app/models/dining_facility.rb b/app/models/dining_facility.rb
index 7b67b4af..53a08e61 100755
--- a/app/models/dining_facility.rb
+++ b/app/models/dining_facility.rb
@@ -67,7 +67,7 @@ class DiningFacility < ApplicationRecord
   end
 
   def get_current_checkout_booking
-    booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and checkin_at between '#{DateTime.now.utc - 5.hours}' and '#{DateTime.now.utc}' and checkin_by is null").limit(1)
+    booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and checkin_at between '#{DateTime.now.utc - 5.hours}' and '#{DateTime.now.utc}'").limit(1)
     if booking.count > 0 then
       return booking[0]
     else
@@ -85,8 +85,7 @@ class DiningFacility < ApplicationRecord
       checkout_at_hr = (checkout_at.utc.strftime("%H").to_i).to_int
       checkout_at_min = (checkout_at.utc.strftime("%M").to_i).to_int
       checkout_at_min -= min
-
-      if checkout_at_min <= 15
+      if (checkout_at_hr <= hr) && (checkout_at_min <= 15)
         return booking
       end
     end