Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

app/controllers/api/check_in_process_controller.rb

@@ -49,7 +49,7 @@ class Api::CheckInProcessController < Api::ApiController
 						arr_time = checkout_time[0].split("-")
 						start_time = Time.parse(arr_time[0].strip).utc.getlocal.strftime("%H:%M%p")
 						end_time = Time.parse(arr_time[1].strip).utc.getlocal.strftime("%H:%M%p")
-						if start_time <= checkout_at.strftime("%H:%M%p") && checkout_at.strftime("%H:%M%p") <= end_time
+						if start_time <= today.strftime("%H:%M%p") && today.strftime("%H:%M%p") <= end_time
 							checkout_at = checkout_at + (checkout_time[1]).to_i.minutes
 						end
 					end

app/controllers/api/order_reserve/order_reservation_controller.rb

@@ -0,0 +1,52 @@
+class Api::OrderReserve::OrderReservationController < Api::ApiController
+	# skip_before_action  :authenticate
+  	ORDER = "order"
+  	RESERVATION = "reservation"
+  	ORDER_RESERVATION = "order and reservation"
+
+	def check_customer
+		customer_id  = 0
+
+		check_customer = Customer.find_by_email_and_contact_no_and_membership_id(params[:email],params[:contact_no],params[:membership_id])
+		if !check_customer.nil?
+		  customer_id = check_customer.customer_id
+		else
+		  customer = Customer.addCustomer(params)
+		  customer_id = customer.id
+		end
+
+		render :json => { :status => true, :data => { :customer_id => customer_id} }
+	end
+
+	def create
+		status = false
+		if !params[:cus_info]
+			render :json => { :status => false, :message => "cus_info is required!" }
+		elsif !params[:requested_time]
+			render :json => { :status => false, :message => "requested_time is required!" }
+		elsif !params[:order_type]
+			render :json => { :status => false, :message => "order_type is required!" }
+		elsif params[:order_type] == ORDER || params[:order_type] == ORDER_RESERVATION
+			if !params[:order_info]
+				render :json => { :status => false, :message => "order_info is required!" }
+			else
+				status = true
+			end
+		elsif !params[:payment_info]
+			render :json => { :status => false, :message => "payment_info is required!" }
+		elsif !params[:delivery_info]
+			render :json => { :status => false, :message => "delivery_info is required!" }
+		elsif params[:order_type] == RESERVATION || params[:order_type] == ORDER_RESERVATION
+			if !params[:reservation_info]
+				render :json => { :status => false, :message => "reservation_info is required!" }
+			else
+				status = true
+			end
+		end
+
+		if status == true
+			OrderReservation.addOrderReservationInfo(params)
+			render :json => { :status => true, :message => "Order reservation is successfully created!" }
+		end
+	end
+end