end of day commit

This commit is contained in:
2012-08-29 17:42:04 +02:00
parent 89700f36e9
commit 8213bae2c6
57 changed files with 1109 additions and 128 deletions
+13 -8
View File
@@ -1,13 +1,11 @@
Qrammer::Application.routes.draw do
devise_for :users
devise_for :suppliers
authenticate :supplier do
devise_for :administrators
#authenticate :administrator do
resources :users
resources :tables do
member do
get :qrcode
end
end
resources :tables
resources :orders do
member do
post :is_being_processed
@@ -18,7 +16,7 @@ Qrammer::Application.routes.draw do
resources :lists
resources :products
resources :product_categories
end
#end
get '/supplier' => 'supplier#home', as: :supplier_root
get '/supplier/active_orders' => 'supplier#active_orders', as: :supplier_active_orders
@@ -38,9 +36,11 @@ Qrammer::Application.routes.draw do
post '/user/list_needs_payment' => 'user#list_needs_payment', as: :user_list_needs_payment
match '/user/create_list' => 'user#create_list', as: :user_create_list
get '/user/list_products' => 'user#list_products', as: :user_list_products
get '/user/list_products_for_table' => 'user#list_products_for_table', as: :user_list_products_for_table
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
post '/user/move_table' => 'user#move_table', as: :user_move_table
get '/user/table_info' => 'user#table_info', as: :user_table_info
match '/show_products' => 'dashboard#show_products', as: :user_products
@@ -48,10 +48,15 @@ Qrammer::Application.routes.draw do
namespace :suppliers, path: '/supplier' do
resources :sections
resources :tables
resources :products
resources :product_categories
root to: 'sections#index'
end
match "/:action", controller: 'dashboard'
#DEMO & DEVELOPMENT
get '/select_qrcode' => 'dashboard#select_qrcode'
get '/table_qr_image' => 'dashboard#table_qr_image', as: :table_qr_image
#match "/:action", controller: 'dashboard'
# The priority is based upon order of creation:
# first created -> highest priority.