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

check time

Browse Source
This commit is contained in:
phyusin
2018-04-09 16:23:16 +06:30
parent b5016edb0d
commit 4bc56a31b8
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/check_in_process_controller.rb
View File

@@ -49,7 +49,7 @@ class Api::CheckInProcessController < Api::ApiController
arr_time = checkout_time[0].split("-") arr_time = checkout_time[0].split("-")
start_time = Time.parse(arr_time[0].strip).utc.getlocal.strftime("%H:%M%p") start_time = Time.parse(arr_time[0].strip).utc.getlocal.strftime("%H:%M%p")
end_time = Time.parse(arr_time[1].strip).utc.getlocal.strftime("%H:%M%p") end_time = Time.parse(arr_time[1].strip).utc.getlocal.strftime("%H:%M%p")
if start_time <= checkout_at.strftime("%H:%M%p") && checkout_at.strftime("%H:%M%p") <= end_time if start_time <= today.strftime("%H:%M%p") && today.strftime("%H:%M%p") <= end_time
checkout_at = checkout_at + (checkout_time[1]).to_i.minutes checkout_at = checkout_at + (checkout_time[1]).to_i.minutes
end end
end end

15
app/controllers/api/order_reservation_controller.rb → app/controllers/api/order_reservation/order_reservation_controller.rb
View File

@@ -1,5 +1,5 @@
class Api::OrderReservationController < Api::ApiController class Api::OrderReservation::OrderReservationController < Api::ApiController
skip_before_action :authenticate # skip_before_action :authenticate
def check_customer def check_customer
customer_name = params[:name] customer_name = params[:name]
@@ -8,11 +8,10 @@ class Api::OrderReservationController < Api::ApiController
customer_gender = params[:gender] customer_gender = params[:gender]
customer_addr = params[:address] customer_addr = params[:address]
customer_membership_id = params[:membership_id] customer_membership_id = params[:membership_id]
customer_membership_type = params[:membership_type]
customer_date_of_birth = params[:date_of_birth] customer_date_of_birth = params[:date_of_birth]
customer_id = 0 customer_id = 0
check_customer = Customer.find_by_email_and_contact_no_and_membership_id_and_membership_type(customer_email,customer_contact_no,customer_membership_id,customer_membership_type) check_customer = Customer.find_by_email_and_contact_no_and_membership_id(customer_email,customer_contact_no,customer_membership_id)
if !check_customer.nil? if !check_customer.nil?
customer_id = check_customer.customer_id customer_id = check_customer.customer_id
else else
@@ -24,11 +23,13 @@ class Api::OrderReservationController < Api::ApiController
customer.address = customer_addr customer.address = customer_addr
customer.date_of_birth = Time.parse(customer_date_of_birth).strftime("%Y-%m-%d") customer.date_of_birth = Time.parse(customer_date_of_birth).strftime("%Y-%m-%d")
customer.membership_id = customer_membership_id customer.membership_id = customer_membership_id
customer.membership_type = customer_membership_type customer.customer_type = "Doemal"
customer.save! customer.tax_profiles = ["2"]
customer.save
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} }
end end
end end

4
app/models/customer.rb
View File

@@ -9,10 +9,10 @@ class Customer < ApplicationRecord
has_many :orders has_many :orders
has_many :sales has_many :sales
validates_presence_of :name, :contact_no, :email,:card_no validates_presence_of :name, :contact_no, :email #,:card_no
validates :contact_no, uniqueness: true, numericality: true validates :contact_no, uniqueness: true, numericality: true
validates :email, uniqueness: true,format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, on: :create } validates :email, uniqueness: true,format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, on: :create }
validates :card_no, uniqueness: true # validates :card_no, uniqueness: true
# validates :paypar_account_no, uniqueness: true # validates :paypar_account_no, uniqueness: true
paginates_per 50 paginates_per 50

0
app/views/api/order_reservation/index.json.jbuilder Normal file
View File