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
Check if `current_currency` is defined before adding it to the base cache key (#12191)
Damian Kaczmarczyke2456a1fecab
diff --git a/core/app/helpers/spree/base_helper.rb b/core/app/helpers/spree/base_helper.rbindex 8b8df91020..7fab0738e1 100644--- a/core/app/helpers/spree/base_helper.rb+++ b/core/app/helpers/spree/base_helper.rb@@ -224,8 +224,12 @@ module Spreeenddef spree_base_cache_key- [I18n.locale, current_currency, defined?(try_spree_current_user) && try_spree_current_user.present?,- defined?(try_spree_current_user) && try_spree_current_user.try(:has_spree_role?, 'admin')]+ [+ I18n.locale,+ (current_currency if defined?(current_currency)),+ defined?(try_spree_current_user) && try_spree_current_user.present?,+ defined?(try_spree_current_user) && try_spree_current_user.try(:has_spree_role?, 'admin')+ ].compactenddef spree_base_cache_scopediff --git a/core/spec/helpers/base_helper_spec.rb b/core/spec/helpers/base_helper_spec.rbindex 0d1a4a0472..2164fc45c0 100644--- a/core/spec/helpers/base_helper_spec.rb+++ b/core/spec/helpers/base_helper_spec.rb@@ -175,7 +175,7 @@ describe Spree::BaseHelper, type: :helper dolet!(:user) { nil }it 'returns base cache key' do- expect(spree_base_cache_key).to eq [:en, 'USD', false, nil]+ expect(spree_base_cache_key).to eq [:en, 'USD', false]endendend@@ -188,7 +188,7 @@ describe Spree::BaseHelper, type: :helper doendit 'returns base cache key' do- expect(spree_base_cache_key).to eq [:en, 'USD', nil, nil]+ expect(spree_base_cache_key).to eq [:en, 'USD']endendend