Pull from master

2018-04-02 18:10:47 +06:30
parent c53276f21c
commit 650eb53f51
19 changed files with 351 additions and 163 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -310,8 +310,10 @@ scope "(:locale)", locale: /en|mm/ do
      collection do
        post :import
      end
-      resources :menu_categories, only: [:new, :create, :edit, :delete]
-    end
+      resources :menu_categories, only: [:new, :create, :edit, :delete]      
+    end    
+
+    get '/menus/:id/export' => 'menus#export'

    resources :item_sets