Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant

app/controllers/api/restaurant/menu_item_attributes_controller.rb

@@ -1,9 +1,12 @@
 class Api::Restaurant::MenuItemAttributesController < Api::ApiController
-
+	skip_before_action  :authenticate
   #Description
   # Pull the default menu details and also other available (active) menus
   # Input Params - order_id
   def index
     @menu_attributes = MenuItemAttribute.all
   end
+   def show
+    @attribute = MenuItemAttribute.find(params[:id])
+  end
 end

app/controllers/origami/addorders_controller.rb

@@ -30,10 +30,19 @@ class Origami::AddordersController < BaseOrigamiController
     else
       @booking = nil
     end
-
-
   end
 
+  def get_menu_category ()
+    if (params[:id])
+      #Pull this menu
+      @menu = MenuCategory.find_by_id(params[:id])
+      return @menu
+    else
+      MenuCategory.current_menu
+    end
+  end
+  
+
   def create
     Rails.logger.debug "Order Source - " + params[:order_source].to_s
     Rails.logger.debug "Table ID - " + params[:table_id].to_s