From 8024dcec648a1fab62af860532c857d3b6c62dab Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Mon, 20 Jan 2020 17:26:50 +0100
Subject: [PATCH 1/3] Merge double Spree routes declarations into one

The app has a lot of problems with this in Rails 4
---
 config/routes/spree.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/config/routes/spree.rb b/config/routes/spree.rb
index 1749f563bc..a0d8c5a89a 100644
--- a/config/routes/spree.rb
+++ b/config/routes/spree.rb
@@ -26,12 +26,6 @@ Spree::Core::Engine.routes.draw do
 
   resource :account, :controller => 'users'
 
-  namespace :admin do
-    resources :users
-  end
-end
-
-Spree::Core::Engine.routes.prepend do
   match '/admin/reports/orders_and_distributors' => 'admin/reports#orders_and_distributors', :as => "orders_and_distributors_admin_reports",  :via  => [:get, :post]
   match '/admin/reports/order_cycle_management' => 'admin/reports#order_cycle_management', :as => "order_cycle_management_admin_reports",  :via  => [:get, :post]
   match '/admin/reports/packing' => 'admin/reports#packing', :as => "packing_admin_reports",  :via  => [:get, :post]
@@ -57,6 +51,8 @@ Spree::Core::Engine.routes.prepend do
     get '/search/customers' => 'search#customers', :as => :search_customers
     get '/search/customer_addresses' => 'search#customer_addresses', :as => :search_customer_addresses
 
+    resources :users
+
     resources :products do
       post :bulk_update, :on => :collection, :as => :bulk_update
 

From 147f7d4850de980c4606fdc78684dd306c5ef3c0 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Mon, 20 Jan 2020 17:30:46 +0100
Subject: [PATCH 2/3] Separate non-report routes from reports route list for
 clarity

---
 config/routes/spree.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/routes/spree.rb b/config/routes/spree.rb
index a0d8c5a89a..b27592c6dc 100644
--- a/config/routes/spree.rb
+++ b/config/routes/spree.rb
@@ -35,10 +35,11 @@ Spree::Core::Engine.routes.draw do
   match '/admin/reports/orders_and_fulfillment' => 'admin/reports#orders_and_fulfillment', :as => "orders_and_fulfillment_admin_reports",  :via  => [:get, :post]
   match '/admin/reports/users_and_enterprises' => 'admin/reports#users_and_enterprises', :as => "users_and_enterprises_admin_reports",  :via => [:get, :post]
   match '/admin/reports/sales_tax' => 'admin/reports#sales_tax', :as => "sales_tax_admin_reports",  :via  => [:get, :post]
-  match '/admin/orders/bulk_management' => 'admin/orders#bulk_management', :as => "admin_bulk_order_management"
   match '/admin/reports/products_and_inventory' => 'admin/reports#products_and_inventory', :as => "products_and_inventory_admin_reports",  :via  => [:get, :post]
   match '/admin/reports/customers' => 'admin/reports#customers', :as => "customers_admin_reports",  :via  => [:get, :post]
   match '/admin/reports/xero_invoices' => 'admin/reports#xero_invoices', :as => "xero_invoices_admin_reports",  :via  => [:get, :post]
+
+  match '/admin/orders/bulk_management' => 'admin/orders#bulk_management', :as => "admin_bulk_order_management"
   match '/admin/payment_methods/show_provider_preferences' => 'admin/payment_methods#show_provider_preferences', :via => :get
   put 'credit_cards/new_from_token', to: 'credit_cards#new_from_token'
 

From cca824f2077e731b28c60eaec74efb5df86b9daa Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Mon, 20 Jan 2020 17:32:00 +0100
Subject: [PATCH 3/3] Ensure routes declared with `match` specify a method

---
 config/routes/spree.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/routes/spree.rb b/config/routes/spree.rb
index b27592c6dc..cb1b5e28a3 100644
--- a/config/routes/spree.rb
+++ b/config/routes/spree.rb
@@ -39,7 +39,7 @@ Spree::Core::Engine.routes.draw do
   match '/admin/reports/customers' => 'admin/reports#customers', :as => "customers_admin_reports",  :via  => [:get, :post]
   match '/admin/reports/xero_invoices' => 'admin/reports#xero_invoices', :as => "xero_invoices_admin_reports",  :via  => [:get, :post]
 
-  match '/admin/orders/bulk_management' => 'admin/orders#bulk_management', :as => "admin_bulk_order_management"
+  match '/admin/orders/bulk_management' => 'admin/orders#bulk_management', :as => "admin_bulk_order_management", via: :get
   match '/admin/payment_methods/show_provider_preferences' => 'admin/payment_methods#show_provider_preferences', :via => :get
   put 'credit_cards/new_from_token', to: 'credit_cards#new_from_token'