git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move customer func: from doemal

Browse Source
This commit is contained in:
phyusin
2018-05-11 13:45:04 +06:30
parent a76f9068da
commit baac2c33ea
3 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/order_reserve/order_reservation_controller.rb
View File

@@ -22,7 +22,7 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
if !check_customer.nil? if !check_customer.nil?
customer_id = check_customer.customer_id customer_id = check_customer.customer_id
else else
customer = Customer.addCustomer(params) customer = OrderReservation.addCustomer(params)
customer_id = customer.id customer_id = customer.id
end end
render :json => { :status => true, :data => { :customer_id => customer_id} } render :json => { :status => true, :data => { :customer_id => customer_id} }

22
app/models/customer.rb
View File

@@ -352,28 +352,6 @@ class Customer < ApplicationRecord
end end
#new customer for doemal
def self.addCustomer(params)
if params[:gender] == "female"
gender = "Female"
else
gender = "Male"
end
customer = Customer.new
customer.name = params[:name]
customer.email = params[:email]
customer.contact_no = params[:contact_no] ? params[:contact_no] : ''
customer.gender = gender
customer.address = params[:address] ? params[:address] : ''
customer.date_of_birth = params[: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" WALKIN = "CUS-000000000001"
TAKEAWAY = "CUS-000000000002" TAKEAWAY = "CUS-000000000002"

22
app/models/order_reservation.rb
View File

@@ -15,6 +15,28 @@ class OrderReservation < ApplicationRecord
DELIVERED = "delivered" DELIVERED = "delivered"
COMPLETED = "completed" COMPLETED = "completed"
#new customer for doemal
def self.addCustomer(params)
if params[:gender] == "female"
gender = "Female"
else
gender = "Male"
end
customer = Customer.new
customer.name = params[:name]
customer.email = params[:email]
customer.contact_no = params[:contact_no] ? params[:contact_no] : ''
customer.gender = gender
customer.address = params[:address] ? params[:address] : ''
customer.date_of_birth = params[: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
def self.addOrderReservationInfo(order_reserve) def self.addOrderReservationInfo(order_reserve)
Rails.logger.debug order_reserve.to_s Rails.logger.debug order_reserve.to_s
check_order_reservation = OrderReservation.where("transaction_ref = ?",order_reserve[:reference]) check_order_reservation = OrderReservation.where("transaction_ref = ?",order_reserve[:reference])