From 57be26be77aa555550a0c90b4b66cc8d0694dfe5 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 9 Apr 2018 16:59:59 +0630
Subject: [PATCH] check customer

---
 .../order_reservation_controller.rb           | 22 ++-----------------
 app/models/customer.rb                        | 17 ++++++++++++++
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/app/controllers/api/order_reservation/order_reservation_controller.rb b/app/controllers/api/order_reservation/order_reservation_controller.rb
index aa01ec39..43b9c597 100644
--- a/app/controllers/api/order_reservation/order_reservation_controller.rb
+++ b/app/controllers/api/order_reservation/order_reservation_controller.rb
@@ -2,31 +2,13 @@ class Api::OrderReservation::OrderReservationController < Api::ApiController
 	# skip_before_action  :authenticate
   
 	def check_customer
-		customer_name             = params[:name]
-		customer_email            = params[:email]
-		customer_contact_no       = params[:contact_no]
-		customer_gender           = params[:gender]
-		customer_addr             = params[:address]
-		customer_membership_id    = params[:membership_id]
-		customer_date_of_birth    = params[:date_of_birth]
 		customer_id               = 0
 
-		check_customer = Customer.find_by_email_and_contact_no_and_membership_id(customer_email,customer_contact_no,customer_membership_id)
+		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.new
-		  customer.name             = customer_name
-		  customer.email            = customer_email
-		  customer.contact_no       = customer_contact_no
-		  customer.gender           = customer_gender
-		  customer.address          = customer_addr
-		  customer.date_of_birth    = Time.parse(customer_date_of_birth).strftime("%Y-%m-%d")
-		  customer.membership_id    = customer_membership_id
-		  customer.customer_type    = "Doemal"
-          customer.tax_profiles     = ["2"]
-		  customer.save
-
+		  customer = Customer.addCustomer(params)
 		  customer_id = customer.id
 		end
 
diff --git a/app/models/customer.rb b/app/models/customer.rb
index b05caaf6..2ece4330 100755
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -352,6 +352,23 @@ class Customer < ApplicationRecord
 
   end
 
+  #new customer for doemal
+  def self.addCustomer(params)
+    customer = Customer.new
+    customer.name             = params[:name]
+    customer.email            = params[:email]
+    customer.contact_no       = params[:contact_no]
+    customer.gender           = params[:gender]
+    customer.address          = params[:address]
+    customer.date_of_birth    = Time.parse(params[:date_of_birth]).strftime("%Y-%m-%d")
+    customer.membership_id    = params[:membership_id]
+    customer.customer_type    = "Takeaway"
+    customer.tax_profiles     = ["2"]
+    customer.save
+
+    return customer
+  end
+
    WALKIN   = "CUS-000000000001"
    TAKEAWAY = "CUS-000000000002"