updates for qr handling

This commit is contained in:
2012-08-27 15:46:18 +02:00
parent c087aa0267
commit 157b2406a0
14 changed files with 79 additions and 36 deletions
+1 -1
View File
@@ -11,11 +11,11 @@ en:
errors:
title: There are problems found during saving (%{count})
messages:
cannot_order_without_list_id: You cannot place an order without specifying a list
cannot_order_on_non_active_list: You cannot place an order on a closed list
order_is_placed: Your order has been received in good order
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
action:
index:
label: Listing %{models}
+3 -1
View File
@@ -18,9 +18,10 @@ Qrammer::Application.routes.draw do
resources :products
resources :product_categories
get '/supplier' => 'supplier#active_orders', as: :supplier_root
get '/supplier' => 'supplier#home', as: :supplier_root
get '/supplier/active_orders' => 'supplier#active_orders', as: :supplier_active_orders
get '/supplier/active_lists' => 'supplier#active_lists', as: :supplier_active_lists
get 'supplier/lists/:list_id' => 'supplier#show_list', as: :supplier_show_list
post '/supplier/close_list' => 'supplier#close_list', as: :supplier_close_list
post '/supplier/mark_list_as_helped' => 'supplier#mark_list_as_helped', as: :supplier_mark_list_as_helped
@@ -38,6 +39,7 @@ Qrammer::Application.routes.draw do
match '/user/list_history' => 'user#list_history', as: :user_list_history
match '/user/list_history/:list_id' => 'user#history_list', as: :user_history_list
post '/user/order_selected_products' => 'user#order_selected_products', as: :user_order_selected_products
get '/user/table_info' => 'user#table_info', as: :user_table_info
match '/show_products' => 'dashboard#show_products', as: :user_products