Pull from master

This commit is contained in:
San Wai Lwin
2018-06-07 11:05:19 +06:30
parent fb0e832ea6
commit a5c59640d6
15 changed files with 484 additions and 298 deletions

View File

@@ -14,14 +14,20 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
end
if status
check_customer = Customer.find_by_email_and_membership_id_and_customer_type(params[:email],params[:membership_id],'Doemal')
if !check_customer.nil?
customer_id = check_customer.customer_id
if params[:customer_id] && !params[:customer_id].nil?
customer = OrderReservation.addCustomer(params)
customer_id = customer.customer_id
else
customer = OrderReservation.addCustomer(params)
customer_id = customer.id
check_customer = Customer.find_by_email_and_membership_id_and_customer_type(params[:email],params[:membership_id],'Doemal')
if !check_customer.nil?
customer_id = check_customer.customer_id
else
customer = OrderReservation.addCustomer(params)
customer_id = customer.customer_id
end
end
if !customer_id.nil?
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} }