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

# Conflicts: # app/models/order_item.rb
2017-06-04 16:37:13 +06:30
parent ad44d9d0e3 db904739ac
commit eb74eb2a2d
33 changed files with 365 additions and 108 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -119,12 +119,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