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
Rename many url methods to page_builder_url
Łukasz Adamczyk987df6d7170d
diff --git a/core/app/models/action_text/rich_text_decorator.rb b/core/app/models/action_text/rich_text_decorator.rbnew file mode 100644index 0000000000..cb8c2a9562--- /dev/null+++ b/core/app/models/action_text/rich_text_decorator.rb@@ -0,0 +1,11 @@+module ActionText+ module RichTextDecorator+ def page_builder_url+ return unless Spree::Core::Engine.routes.url_helpers.respond_to?(:policy_path)++ Spree::Core::Engine.routes.url_helpers.policy_path(name.gsub(/customer_/, ''), locale: I18n.locale)+ end+ end++ ActionText::RichText.include(RichTextDecorator)+enddiff --git a/core/app/models/spree/page.rb b/core/app/models/spree/page.rbindex 191ac257da..8e4fb44243 100644--- a/core/app/models/spree/page.rb+++ b/core/app/models/spree/page.rb@@ -108,9 +108,9 @@ module Spreeenddef preview_url(theme_preview = nil, page_preview = nil)- return if url.blank?+ return if page_builder_url.blank?- "#{url}?#{url_query_params(theme_preview, page_preview).to_query}"+ "#{page_builder_url}?#{url_query_params(theme_preview, page_preview).to_query}"enddef display_name@@ -177,7 +177,7 @@ module Spreename_changed? && custom?end- def url_exists?(path)+ def page_builder_url_exists?(path)Spree::Core::Engine.routes.url_helpers.respond_to?(path)endenddiff --git a/core/app/models/spree/page_link.rb b/core/app/models/spree/page_link.rbindex fd5497759f..866583a8ba 100644--- a/core/app/models/spree/page_link.rb+++ b/core/app/models/spree/page_link.rb@@ -25,7 +25,7 @@ module Spreebefore_validation :set_label, on: [:create, :update]def linkable_url- @linkable_url ||= linkable&.url || formatted_url+ @linkable_url ||= linkable&.page_builder_url || formatted_urlenddef formatted_urldiff --git a/core/app/models/spree/pages/account.rb b/core/app/models/spree/pages/account.rbindex 9824926fb2..2f5075d433 100644--- a/core/app/models/spree/pages/account.rb+++ b/core/app/models/spree/pages/account.rb@@ -1,8 +1,8 @@module Spreemodule Pagesclass Account < Spree::Page- def url- return unless url_exists?(:account_path)+ def page_builder_url+ return unless page_builder_url_exists?(:account_path)Spree::Core::Engine.routes.url_helpers.account_path(locale: I18n.locale)enddiff --git a/core/app/models/spree/pages/custom.rb b/core/app/models/spree/pages/custom.rbindex 97d3575f03..a72d55a96e 100644--- a/core/app/models/spree/pages/custom.rb+++ b/core/app/models/spree/pages/custom.rb@@ -5,8 +5,8 @@ module Spreetrueend- def url- return unless url_exists?(:page_path)+ def page_builder_url+ return unless page_builder_url_exists?(:page_path)Spree::Core::Engine.routes.url_helpers.page_path(self, locale: I18n.locale)enddiff --git a/core/app/models/spree/pages/homepage.rb b/core/app/models/spree/pages/homepage.rbindex e6b3fc042f..8eb7a05593 100644--- a/core/app/models/spree/pages/homepage.rb+++ b/core/app/models/spree/pages/homepage.rb@@ -1,8 +1,8 @@module Spreemodule Pagesclass Homepage < Spree::Page- def url- return unless url_exists?(:root_path)+ def page_builder_url+ return unless page_builder_url_exists?(:root_path)Spree::Core::Engine.routes.url_helpers.root_path(locale: I18n.locale)enddiff --git a/core/app/models/spree/pages/login.rb b/core/app/models/spree/pages/login.rbindex 002a528953..28cf7f5998 100644--- a/core/app/models/spree/pages/login.rb+++ b/core/app/models/spree/pages/login.rb@@ -5,8 +5,8 @@ module Spree'key'end- def url- return unless url_exists?(:login_path)+ def page_builder_url+ return unless page_builder_url_exists?(:login_path)Spree::Core::Engine.routes.url_helpers.login_path(locale: I18n.locale)enddiff --git a/core/app/models/spree/pages/password.rb b/core/app/models/spree/pages/password.rbindex bc380c69b9..7e143287d2 100644--- a/core/app/models/spree/pages/password.rb+++ b/core/app/models/spree/pages/password.rb@@ -1,12 +1,12 @@module Spreemodule Pagesclass Password < Spree::Page- def url+ def page_builder_urlSpree::Core::Engine.routes.url_helpers.password_path(locale: I18n.locale)enddef preview_url(theme_preview = nil, page_preview = nil)- return unless url_exists?(:password_path)+ return unless page_builder_url_exists?(:password_path)Spree::Core::Engine.routes.url_helpers.password_path(theme_id: theme.id,diff --git a/core/app/models/spree/pages/post.rb b/core/app/models/spree/pages/post.rbindex 017c8552a9..2892a074ba 100644--- a/core/app/models/spree/pages/post.rb+++ b/core/app/models/spree/pages/post.rb@@ -1,8 +1,8 @@module Spreemodule Pagesclass Post < Spree::Page- def url- return unless url_exists?(:post_path)+ def page_builder_url+ return unless page_builder_url_exists?(:post_path)post = store.posts.published.last || store.posts.lastreturn if post.nil?diff --git a/core/app/models/spree/pages/post_list.rb b/core/app/models/spree/pages/post_list.rbindex 417fb1a4e4..1cef217c5a 100644--- a/core/app/models/spree/pages/post_list.rb+++ b/core/app/models/spree/pages/post_list.rb@@ -3,8 +3,8 @@ module Spreeclass PostList < Spree::PageDISPLAY_NAME = Spree.t(:blog).freeze- def url- return unless url_exists?(:posts_path)+ def page_builder_url+ return unless page_builder_url_exists?(:posts_path)Spree::Core::Engine.routes.url_helpers.posts_path(locale: I18n.locale)enddiff --git a/core/app/models/spree/pages/product_details.rb b/core/app/models/spree/pages/product_details.rbindex 9040c2f6f1..4bfe8c2921 100644--- a/core/app/models/spree/pages/product_details.rb+++ b/core/app/models/spree/pages/product_details.rb@@ -1,8 +1,8 @@module Spreemodule Pagesclass ProductDetails < Spree::Page- def url- return unless url_exists?(:product_path)+ def page_builder_url+ return unless page_builder_url_exists?(:product_path)product = store.products.active.first || store.products.firstreturn if product.nil?diff --git a/core/app/models/spree/pages/search_results.rb b/core/app/models/spree/pages/search_results.rbindex e9f86084af..2956598bdf 100644--- a/core/app/models/spree/pages/search_results.rb+++ b/core/app/models/spree/pages/search_results.rb@@ -5,8 +5,8 @@ module Spree'search'end- def url- return unless url_exists?(:search_path)+ def page_builder_url+ return unless page_builder_url_exists?(:search_path)Spree::Core::Engine.routes.url_helpers.search_path(q: 'test',@@ -18,7 +18,7 @@ module Spreeenddef preview_url(theme_preview = nil, page_preview = nil)- return unless url_exists?(:search_path)+ return unless page_builder_url_exists?(:search_path)Spree::Core::Engine.routes.url_helpers.search_path(q: 'test',diff --git a/core/app/models/spree/pages/shop_all.rb b/core/app/models/spree/pages/shop_all.rbindex d726551323..cf1d6181ed 100644--- a/core/app/models/spree/pages/shop_all.rb+++ b/core/app/models/spree/pages/shop_all.rb@@ -5,14 +5,14 @@ module Spree'shopping-bag'end- def url- return unless url_exists?(:products_path)+ def page_builder_url+ return unless page_builder_url_exists?(:products_path)Spree::Core::Engine.routes.url_helpers.products_path(locale: I18n.locale)enddef preview_url(theme_preview = nil, page_preview = nil)- return unless url_exists?(:products_path)+ return unless page_builder_url_exists?(:products_path)Spree::Core::Engine.routes.url_helpers.products_path(theme_id: theme.id,diff --git a/core/app/models/spree/pages/taxon.rb b/core/app/models/spree/pages/taxon.rbindex 511c5a2693..54d801a1ea 100644--- a/core/app/models/spree/pages/taxon.rb+++ b/core/app/models/spree/pages/taxon.rb@@ -5,8 +5,8 @@ module Spree'bookmark'end- def url- return unless url_exists?(:nested_taxons_path)+ def page_builder_url+ return unless page_builder_url_exists?(:nested_taxons_path)taxon = Spree::Taxon.firstreturn if taxon.nil?diff --git a/core/app/models/spree/pages/taxon_list.rb b/core/app/models/spree/pages/taxon_list.rbindex b85ee6d53c..a13072a345 100644--- a/core/app/models/spree/pages/taxon_list.rb+++ b/core/app/models/spree/pages/taxon_list.rb@@ -4,8 +4,8 @@ module SpreeDISPLAY_NAME = Spree.t(:taxonomy_brands_name).freeze- def url- return unless url_exists?(:taxonomy_path)+ def page_builder_url+ return unless page_builder_url_exists?(:taxonomy_path)Spree::Core::Engine.routes.url_helpers.taxonomy_path(taxonomy.id, locale: I18n.locale)enddiff --git a/core/app/models/spree/pages/wishlist.rb b/core/app/models/spree/pages/wishlist.rbindex 1657f7a24d..6502931311 100644--- a/core/app/models/spree/pages/wishlist.rb+++ b/core/app/models/spree/pages/wishlist.rb@@ -1,8 +1,8 @@module Spreemodule Pagesclass Wishlist < Spree::Page- def url- return unless url_exists?(:account_wishlist_path)+ def page_builder_url+ return unless page_builder_url_exists?(:account_wishlist_path)Spree::Core::Engine.routes.url_helpers.account_wishlist_path(locale: I18n.locale)enddiff --git a/core/app/models/spree/post.rb b/core/app/models/spree/post.rbindex 1e172a62e2..5f19601db1 100644--- a/core/app/models/spree/post.rb+++ b/core/app/models/spree/post.rb@@ -73,7 +73,7 @@ module Spreepublished_at.present?end- def url+ def page_builder_urlreturn unless Spree::Core::Engine.routes.url_helpers.respond_to?(:post_path)Spree::Core::Engine.routes.url_helpers.post_path(self, locale: I18n.locale)diff --git a/core/app/models/spree/product.rb b/core/app/models/spree/product.rbindex a94fa62207..0dd64d784a 100644--- a/core/app/models/spree/product.rb+++ b/core/app/models/spree/product.rb@@ -643,6 +643,12 @@ module Spreecsv_linesend+ def page_builder_url+ return unless Spree::Core::Engine.routes.url_helpers.respond_to?(:product_path)++ Spree::Core::Engine.routes.url_helpers.product_path(self, locale: I18n.locale)+ end+privatedef add_associations_from_prototypediff --git a/core/app/models/spree/taxon.rb b/core/app/models/spree/taxon.rbindex 377d91111a..10bb6114cc 100644--- a/core/app/models/spree/taxon.rb+++ b/core/app/models/spree/taxon.rb@@ -378,6 +378,12 @@ module Spreemove_to_child_with_index(parent, idx.to_i) unless new_record?end+ def page_builder_url+ return unless Spree::Core::Engine.routes.url_helpers.respond_to?(:nested_taxons_path)++ Spree::Core::Engine.routes.url_helpers.nested_taxons_path(self, locale: I18n.locale)+ end+privatedef should_regenerate_pretty_name_and_permalink?diff --git a/core/spec/models/spree/image_spec.rb b/core/spec/models/spree/image_spec.rbindex 590eafeed7..c5f74f9a2a 100644--- a/core/spec/models/spree/image_spec.rb+++ b/core/spec/models/spree/image_spec.rb@@ -58,7 +58,7 @@ describe Spree::Image, type: :model dolet!(:variants) { create_list(:variant, 2, product: product) }context 'when viewable is a master variant' do- let(:viewable) { product.master }+ let(:viewable) { product.reload.master }it 'touches product variants' doexpect(image).to receive(:touch_product_variants)diff --git a/core/spec/models/spree/product_spec.rb b/core/spec/models/spree/product_spec.rbindex ac7a9c3bbd..033cabb9ae 100644--- a/core/spec/models/spree/product_spec.rb+++ b/core/spec/models/spree/product_spec.rb@@ -1436,11 +1436,15 @@ describe Spree::Product, type: :model doSpree::Config.show_products_without_price = falseend- let(:active_product_2) { create(:product, status: 'active', stores: [store]) }- let(:active_product_3) { create(:product, status: 'active', stores: [store]) }- let(:active_product_4) { create(:product, status: 'active', stores: [store]) }+ let!(:active_product_2) { create(:product, status: 'active', stores: [store]) }+ let!(:active_product_3) { create(:product, status: 'active', stores: [store]) }+ let!(:active_product_4) { create(:product, status: 'active', stores: [store]) }before do+ active_product_2.prices_including_master.where(currency: 'USD').delete_all+ active_product_3.prices_including_master.where(currency: 'USD').delete_all+ active_product_4.prices_including_master.where(currency: 'USD').delete_all+active_product_2.default_variant.prices.create(currency: 'USD', amount: 10)active_product_3.default_variant.prices.create(currency: 'PLN', amount: 10)enddiff --git a/core/spec/presenters/spree/variants/option_types_presenter_spec.rb b/core/spec/presenters/spree/variants/option_types_presenter_spec.rbindex e055eeb806..5a99559a70 100644--- a/core/spec/presenters/spree/variants/option_types_presenter_spec.rb+++ b/core/spec/presenters/spree/variants/option_types_presenter_spec.rb@@ -12,7 +12,7 @@ describe Spree::Variants::OptionTypesPresenter dolet!(:variant_2) { create :variant, product: product, option_values: [option_value_1_2, option_value_2_1] }let!(:variant_3) { create :variant, product: product_2, option_values: [option_value_1_2, option_value_2_1] }- let(:variants) { product.variants }+ let(:variants) { product.reload.variants }let!(:option_value_1_0) { create :option_value, option_type: option_type_1, position: 0 }let!(:option_value_1_1) { create :option_value, option_type: option_type_1, position: 2 }diff --git a/core/spec/services/spree/products/duplicator_spec.rb b/core/spec/services/spree/products/duplicator_spec.rbindex c8904faa0b..5763e0c674 100644--- a/core/spec/services/spree/products/duplicator_spec.rb+++ b/core/spec/services/spree/products/duplicator_spec.rb@@ -1,7 +1,7 @@require 'spec_helper'RSpec.describe Spree::Products::Duplicator do- subject(:duplicate) { described_class.call(product: product) }+ subject(:duplicate) { described_class.call(product: product.reload) }let(:store) { Spree::Store.default }diff --git a/core/spec/services/spree/stock_locations/stock_items/create_spec.rb b/core/spec/services/spree/stock_locations/stock_items/create_spec.rbindex 642251b045..b25e486bbf 100644--- a/core/spec/services/spree/stock_locations/stock_items/create_spec.rb+++ b/core/spec/services/spree/stock_locations/stock_items/create_spec.rb@@ -20,7 +20,7 @@ module Spreetotal_stock_items = Spree::StockItem.countexpect { result }.to change {stock_location.stock_items.count- }.from(total_stock_items).to(total_stock_items + 1)+ }.from(total_stock_items).to(total_stock_items + 2)endend