end of day commit for users and suppliers authenticated handling

config/locales/en.yml

@@ -15,6 +15,7 @@ en:
     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
+    illegal_history_list_attempt: The list you want to access is not yours
   action:
     index:
       label: Listing %{models}

config/routes.rb

@@ -13,34 +13,34 @@ Qrammer::Application.routes.draw do
       post :is_delivered
     end
   end
-  resources :suppliers do
-    member do
-      get :product_list
-      get :active_orders
-      get :active_lists
-    end
-  end
-  resources :lists do
-    member do
-      get :current
-      post :is_closed
-      post :is_helped
-    end
-  end
+  resources :suppliers
+  resources :lists
   resources :products
   resources :product_categories
 
-  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
+  get '/supplier' => 'supplier#active_orders', as: :supplier_root
+  get '/supplier/active_orders' => 'supplier#active_orders', as: :supplier_active_orders
+  get '/supplier/active_lists' => 'supplier#active_lists', as: :supplier_active_lists
+
+  post '/supplier/close_list' => 'supplier#close_list', as: :supplier_close_list
+  post '/supplier/mark_list_as_helped' => 'supplier#mark_list_as_helped', as: :supplier_mark_list_as_helped
+
+  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
+
+  get '/user/active_list(.:format)' => 'user#active_list', as: :user_active_list
+  get '/user/list_info' => 'user#list_info', as: :user_list_info
+  post '/user/needs_help' => 'user#needs_help', as: :user_needs_help
+  post '/user/list_needs_payment' => 'user#list_needs_payment', as: :user_list_needs_payment
+  match '/user/create_list' => 'user#create_list', as: :user_create_list
+  get '/user/list_products' => 'user#list_products', as: :user_list_products
+
   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 '/user/list_history' => 'user#list_history', as: :user_list_history
+  match '/user/list_history/:list_id' => 'user#history_list', as: :user_history_list
   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
-  post '/active_user_list_needs_payment' => 'dashboard#active_user_list_needs_payment', as: :active_user_list_needs_payment
+
+  match '/user/product_list(.:format)' => 'dashboard#product_list'
   match "/:action", controller: 'dashboard'
 
   # The priority is based upon order of creation: