merge with master

2018-03-19 14:41:40 +06:30
parent 259778a891 e55ff8b5e0
commit 0c61a98150
45 changed files with 416 additions and 132 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -152,7 +152,7 @@ scope "(:locale)", locale: /en|mm/ do
    #---------Shift ---------------#
    resources :shifts, only: [:index, :new, :create, :edit]
    post 'close_shift' => 'shifts#update_shift'
-    get 'shift/close' => 'shifts#show'
+    get 'shift/:type/close' => 'shifts#show'
    get 'shift/sale_summary' => 'shifts#sale_summary'
    #shift - index (open/close shift landing page)
    #shift - show (sales summary display)
@@ -300,6 +300,7 @@ scope "(:locale)", locale: /en|mm/ do
    #menu
    resources :menus do
      #menu_categories
+      collection { post :import }
      resources :menu_categories, only: [:new, :create, :edit, :delete]
    end