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
Code Reviews fixes and remove test for now removed by_store scope.
Matthew Kennedye46b357bce29
diff --git a/core/app/models/spree/cms_page.rb b/core/app/models/spree/cms_page.rbindex 297ae65e83..34386b1243 100644--- a/core/app/models/spree/cms_page.rb+++ b/core/app/models/spree/cms_page.rb@@ -8,8 +8,8 @@ module Spree'Spree::Cms::Pages::Homepage']belongs_to :store, touch: true- has_many :cms_sections, dependent: :destroy+ has_many :cms_sections, dependent: :destroy, class_name: 'Spree::CmsSection'has_many :menu_items, as: :linked_resourcebefore_validation :handle_slugdiff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rbindex e32edaeaf7..d26d0bfff8 100644--- a/core/app/models/spree/store.rb+++ b/core/app/models/spree/store.rb@@ -14,6 +14,7 @@ module Spreehas_many :payment_methods, through: :store_payment_methods, class_name: 'Spree::PaymentMethod'has_many :cms_pages, class_name: 'Spree::CmsPage'+ has_many :cms_sections, through: :cms_pages, class_name: 'Spree::CmsSection'has_many :menus, class_name: 'Spree::Menu'has_many :menu_items, through: :menus, class_name: 'Spree::MenuItem'@@ -99,20 +100,20 @@ module Spreeenddef homepage(requested_locale)- Spree::CmsPage.find_by(store_id: id, locale: requested_locale, type: 'Spree::Cms::Pages::Homepage') ||- Spree::CmsPage.find_by(store_id: id, locale: default_locale, type: 'Spree::Cms::Pages::Homepage') ||- Spree::CmsPage.find_by(store_id: id, type: 'Spree::Cms::Pages::Homepage')+ cms_pages.by_locale(requested_locale).find_by(type: 'Spree::Cms::Pages::Homepage') ||+ cms_pages.by_locale(default_locale).find_by(type: 'Spree::Cms::Pages::Homepage') ||+ cms_pages.find_by(type: 'Spree::Cms::Pages::Homepage')enddef seo_meta_description- if meta_description.present?- meta_description- elsif seo_title.present?- seo_title- else- name- end- end+ if meta_description.present?+ meta_description+ elsif seo_title.present?+ seo_title+ else+ name+ end+ enddef supported_locales_list# TODO: add support of multiple supported languages to a single Storediff --git a/core/spec/models/spree/cms_page_spec.rb b/core/spec/models/spree/cms_page_spec.rbindex 80254972b2..3d429b32e2 100644--- a/core/spec/models/spree/cms_page_spec.rb+++ b/core/spec/models/spree/cms_page_spec.rb@@ -100,17 +100,6 @@ describe Spree::CmsPage, type: :model doendend- describe 'by_store' do- let!(:homepage_a) { create(:cms_homepage, store: store_a) }- let!(:homepage_b) { create(:cms_homepage, store: store_b) }-- it 'returns homepage for the requested store' do- result_a = described_class.find(homepage_a.id)-- expect(described_class.by_store(store_a)).to eq([result_a])- end- end-describe 'by_locale' dolet!(:homepage_en) { create(:cms_homepage, store: store_a, locale: 'en') }let!(:homepage_de) { create(:cms_homepage, store: store_a, locale: 'de') }