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
Add feature.
Matthew Kennedyd74802d294c9
diff --git a/backend/app/controllers/spree/admin/cms_sections_controller.rb b/backend/app/controllers/spree/admin/cms_sections_controller.rbindex 24ef76e40f..88ba950985 100644--- a/backend/app/controllers/spree/admin/cms_sections_controller.rb+++ b/backend/app/controllers/spree/admin/cms_sections_controller.rb@@ -25,6 +25,10 @@ module Spreeprivate+ def parent+ @cms_page = CmsPage.friendly.find(params[:cms_page_id])+ end+def load_data@cms_section_widths = Spree::CmsSection::SECTION_WIDTHS@cms_section_types = Spree::CmsSection::SECTION_TYPESdiff --git a/backend/app/helpers/spree/admin/base_helper.rb b/backend/app/helpers/spree/admin/base_helper.rbindex 250cd0cedb..d3dc155bb6 100644--- a/backend/app/helpers/spree/admin/base_helper.rb+++ b/backend/app/helpers/spree/admin/base_helper.rb@@ -200,6 +200,16 @@ module Spree)end+ def page_preview_link(page)+ return unless frontend_available?++ button_link_to(+ Spree.t(:preview_page),+ spree.page_url(page),+ class: 'btn-outline-secondary', icon: 'view.svg', id: 'admin_preview_product', target: :blank+ )+ end+def taxon_preview_link(taxon)return unless frontend_available?diff --git a/backend/app/views/spree/admin/cms_pages/_feature_form.html.erb b/backend/app/views/spree/admin/cms_pages/_feature_form.html.erbnew file mode 100644index 0000000000..a04d8e414e--- /dev/null+++ b/backend/app/views/spree/admin/cms_pages/_feature_form.html.erb@@ -0,0 +1,55 @@+<div data-hook="admin_page_form_fields" class="row">+ <div class="col-12 col-md-6">+ <%= f.field_container :title, class: ['form-group'] do %>+ <%= f.label :title, raw(Spree.t('admin.cms.page_title') + required_span_tag) %>+ <%= f.text_field :title, class: 'form-control', required: true %>+ <%= f.error_message_on :title %>+ <% end %>++ <%= f.field_container :slug, class: ['form-group'] do %>+ <%= f.label :slug, Spree.t('admin.pages.slug') %>+ <%= f.text_field :slug, class: 'form-control' %>+ <%= f.error_message_on :slug %>+ <% end %>++ <%= f.field_container :meta_title, class: ['form-group'] do %>+ <%= f.label :meta_title, Spree.t('admin.pages.meta_title') %>+ <%= f.text_field :meta_title, class: 'form-control' %>+ <%= f.error_message_on :meta_title %>+ <% end %>++ <%= f.field_container :meta_description, class: ['form-group'] do %>+ <%= f.label :meta_description, Spree.t('admin.pages.meta_description') %>+ <%= f.text_area :meta_description, { rows: 3, class: 'form-control' } %>+ <%= f.error_message_on :meta_description %>+ <% end %>+ </div>+ <div class="col-12 col-md-6">+ <%= f.field_container :kind, class: ['form-group'] do %>+ <%= f.label :kind, Spree.t('admin.cms.page_type') %>+ <%= f.select(:kind, @page_kinds, {include_blank: false}, class: 'select2') %>+ <%= f.error_message_on :kind %>+ <% end %>++ <%= f.field_container :cms_page_stores, class: ['form-group'] do %>+ <%= label_tag :cms_page_stores, Spree.t(:stores) %>+ <%= collection_select(:cms_page, :store_id, @stores, :id, :unique_name, {}, { class: 'select2' }) %>+ <%= f.error_message_on :cms_page_stores %>+ <% end %>++ <%= f.field_container :locale, class: ['form-group'] do %>+ <%= f.label :locale %>+ <%= f.select :locale, options_from_collection_for_select(all_locales_options, :last, :first, @cms_page.locale || I18n.locale), {}, { class: 'select2' } %>+ <%= f.error_message_on :default_locale %>+ <% end %>++ <%= f.field_container :visible, class: ['form-group'] do %>+ <div class="custom-control custom-checkbox">+ <%= f.check_box :visible, class: 'custom-control-input' %>+ <%= f.label :visible, Spree.t(:visible), class: 'custom-control-label' %>+ <%= f.error_message_on :visible %>+ </div>+ <% end %>++ </div>+</div>diff --git a/backend/app/views/spree/admin/cms_pages/edit.html.erb b/backend/app/views/spree/admin/cms_pages/edit.html.erbindex 2d086bead5..c18538695f 100644--- a/backend/app/views/spree/admin/cms_pages/edit.html.erb+++ b/backend/app/views/spree/admin/cms_pages/edit.html.erb@@ -2,11 +2,32 @@<%= link_to Spree.t('admin.navigation.all_pages'), spree.admin_cms_pages_path %> / <%= @cms_page.title %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @cms_page } %>-<%= form_for [:admin, @cms_page] do |f| %>- <%= render partial: 'form', locals: { f: f } %>- <div class="d-flex ">- <%= render partial: 'spree/admin/shared/edit_resource_links' %>+<% content_for :page_actions do %>+ <%= page_preview_link(@cms_page) %>+<% end %>++<% if @cms_page.kind == 'Standard Page' %>+ <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @cms_page } %>+ <%= form_for [:admin, @cms_page] do |f| %>+ <%= render partial: 'form', locals: { f: f } %>+ <div class="d-flex ">+ <%= render partial: 'spree/admin/shared/edit_resource_links' %>+ </div>+ <% end %>+<% else %>+ <div class="card">+ <div class="card-header">+ <h5 class="mb-0"><%= Spree.t('admin.cms.feature_page_settings') %></h5>+ </div>+ <div class="card-body">+ <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @cms_page } %>+ <%= form_for [:admin, @cms_page] do |f| %>+ <%= render partial: 'feature_form', locals: { f: f } %>+ <div class="d-flex ">+ <%= render partial: 'spree/admin/shared/edit_resource_links' %>+ </div>+ <% end %>+ </div></div><% end %>diff --git a/backend/app/views/spree/admin/cms_pages/new.html.erb b/backend/app/views/spree/admin/cms_pages/new.html.erbindex 093f5d26a7..c52b0d1705 100644--- a/backend/app/views/spree/admin/cms_pages/new.html.erb+++ b/backend/app/views/spree/admin/cms_pages/new.html.erb@@ -5,7 +5,7 @@<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @cms_page } %><%= form_for [:admin, @cms_page] do |f| %><%= render partial: 'form', locals: { f: f } %>- <div class="d-flex ">+ <div class="d-flex"><%= render partial: 'spree/admin/shared/new_resource_links' %></div><% end %>diff --git a/core/app/models/spree/cms_page.rb b/core/app/models/spree/cms_page.rbindex 287d8dcb0a..ff96518de1 100644--- a/core/app/models/spree/cms_page.rb+++ b/core/app/models/spree/cms_page.rb@@ -7,6 +7,10 @@ module Spreebelongs_to :store, touch: truehas_many :cms_sections+ has_many :menu_items, as: :linked_resource++ after_save :sync_menu_item_paths+ after_commit :sync_menu_item_pathsbefore_save :create_slug@@ -22,6 +26,12 @@ module Spreeprivate+ def sync_menu_item_paths+ return unless saved_change_to_slug?++ Spree::MenuItem.refresh_paths(self)+ end+def create_slugself.slug = if slug.blank?title.to_urldiff --git a/core/app/models/spree/menu_item.rb b/core/app/models/spree/menu_item.rbindex 9c1fdba13d..f7b0a50ce8 100644--- a/core/app/models/spree/menu_item.rb+++ b/core/app/models/spree/menu_item.rb@@ -15,7 +15,7 @@ module SpreeLINKED_RESOURCE_TYPE = ['URL']STATIC_RESOURCE_TYPE = ['Home Page']- DYNAMIC_RESOURCE_TYPE = ['Spree::Product', 'Spree::Taxon']+ DYNAMIC_RESOURCE_TYPE = ['Spree::Product', 'Spree::Taxon', 'Spree::CmsPage']LINKED_RESOURCE_TYPE.unshift(*STATIC_RESOURCE_TYPE)LINKED_RESOURCE_TYPE.push(*DYNAMIC_RESOURCE_TYPE)