Merge branch 'foodcourt' of gitlab.com:code2lab/SXRestaurant into HEAD
This commit is contained in:
@@ -112,6 +112,7 @@ en:
|
||||
del: "DEL"
|
||||
clr: "CLR"
|
||||
assign: "ASSIGN"
|
||||
change_app_token: "Change App Token"
|
||||
|
||||
print_order_summary: "Print Order Summary"
|
||||
memeber_card: "Member Card"
|
||||
@@ -678,6 +679,8 @@ en:
|
||||
edit_btn_txt: "to edit "
|
||||
delete_btn_txt: "to delete "
|
||||
update_btn_txt: "to update "
|
||||
employee_app_id: "App ID"
|
||||
employee_app_token: "App Token"
|
||||
|
||||
helpers:
|
||||
page_entries_info:
|
||||
|
||||
@@ -432,7 +432,9 @@ scope "(:locale)", locale: /en|mm/ do
|
||||
resources :display_images
|
||||
end
|
||||
#employees
|
||||
resources :employees
|
||||
resources :employees
|
||||
get '/:id/change_app_token' => 'employees#change_app_token', as: 'change_app_token'
|
||||
|
||||
#menu
|
||||
resources :menus do
|
||||
collection do
|
||||
|
||||
Reference in New Issue
Block a user