merge with r-19

app/controllers/api/restaurant/menu_controller.rb

@@ -8,8 +8,8 @@ class Api::Restaurant::MenuController < Api::ApiController
     param_checksum = params[:checksum]
     # checksum = File.readlines("public/checksums/menu_json.txt").pop.chomp
 
-    shop_code = params[:shop_code]
-    all_menu = Menu.where('shop_code=?',shop_code).active.all
+    all_menu = Menu.includes(:menu_categories => [:children, :menu_items => [:menu_item_instances => :menu_instance_item_sets, :item_sets => :menu_item_instances]]).active.all
+
     @request_url = ''
     if ENV["SERVER_MODE"] == "cloud"
       @request_url = request.base_url
@@ -17,10 +17,7 @@ class Api::Restaurant::MenuController < Api::ApiController
     # to hash
     menu_array = []
     all_menu.each do |m|
-      menu_array.push(m.to_json(:include => {:menu_categories =>
-                              { :include => { :menu_items =>
-                              { :include => [:menu_item_sets, :menu_item_instances =>
-                              { :include => :menu_instance_item_sets}]} } }}))
+      menu_array.push(m.to_json(:include => { :menu_categories => { :include => { :menu_items => { :include => [ :item_sets, :menu_item_instances => { :include => :menu_instance_item_sets } ] } } } } ))
     end
 
     #export Checksum file generate by md5
@@ -29,6 +26,10 @@ class Api::Restaurant::MenuController < Api::ApiController
     if menu_checksum != param_checksum
       response.headers['CHECKSUM'] = menu_checksum
       @menus = all_menu
+      @item_attributes = MenuItemAttribute.all.load
+      @item_options = MenuItemOption.all.load
+    else
+      render :json => nil
     end
     # @current_menu = Menu.current_menu
   end