Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Replace `Product#brand` with `Product#brand_taxon` (#13309)
Damian Legawiec32fde52516b1
diff --git a/core/app/models/spree/product.rb b/core/app/models/spree/product.rbindex d34c80a58a..2d4c9452e6 100644--- a/core/app/models/spree/product.rb+++ b/core/app/models/spree/product.rb@@ -255,8 +255,6 @@ module Spreedelegate :display_amount, :display_price, :has_default_price?, :track_inventory?,:display_compare_at_price, :images, to: :default_variant- delegate :name, to: :brand, prefix: true, allow_nil: true-alias master_images imagesstate_machine :status, initial: :draft do@@ -551,6 +549,13 @@ module Spreeenddef brand+ Spree::Deprecation.warn('Spree::Product#brand is deprecated and will be removed in Spree 6. Please use Spree::Product#brand_taxon instead.')+ brand_taxon+ end++ # Returns the brand taxon for the product+ # @return [Spree::Taxon]+ def brand_taxon@brand ||= if Spree.use_translations?taxons.joins(:taxonomy).join_translation_table(Taxonomy).@@ -564,7 +569,20 @@ module Spreeendend+ # Returns the brand name for the product+ # @return [String]+ def brand_name+ brand_taxon&.name+ end+def category+ Spree::Deprecation.warn('Spree::Product#category is deprecated and will be removed in Spree 6. Please use Spree::Product#category_taxon instead.')+ category_taxon+ end++ # Returns the category taxon for the product+ # @return [Spree::Taxon]+ def category_taxon@category ||= if Spree.use_translations?taxons.joins(:taxonomy).join_translation_table(Taxonomy).@@ -580,7 +598,7 @@ module Spreeenddef main_taxon- category || taxons.first+ category_taxon || taxons.firstenddef taxons_for_store(store)diff --git a/core/spec/models/spree/product_spec.rb b/core/spec/models/spree/product_spec.rbindex 43106e14ef..f6351bb91f 100644--- a/core/spec/models/spree/product_spec.rb+++ b/core/spec/models/spree/product_spec.rb@@ -694,21 +694,21 @@ describe Spree::Product, type: :model doendend- describe '#brand' do+ describe '#brand_taxon' dolet(:taxonomy) { store.taxonomies.find_by(name: Spree.t(:taxonomy_brands_name)) }let(:product) { create(:product, taxons: [taxonomy.taxons.first], stores: [store]) }it 'fetches Brand Taxon' do- expect(product.brand).to eql(taxonomy.taxons.first)+ expect(product.brand_taxon).to eql(taxonomy.taxons.first)endend- describe '#category' do+ describe '#category_taxon' dolet(:taxonomy) { store.taxonomies.find_by(name: Spree.t(:taxonomy_categories_name)) }let(:product) { create(:product, taxons: [taxonomy.taxons.first], stores: [store]) }it 'fetches Category Taxon' do- expect(product.category).to eql(taxonomy.taxons.first)+ expect(product.category_taxon).to eql(taxonomy.taxons.first)endenddiff --git a/storefront/app/helpers/spree/products_helper.rb b/storefront/app/helpers/spree/products_helper.rbindex de4eec8073..532bf5917f 100644--- a/storefront/app/helpers/spree/products_helper.rb+++ b/storefront/app/helpers/spree/products_helper.rb@@ -26,12 +26,6 @@ module Spree(Time.current - product.activated_at.in_time_zone(current_store.preferred_timezone)).seconds.in_weeks.to_i.absend- def brand_name(product)- Spree::Deprecation.warn('brand_name is deprecated and will be removed in Spree 5.2. Please use `product.brand_name` instead.')-- product.brand&.name || product.try(:vendor)&.display_name- end-def product_not_selected_options(product, selected_variant, options_param_name: :options)product.option_types.map do |option_type|if product_selected_option_for_option(diff --git a/storefront/app/views/themes/default/spree/page_sections/_product_details.html.erb b/storefront/app/views/themes/default/spree/page_sections/_product_details.html.erbindex 4b878fbfd3..3d945f2fad 100644--- a/storefront/app/views/themes/default/spree/page_sections/_product_details.html.erb+++ b/storefront/app/views/themes/default/spree/page_sections/_product_details.html.erb@@ -46,8 +46,8 @@<%= product.name %></h1><% when 'Spree::PageBlocks::Products::Brand' %>- <% if product.brand %>- <%= link_to spree.nested_taxons_path(product.brand), title: product.brand_name do %>+ <% if product.brand_taxon %>+ <%= link_to spree.nested_taxons_path(product.brand_taxon), title: product.brand_name do %><h3 class="text-sm lg:mt-0 inline-block mb-1"><%= product.brand_name %></h3>diff --git a/storefront/app/views/themes/default/spree/products/_json_ld.html.erb b/storefront/app/views/themes/default/spree/products/_json_ld.html.erbindex 630cb70756..ecbce25779 100644--- a/storefront/app/views/themes/default/spree/products/_json_ld.html.erb+++ b/storefront/app/views/themes/default/spree/products/_json_ld.html.erb@@ -18,7 +18,7 @@<% elsif selected_variant %><% if selected_variant.sku.present? %>"sku": <%= selected_variant.sku.to_json.html_safe %>,<% end %><% end %>- <% if product.brand %>+ <% if product.brand_name %>"brand": {"@type": "Brand","name": <%= product.brand_name.to_json.html_safe %>