backup push

This commit is contained in:
2012-08-24 16:20:03 +02:00
parent e3c189d187
commit 4765608e2d
17 changed files with 172 additions and 56 deletions
+13 -1
View File
@@ -5,6 +5,8 @@ en:
helpers:
links:
are_you_sure: 'Are you sure?'
place_order: Place order
show_active_list: Show %{list}
forms:
errors:
title: There are problems found during saving (%{count})
@@ -12,7 +14,7 @@ en:
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
the_list_has_been_closed: The %{list} has been closed
action:
index:
label: Listing %{models}
@@ -43,6 +45,16 @@ en:
list: Lists
product: Products
product_category: Product categories
attributes:
product:
price: Price
supplier:
menu:
active_lists: Active %{lists}
user:
active_list:
title: Active %{list}
needs_payment: Check please!
show_products:
# The title gets products: Product.model_name.human_plural that can be used: e.g.: Showing %{products}
title: Menu
+7 -2
View File
@@ -22,18 +22,23 @@ Qrammer::Application.routes.draw do
member do
get :current
post :is_closed
post :is_helped
end
end
resources :products
resources :product_categories
match "/:action", controller: 'dashboard'
match '/view_active_list' => 'dashboard#view_active_list', as: :view_active_list
match '/view_active_list' => 'dashboard#view_active_list', as: :view_active_list # depricated
match '/view_active_list' => 'dashboard#view_active_list', as: :user_active_list
match '/phone_home' => 'dashboard#phone_home', as: :phone_root
match '/supplier_home' => 'dashboard#supplier_home', as: :supplier_root
match '/supplier_home' => 'dashboard#supplier_home', as: :supplier_orders
match '/supplier_lists' => 'dashboard#supplier_lists', as: :supplier_lists
match '/user_list_info' => 'dashboard#user_list_info', as: :user_list_info
match '/user_history' => 'dashboard#user_history', as: :user_history
match '/show_products' => 'dashboard#show_products', as: :user_products
post '/active_user_list_needs_help' => 'dashboard#active_user_list_needs_help', as: :active_user_list_needs_help
match "/:action", controller: 'dashboard'
# The priority is based upon order of creation:
# first created -> highest priority.