diff --git a/app/controllers/api/order_reserve/order_reservation_controller.rb b/app/controllers/api/order_reserve/order_reservation_controller.rb index 6d323f52..557b3d7a 100644 --- a/app/controllers/api/order_reserve/order_reservation_controller.rb +++ b/app/controllers/api/order_reserve/order_reservation_controller.rb @@ -14,12 +14,17 @@ 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.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.id + end end if !customer_id.nil? render :json => { :status => false, :message => "email and customer are already existed!" } diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb index 4e9235dc..dc3026aa 100644 --- a/app/models/order_reservation.rb +++ b/app/models/order_reservation.rb @@ -22,7 +22,11 @@ class OrderReservation < ApplicationRecord else gender = "Male" end - customer = Customer.new + if params[:customer_id].nil? + customer = Customer.find(params[:customer_id]) + else + customer = Customer.new + end customer.name = params[:name] customer.email = params[:email] customer.contact_no = params[:contact_no] ? params[:contact_no] : ''