implement joining table

This commit is contained in:
2012-08-30 18:32:30 +02:00
parent 6696992320
commit aa0821d0ae
15 changed files with 228 additions and 35 deletions
+8
View File
@@ -16,6 +16,10 @@ en:
the_list_has_been_closed: The %{list} has been closed
illegal_history_list_attempt: The list you want to access is not yours
table_is_occupied: The table you want to sit on is already occupied
table_is_reserved: The table you want to sit on is reserved by someone else
table_is_closed: The table you want to sit on is not available for service
supplier_is_closed: The owner of this table is currently not handling orders
join_request_rejected: Your request to join the table has been rejected
action:
index:
label: Listing %{models}
@@ -71,5 +75,9 @@ en:
show_products:
# The title gets products: Product.model_name.human_plural that can be used: e.g.: Showing %{products}
title: Menu
join_occupied_table:
title: This table is occupied
join_this_table: Join this table
show_the_products: Show me the menu
section:
first_section_title: Room
+6
View File
@@ -48,6 +48,12 @@ Qrammer::Application.routes.draw do
post '/user/order_selected_products' => 'user#order_selected_products', as: :user_order_selected_products
post '/user/move_table' => 'user#move_table', as: :user_move_table
get '/user/table_info' => 'user#table_info', as: :user_table_info
get '/user/join_occupied_table' => 'user#join_occupied_table', as: :user_join_occupied_table
post '/user/join_occupied_table' => 'user#request_to_join_occupied_table'
post '/user/reject_join_request' => 'user#reject_join_request'
post '/user/approve_join_request' => 'user#approve_join_request'
post '/user/check_table_join_status' => 'user#check_table_join_status'
match '/show_products' => 'dashboard#show_products', as: :user_products