remove conflict data

app/controllers/origami/addorders_controller.rb

@@ -37,9 +37,10 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
 
   def get_menu_category ()
     if (params[:id])
-      puts params[:id]
+      
       #Pull this menu
       @menu = MenuCategory.find_by_id(params[:id])
+      
       # puts @menu.menu_items[1].item_attributes.to_json
       return @menu
     else
@@ -49,7 +50,6 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
 
   def get_menu()
     if (params[:id])
-      puts params[:id]
       #Pull this menu
       @menu = Menu.find_by_id(params[:id])
       @menu_category = MenuCategory.where("menu_id='#{@menu.id}'").order("order_by asc")
@@ -61,10 +61,13 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
   end
 
   def get_menu_sub_category ()
+
     id = params[:id]
+
     if (id)
       #Pull this menu
       @sub_menu = MenuCategory.where("menu_category_id = #{id}").active
+
       # puts @menu.menu_items[1].item_attributes.to_json
       return @sub_menu
     end
@@ -153,13 +156,18 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
       end
 
       @status, @booking = @order.generate
-
-      if @status && @booking && @order.source == 'quick_service'
+      if current_user.role != "waiter" && params[:create_type] == "create_pay"
+        if @status && @booking && @order.source == 'quick_service'
         
-        @status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
-        result = {:status=> @status, :data => @sale }
+          @status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
+          result = {:status=> @status, :data => @sale }
+          render :json => result.to_json
+        end
+      else
+        result = {:status=> @status, :data => 0 }
         render :json => result.to_json
       end
+      
   end
 
   # render json for http status code