change order reservation

app/controllers/api/order_reserve/order_reservation_controller.rb

@@ -6,23 +6,27 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 
 	def check_customer
 		customer_id  = 0
+		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!" }
-		end
-
-		check_customer = Customer.find_by_email_and_membership_id(params[:email],params[:membership_id])
-		if !check_customer.nil?
-		  customer_id = check_customer.customer_id
 		else
-		  customer = Customer.addCustomer(params)
-		  customer_id = customer.id
+			status = true
 		end
 
-		render :json => { :status => true, :data => { :customer_id => customer_id} }
+		if status
+			check_customer = Customer.find_by_email_and_membership_id(params[:email],params[:membership_id])
+			if !check_customer.nil?
+			  customer_id = check_customer.customer_id
+			else
+			  customer = Customer.addCustomer(params)
+			  customer_id = customer.id
+			end
+			render :json => { :status => true, :data => { :customer_id => customer_id} }
+		end
 	end
 
 	def create

app/controllers/origami/order_reservation_controller.rb

@@ -8,7 +8,9 @@ class Origami::OrderReservationController < BaseOrigamiController
   def update
   	@id     = params[:order_id]
     @status = params[:status]
-  	expected_waiting_time = params[:expected_time]
+    expected_waiting_time = params[:expected_time]
+    remark = params[:remark]
+  	access_code = params[:access_code]
   	@order_reservation  = OrderReservation.find(@id)
 
   	status = true
@@ -23,8 +25,8 @@ class Origami::OrderReservationController < BaseOrigamiController
       elsif @status == "completed"
         result = OrderReservation.update_doemal_payment(@order_reservation,current_user)
       else
-  			if @status == "cancel"
-          OrderReservation.update_order_reservation(@id, nil, "cancelled")
+  			if @status == "rejected"
+          OrderReservation.update_order_reservation(@id, nil, "rejected",nil,remark,access_code,current_user)
   			  result = {:status=> true, :message => "rejected" }
 	  		else
           OrderReservation.update_order_reservation(@id, nil, "accepted", expected_waiting_time)
@@ -46,13 +48,7 @@ class Origami::OrderReservationController < BaseOrigamiController
   end
 
   def send_status
-    if params[:status] == "cancel"
-      status = "rejected"
-    else
-      status = params[:status]
-    end
-
-    response = OrderReservation.send_status_to_ordering(params[:url],params[:ref_no],status,params[:waiting_time])
+    response = OrderReservation.send_status_to_ordering(params[:url],params[:ref_no],params[:status],params[:waiting_time],params[:min_type],params[:reason])
 
     render :json => response
   end

app/controllers/settings/menus_controller.rb

@@ -195,7 +195,9 @@ class Settings::MenusController < ApplicationController
       # end
     end
 
-    file_path = "public/menus/" + menu.name + ".xlsx"
+    directory_name = "public/menus"
+    Dir.mkdir(directory_name) unless File.exists?(directory_name)
+    file_path = directory_name +"/" + menu.name + ".xlsx"
     p.serialize(file_path)
     render :json => { status: true, path: file_path }
   end