Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

2018-05-08 17:28:19 +06:30
parent 1716d14df3 04f05d366f
commit 313f1b2909
12 changed files with 638 additions and 251 deletions
--- a/app/controllers/api/restaurant/menu_controller.rb
+++ b/app/controllers/api/restaurant/menu_controller.rb
@@ -11,7 +11,10 @@ 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 => [:menu_item_sets, :menu_item_instances => 
+                              { :include => :menu_instance_item_sets}]} } }}))
    end            
                 
    #export Checksum file generate by md5