Merge branch 'doemal_ordering'

app/controllers/origami/addorders_controller.rb

@@ -111,7 +111,8 @@ class Origami::AddordersController < BaseOrigamiController
        end
        items_arr.push(items)
      }
-
+puts items_arr.to_json
+    puts "sssssssssssssssssssssss"
     # begin
     # if params[:order_source] == "quick_service"
     #   customer_id = "CUS-000000000002" # for no customer id from mobile

app/controllers/origami/order_reservation_controller.rb

@@ -1,12 +1,40 @@
 class Origami::OrderReservationController < BaseOrigamiController
 
   def index
-    @webview = check_mobile
-    @shop     = Shop::ShopDetail
+  	@order = OrderReservation.all
+  end
 
+  def update
+  	@id     = params[:order_id]
+  	@status = params[:status]
+  	@order  = OrderReservation.find(@id)
+
+  	status = true
+
+  	if status
+  		if @status == "processed"
+  			OrderReservation.create_doemal_order(@order)
+  		else
+  			if @status == "cancel"
+  			    result = {:status=> true, :message => "cancelled" }
+	  		else
+	  			result = {:status=> true, :message => "accepted" }
+	  		end
+	        render :json => result.to_json
+  		end
+  		
+    else
+    	result = {:status=> false, :message => "Order not accepted !" }
+        render :json => result.to_json
+  	end
+  end
+
+  def get_order
+    if (params[:id])
+      @order = OrderReservation.find(params[:id])
+      return @order
+    end
   end
 
 
-
-
 end