From 652c7a563cdb9efaa77b10755abba047b83a32c4 Mon Sep 17 00:00:00 2001 From: Gaetan Craig-Riou Date: Fri, 27 Oct 2023 15:48:47 +1100 Subject: [PATCH] Add dfc_name field on Spree::Taxons This will let us map OFN product taxons to DFC product types --- app/controllers/spree/admin/taxons_controller.rb | 4 ++-- app/views/spree/admin/taxons/_form.html.haml | 4 ++++ config/locales/en.yml | 1 + db/migrate/20231027041224_add_dfc_name_to_spree_taxons.rb | 5 +++++ db/schema.rb | 1 + 5 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20231027041224_add_dfc_name_to_spree_taxons.rb diff --git a/app/controllers/spree/admin/taxons_controller.rb b/app/controllers/spree/admin/taxons_controller.rb index b586866110..2cc60bbd7e 100644 --- a/app/controllers/spree/admin/taxons_controller.rb +++ b/app/controllers/spree/admin/taxons_controller.rb @@ -117,8 +117,8 @@ module Spree def taxon_params params.require(:taxon).permit( - :name, :parent_id, :position, :icon, :description, :permalink, - :taxonomy_id, :meta_description, :meta_keywords, :meta_title + :name, :parent_id, :position, :icon, :description, :permalink, :taxonomy_id, + :meta_description, :meta_keywords, :meta_title, :dfc_name ) end end diff --git a/app/views/spree/admin/taxons/_form.html.haml b/app/views/spree/admin/taxons/_form.html.haml index 37143af832..df23dde53a 100644 --- a/app/views/spree/admin/taxons/_form.html.haml +++ b/app/views/spree/admin/taxons/_form.html.haml @@ -24,6 +24,10 @@ = f.label :meta_keywords, t(".meta_keywords") %br/ = f.text_field :meta_keywords, class: 'fullwidth', rows: 6 + = f.field_container :dfc_name do + = f.label :dfc_name, t(".dfc_name") + %br/ + = f.text_field :dfc_name, class: 'fullwidth', rows: 6 .omega.seven.columns = f.field_container :description do = f.label :description, t(".description") diff --git a/config/locales/en.yml b/config/locales/en.yml index d3bb4d2960..2f37ca4b5c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -4487,6 +4487,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using meta_description: Meta Description meta_keywords: Meta Keywords description: Description + dfc_name: DFC name general_settings: edit: legal_settings: "Legal Settings" diff --git a/db/migrate/20231027041224_add_dfc_name_to_spree_taxons.rb b/db/migrate/20231027041224_add_dfc_name_to_spree_taxons.rb new file mode 100644 index 0000000000..224880511e --- /dev/null +++ b/db/migrate/20231027041224_add_dfc_name_to_spree_taxons.rb @@ -0,0 +1,5 @@ +class AddDfcNameToSpreeTaxons < ActiveRecord::Migration[7.0] + def change + add_column :spree_taxons, :dfc_name, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 91083ef7e9..e7bb67f638 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -881,6 +881,7 @@ ActiveRecord::Schema[7.0].define(version: 20231003000823494) do t.string "meta_title", limit: 255 t.string "meta_description", limit: 255 t.string "meta_keywords", limit: 255 + t.string "dfc_name" t.index ["parent_id"], name: "index_taxons_on_parent_id" t.index ["permalink"], name: "index_taxons_on_permalink" t.index ["taxonomy_id"], name: "index_taxons_on_taxonomy_id"