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

app/controllers/api/order_reserve/order_reservation_controller.rb

@@ -5,14 +5,10 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
   	ORDER_RESERVATION = "order_and_reservation"
 
 	def check_customer
-		customer_id  = 0
+		customer_id  = nil
 		status = false
-		if !params[:name]
+		if !params[:name] || !params[:email] || !params[:membership_id]
-			render :json => { :status => false, :message => "name is required!" }
+			render :json => { :status => false, :message => "name, email and membership_id are required!" }
-		elsif !params[:email]
-			render :json => { :status => false, :message => "email is required!" }
-		elsif !params[:membership_id]
-			render :json => { :status => false, :message => "membership_id is required!" }
 		else
 			status = true
 		end
@@ -25,7 +21,11 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 			  customer = OrderReservation.addCustomer(params)
 			  customer_id = customer.id
 			end
-			render :json => { :status => true, :data => { :customer_id => customer_id} }
+			if !customer_id.nil? 
+				render :json => { :status => false, :message => "email and customer are already existed!"  }
+			else
+				render :json => { :status => true, :data => { :customer_id => customer_id} }
+			end
 		end
 	end