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

pull from master

Browse Source
This commit is contained in:
San Wai Lwin
2018-06-18 16:14:59 +06:30
parent 25a8381681
commit 234c00f105
27 changed files with 810 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/locales/en.yml
View File

@@ -487,6 +487,9 @@ en:
order_reservation: "Order Reservation"
cooking_time: "Cooking Time"
township: "Township"
induty_report: "Induty Report"
in_time: "In Time"
out_time: "Out Time"
code_txt: "code "
charge_txt: "charge"

3
config/locales/mm.yml
View File

@@ -481,6 +481,9 @@ mm:
order_reservation: "Order Reservation"
cooking_time: "Cooking Time"
township: "Township"
induty_report: "Induty Report"
in_time: "In Time"
out_time: "Out Time"
code_txt: "ကုတ်ဒ် "
charge_txt: "ကောက်ခံသည်"

13
config/routes.rb
View File

@@ -131,13 +131,13 @@ scope "(:locale)", locale: /en|mm/ do
post 'cancel_all_void' => 'sale_edit#cancel_all_void'
post 'apply_void' => 'sale_edit#apply_void'
# 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 '/table/:sale_id/assign_in_duty' => 'in_duties#assign_in_duty', as: 'assign_in_duty'
get 'assign_in_duty/:sale_id' => 'in_duties#index_in_duty', as: 'index_in_duty'
post 'assign_in_duty/:sale_id' => 'in_duties#create_for_in_duty'
get 'assign_in_duty/table/:table_id/in_duty/:id/edit' => 'in_duties#edit_in_duty' ,as: 'edit_in_duty'
get 'assign_in_duty/table/:sale_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'
delete 'table/:table_id/:sale_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"
@@ -454,9 +454,12 @@ scope "(:locale)", locale: /en|mm/ do
resources :payment_method
resources :product_sale, :only => [:index, :show]
resources :order_reservation, :only => [:index, :show]
resources :induty, :only => [:index, :show]
get "saleitem/get_shift_by_date", to: "saleitem#show", as: "get_shift_by_sale_item"
get "receipt_no/get_shift_by_date", to: "receipt_no#get_shift_by_date", as: "get_shift_by_date"
get "order_reservation/get_shift_by_date", to: "order_reservation#show", as: "get_shift_by_order_reservation"
get "induty/get_shift_by_date", to: "induty#show", as: "get_shift_by_induty"
end