From eefc356472b0e8538551cbfcf60feef9d56672cb Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Sat, 15 Jul 2023 15:52:22 +0100
Subject: [PATCH] Update shipping_category usage in admin pages

---
 app/controllers/spree/admin/products_controller.rb | 2 +-
 app/controllers/spree/admin/variants_controller.rb | 2 ++
 app/views/spree/admin/products/_form.html.haml     | 5 -----
 app/views/spree/admin/variants/_form.html.haml     | 4 ++++
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/controllers/spree/admin/products_controller.rb b/app/controllers/spree/admin/products_controller.rb
index 4a7f954a7c..1e55d2a099 100644
--- a/app/controllers/spree/admin/products_controller.rb
+++ b/app/controllers/spree/admin/products_controller.rb
@@ -27,7 +27,7 @@ module Spree
       end
 
       def new
-        @object.shipping_category = DefaultShippingCategory.find_or_create
+        @object.shipping_category_id = DefaultShippingCategory.find_or_create.id
       end
 
       def edit
diff --git a/app/controllers/spree/admin/variants_controller.rb b/app/controllers/spree/admin/variants_controller.rb
index 85a609ae42..5f5e113355 100644
--- a/app/controllers/spree/admin/variants_controller.rb
+++ b/app/controllers/spree/admin/variants_controller.rb
@@ -19,6 +19,7 @@ module Spree
 
       def edit
         @url_filters = ::ProductFilters.new.extract(request.query_parameters)
+        @object.shipping_category = DefaultShippingCategory.find_or_create
       end
 
       def create
@@ -114,6 +115,7 @@ module Spree
 
       def load_data
         @tax_categories = TaxCategory.order(:name)
+        @shipping_categories = ShippingCategory.order(:name)
       end
     end
   end
diff --git a/app/views/spree/admin/products/_form.html.haml b/app/views/spree/admin/products/_form.html.haml
index 6fb51e7c10..2935fa0dc5 100644
--- a/app/views/spree/admin/products/_form.html.haml
+++ b/app/views/spree/admin/products/_form.html.haml
@@ -38,11 +38,6 @@
 
     .clear
 
-    = f.field_container :shipping_categories do
-      = f.label :shipping_category_id, t(:shipping_categories)
-      = f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, {}, { :class => 'select2' })
-      = f.error_message_on :shipping_category
-
   .clear
 
   %div
diff --git a/app/views/spree/admin/variants/_form.html.haml b/app/views/spree/admin/variants/_form.html.haml
index 3f8f8d3021..1e9aa79236 100644
--- a/app/views/spree/admin/variants/_form.html.haml
+++ b/app/views/spree/admin/variants/_form.html.haml
@@ -68,4 +68,8 @@
     = f.label :tax_category_id, t(:tax_category)
     = f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: t(:none) }, { class: 'select2 fullwidth' })
 
+  .field
+    = f.label :shipping_category_id, t(:shipping_categories)
+    = f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, {}, { class: 'select2 fullwidth' })
+
 .clear