pulled master at 4

This commit is contained in:
Yan
2017-06-04 18:29:58 +06:30
71 changed files with 590 additions and 161 deletions

View File

@@ -13,6 +13,6 @@ module SXRestaurants
# -- all .rb files in that directory are automatically loaded.
config.active_record.time_zone_aware_types = [:datetime, :time]
config.active_job.queue_adapter = :sidekiq
end
end

View File

@@ -121,12 +121,15 @@ Rails.application.routes.draw do
resources :menu_categories do
#menu_items
#resources :menu_items
# resources :menu_items
resources :simple_menu_items
resources :set_menu_items
end
resources :menu_items do
resources :simple_menu_items do
resources :menu_item_instances
end
resources :set_menu_items do
resources :menu_item_instances
end
#menu_item_attributes