supplier updates mostly

This commit is contained in:
2012-08-30 11:12:23 +02:00
parent df90425a48
commit 0d10ef2b5a
17 changed files with 789 additions and 66 deletions
+1
View File
@@ -72,6 +72,7 @@ module Qrammer
# Enable the asset pipeline
config.assets.enabled = true
#config.assets.precompile += ['tablet/application.css']
# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'
+3
View File
@@ -61,6 +61,9 @@ en:
active_lists: Active %{lists}
active_lists:
title: Active %{lists}
close: Close the shop
you_are_currently_closed_alert: 'You are currently closed and not able to take orders'
mark_as_open_button: 'Open up the place!'
user:
active_list:
title: Active %{list}
+6
View File
@@ -29,6 +29,12 @@ Qrammer::Application.routes.draw do
post '/supplier/mark_order_in_process' => 'supplier#mark_order_in_process', as: :supplier_mark_order_in_process
post '/supplier/order_is_delivered' => 'supplier#order_is_delivered', as: :supplier_order_is_delivered
post '/supplier/mark_as_open' => 'supplier#mark_as_open', as: :supplier_mark_as_open
post '/supplier/mark_as_closed' => 'supplier#mark_as_closed', as: :supplier_mark_as_closed
get '/supplier/settings' => 'supplier#edit', as: :supplier_settings
match '/supplier/settings' => 'supplier#update', as: :supplier_update_settings, via: [:put, :post]
match '/user' => 'user#home', as: :user_root
get '/user/active_list(.:format)' => 'user#active_list', as: :user_active_list
get '/user/list_info' => 'user#list_info', as: :user_list_info