git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge with august_spring

Browse Source
This commit is contained in:
Yan
2017-08-30 19:16:07 +06:30
parent 3e8ead6a32 883f5f575a
commit 51d8c986f1
41 changed files with 998 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/routes.rb
View File

@@ -297,6 +297,7 @@ Rails.application.routes.draw do
resources :promotions do
resources :promotion_products
end
get '/find_item_instance' => 'promotions#find_item_instance', as:'find_item_instance'
# commission
resources :commissions
@@ -340,9 +341,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