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

pull from master

Browse Source
This commit is contained in:
San Wai Lwin
2018-06-01 16:43:13 +06:30
parent e0785c5cad
commit 794ff7c26f
23 changed files with 259 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,14 +5,10 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
ORDER_RESERVATION = "order_and_reservation"
def check_customer
customer_id = 0
customer_id = nil
status = false
if !params[:name]
render :json => { :status => false, :message => "name is required!" }
elsif !params[:email]
render :json => { :status => false, :message => "email is required!" }
elsif !params[:membership_id]
render :json => { :status => false, :message => "membership_id is required!" }
if !params[:name] || !params[:email] || !params[:membership_id]
render :json => { :status => false, :message => "name, email and membership_id are required!" }
else
status = true
end
@@ -25,7 +21,11 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
customer = OrderReservation.addCustomer(params)
customer_id = customer.id
end
render :json => { :status => true, :data => { :customer_id => customer_id} }
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} }
end
end
end

34
app/controllers/api/orders_controller.rb
View File

@@ -233,25 +233,23 @@ class Api::OrdersController < Api::ApiController
printer = PrintSetting.all
unique_code="OrderItemPdf"
if !order_slim_pdf.empty?
if !printer.empty?
printer.each do |printer_setting|
if printer_setting.unique_code == 'OrderItemPdf'
unique_code="OrderItemPdf"
elsif printer_setting.unique_code == 'OrderItemSlimPdf'
unique_code="OrderItemSlimPdf"
elsif printer_setting.unique_code == 'OrderSetItemPdf'
unique_code="OrderSetItemPdf"
elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf'
unique_code="OrderItemSlimCustomisePdf"
elsif printer_setting.unique_code == 'OrderItemCustomisePdf'
unique_code="OrderItemCustomisePdf"
elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf'
unique_code="OrderSetItemCustomisePdf"
end
end
if !printer.empty?
printer.each do |printer_setting|
if printer_setting.unique_code == 'OrderItemPdf'
unique_code="OrderItemPdf"
elsif printer_setting.unique_code == 'OrderItemSlimPdf'
unique_code="OrderItemSlimPdf"
elsif printer_setting.unique_code == 'OrderSetItemPdf'
unique_code="OrderSetItemPdf"
elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf'
unique_code="OrderItemSlimCustomisePdf"
elsif printer_setting.unique_code == 'OrderItemCustomisePdf'
unique_code="OrderItemCustomisePdf"
elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf'
unique_code="OrderSetItemCustomisePdf"
end
end
end
end
print_settings=PrintSetting.find_by_unique_code(unique_code)
order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)