Skip to content

armgit / spree

Public Imported from GitHub
0

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.

Join taxon translations for taxon "find by parent permalink"

nciemniakd9ebc8a1c65d
diff --git a/core/app/finders/spree/taxons/find.rb b/core/app/finders/spree/taxons/find.rb
index 6858455c8b..8b462cd89d 100644
--- a/core/app/finders/spree/taxons/find.rb
+++ b/core/app/finders/spree/taxons/find.rb
@@ -66,9 +66,13 @@ module Spree
return taxons unless parent_permalink?
if Rails::VERSION::STRING >= '6.1'
- taxons.joins(:parent).where(parent: { permalink: parent_permalink })
+ taxons.joins(:parent).
+ join_translation_table(Taxon, join_on_table_alias = 'parents_spree_taxons').
+ where(["#{Taxon.translation_table_alias}.permalink = ?", parent_permalink])
else
- taxons.joins("INNER JOIN #{Spree::Taxon.table_name} AS parent_taxon ON parent_taxon.id = #{Spree::Taxon.table_name}.parent_id").where(["parent_taxon.permalink = ?", parent_permalink])
+ taxons.joins("INNER JOIN #{Spree::Taxon.table_name} AS parent_taxon ON parent_taxon.id = #{Spree::Taxon.table_name}.parent_id").
+ join_translation_table(Taxon, join_on_table_alias = 'parent_taxon').
+ where(["#{Taxon.translation_table_alias}.permalink = ?", parent_permalink])
end
end
diff --git a/core/app/models/concerns/spree/translatable_resource_scopes.rb b/core/app/models/concerns/spree/translatable_resource_scopes.rb
index d7f2d75ed1..6dc4501660 100644
--- a/core/app/models/concerns/spree/translatable_resource_scopes.rb
+++ b/core/app/models/concerns/spree/translatable_resource_scopes.rb
@@ -5,10 +5,18 @@ module Spree
class_methods do
# To be used when joining on the resource itself does not automatically join on its translations table
# This method is to be used when you've already joined on the translatable table itself
- def join_translation_table(translatable_class)
+ #
+ # If the resource table is aliased, pass the alias to `join_on_table_alias`, otherwise omit the param
+ def join_translation_table(translatable_class, join_on_table_alias = nil)
+ join_on_table_name = if join_on_table_alias.nil?
+ translatable_class.table_name
+ else
+ join_on_table_alias
+ end
translatable_class_foreign_key = "#{translatable_class.table_name.singularize}_id"
+
joins("LEFT OUTER JOIN #{translatable_class::Translation.table_name} #{translatable_class.translation_table_alias}
- ON #{translatable_class.translation_table_alias}.#{translatable_class_foreign_key} = #{translatable_class.table_name}.id
+ ON #{translatable_class.translation_table_alias}.#{translatable_class_foreign_key} = #{join_on_table_name}.id
AND #{translatable_class.translation_table_alias}.locale = '#{Mobility.locale}'")
end
end