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-09-06 18:32:45 +06:30
parent a9d31935a1 2e53b72574
commit a50becb365
50 changed files with 1761 additions and 986 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
config/routes.rb
View File

@@ -88,14 +88,14 @@ Rails.application.routes.draw do
post 'item_void_cancel' => "sale_edit#item_void_cancel"
post 'cancel_all_void' => 'sale_edit#cancel_all_void'
post 'apply_void' => 'sale_edit#apply_void'
# in_juties
get '/table/:table_id/assign_in_juty' => 'in_juties#assign_in_juty', as: 'assign_in_juty'
get 'assign_in_juty/:table_id' => 'in_juties#index_in_juty', as: 'index_in_juty'
post 'assign_in_juty/:table_id' => 'in_juties#create_for_in_juty'
# in_duties
get '/table/:table_id/assign_in_duty' => 'in_duties#assign_in_duty', as: 'assign_in_duty'
get 'assign_in_duty/:table_id' => 'in_duties#index_in_duty', as: 'index_in_duty'
post 'assign_in_duty/:table_id' => 'in_duties#create_for_in_duty'
get 'assign_in_juty/table/:table_id/in_juty/:id/edit' => 'in_juties#edit_in_juty' ,as: 'edit_in_juty'
patch 'edit_in_juty/:id' => 'in_juties#update_for_in_juty', as: 'update_for_in_juty'
delete 'table/:table_id/destroy_in_juty/:id' => 'in_juties#destroy_in_juty', as: 'destroy_in_juty'
get 'assign_in_duty/table/:table_id/in_duty/:id/edit' => 'in_duties#edit_in_duty' ,as: 'edit_in_duty'
patch 'edit_in_duty/:id' => 'in_duties#update_for_in_duty', as: 'update_for_in_duty'
delete 'table/:table_id/destroy_in_duty/:id' => 'in_duties#destroy_in_duty', as: 'destroy_in_duty'
get 'table/:dining_id/movetable' => "movetable#move_dining"
get 'table/:dining_id/moveroom' => "moveroom#move_dining"
@@ -184,7 +184,8 @@ Rails.application.routes.draw do
resources :commissions
resources :commissioners
resources :in_juties
resources :addorders
resources :in_duties
# product_commission
get 'table/:table_id/sale/:sale_id/load_commissioners' => 'product_commissions#load_commissioners', as: 'load_commissioners'
@@ -305,6 +306,7 @@ Rails.application.routes.draw do
resources :promotion_products
end
get '/find_item_instance' => 'promotions#find_item_instance', as:'find_item_instance'
get '/find_parent_item' => 'promotions#find_parent_item', as:'find_parent_item'
# commission
resources :commissions
@@ -335,6 +337,7 @@ Rails.application.routes.draw do
resources :credit_payment, :only => [:index, :show]
resources :void_sale, :only => [:index, :show]
resources :commission, :only => [:index, :show]
resources :stock_check, :only => [:index, :show]
get "receipt_no/get_shift_by_date", to: "receipt_no#get_shift_by_date", as: "get_shift_by_date"
end