end of day commit

This commit is contained in:
2015-02-25 18:56:45 +01:00
parent c2435695bf
commit 3da5d8eb41
29 changed files with 132 additions and 27 deletions
+9 -3
View File
@@ -32,17 +32,20 @@ Qwaiter::Application.routes.draw do
root to: 'users#index'
end
resources :new_suppliers
post '/user_app' => 'dashboard#user_app_log' #TODO: separate high speed app at log.mozo.bar
post '/user_feedback' => 'user#feedback'
#WAITER
get '/waiter' => 'waiter#index' #, controller: 'waiter', action: 'index'
#get '/waiter' => 'waiter#index' #, controller: 'waiter', action: 'index'
get '/waiter/sections' => 'waiter#sections'
get '/waiter/product_categories' => 'waiter#product_categories'
get '/waiter/*rest' => redirect('/waiter') # Ember app refresh
post '/waiter/order_products' => 'waiter#order_products', as: :order_products_waiter
namespace :waiter do
root to: 'dashboard#index'
end
# USER
@@ -172,12 +175,15 @@ Qwaiter::Application.routes.draw do
mount Cmtool::Engine => '/cmtool'
#get '/:locale' => 'pages#home', constraints: {locale: ALLOWED_LOCALES}
# /nl is not matched to pages#home with locale => nl
get '/:locale' => 'pages#home', constraints: {locale: ALLOWED_LOCALES}
#devise_scope :supplier do
#get '/:locale/suppliers/sign_up' => 'registrations#new', constraints: {locale: ALLOWED_LOCALES}
#end
scope '(/:locale)', constraints: {locale: ALLOWED_LOCALES}, defaults: { locale: 'en' } do
root to: 'pages#home'
resources :contact_forms, only: [:create]
resources :new_suppliers
get "/:name" => "pages#show", constraints: {name: /.*/}, as: :go_to
end
end