end of day commit

This commit is contained in:
2012-08-23 18:50:06 +02:00
parent 13dd2bf335
commit 0bae1bcbed
37 changed files with 1157 additions and 83 deletions
+5 -1
View File
@@ -1,6 +1,5 @@
# Sample localization file for English. Add more files in this directory for other locales.
# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
en:
hello: "Hello world"
helpers:
@@ -9,6 +8,11 @@ en:
forms:
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
action:
index:
label: Listing %{models}
+15 -1
View File
@@ -5,16 +5,30 @@ Qrammer::Application.routes.draw do
get :qrcode
end
end
resources :orders do
member do
post :is_being_processed
post :is_delivered
end
end
resources :suppliers do
member do
get :product_list
get :active_order_list
get :active_lists
end
end
resources :lists do
member do
get :current
post :is_closed
end
end
resources :lists
resources :products
resources :product_categories
match "/:action", controller: 'dashboard'
match '/view_active_list' => 'dashboard#view_active_list', as: :view_active_list
# The priority is based upon order of creation:
# first created -> highest priority.