end of day commit

This commit is contained in:
2012-08-28 20:08:13 +02:00
parent 0b16614d41
commit 89700f36e9
43 changed files with 896 additions and 26 deletions
+5
View File
@@ -33,6 +33,7 @@ en:
successfull: '%{model} is successfully destroyed'
table:
is_occupied: This table is occupied
has_no_section: "Not placed"
activemodel:
models:
user: User
@@ -42,6 +43,7 @@ en:
product: Product
order: Order
product_category: Product category
section: Section
plural:
user: Users
supplier: Restaurants
@@ -50,6 +52,7 @@ en:
product: Products
order: Orders
product_category: Product categories
section: Sections
attributes:
product:
price: Price
@@ -65,3 +68,5 @@ en:
show_products:
# The title gets products: Product.model_name.human_plural that can be used: e.g.: Showing %{products}
title: Menu
section:
first_section_title: Room
+21 -13
View File
@@ -1,22 +1,24 @@
Qrammer::Application.routes.draw do
devise_for :users
devise_for :suppliers
resources :users
resources :tables do
member do
get :qrcode
authenticate :supplier do
resources :users
resources :tables do
member do
get :qrcode
end
end
end
resources :orders do
member do
post :is_being_processed
post :is_delivered
resources :orders do
member do
post :is_being_processed
post :is_delivered
end
end
resources :suppliers
resources :lists
resources :products
resources :product_categories
end
resources :suppliers
resources :lists
resources :products
resources :product_categories
get '/supplier' => 'supplier#home', as: :supplier_root
get '/supplier/active_orders' => 'supplier#active_orders', as: :supplier_active_orders
@@ -43,6 +45,12 @@ Qrammer::Application.routes.draw do
match '/show_products' => 'dashboard#show_products', as: :user_products
namespace :suppliers, path: '/supplier' do
resources :sections
resources :tables
root to: 'sections#index'
end
match "/:action", controller: 'dashboard'
# The priority is based upon order of creation: