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

2017-08-30 18:22:42 +06:30
parent bf9f0cdbe7 5a0ca4b39d
commit 2f0a7c11ad
44 changed files with 1046 additions and 583 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -335,9 +335,12 @@ Rails.application.routes.draw do
  # ----------- Inventory ---------------------------

  namespace :inventory do
-    get 'inventory' => 'inventory#index'
-    resources :stock_check_items
-    resources :stock_checks
+    get '/' => 'inventory#index'
+    get '/stock_checks' => 'stock_checks#index'
+    post 'save_stock' => 'stock_checks#create', as:'stock_check_save'
+    get '/stock_checks/:id' => 'stock_checks#show'
+    post 'save_to_journal' => 'stock_checks#save_to_journal', as: 'save_to_journal'
+    # resources :stock_checks
    resources :stock_journals
    resources :inventory_definitions
  end