Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions config/fixtures/1_collection.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
sylius_fixtures:
suites:
cms:
listeners:
logger: ~
default:
fixtures:
collection:
priority: -10
options:
custom:
blog:
Expand Down
8 changes: 4 additions & 4 deletions config/fixtures/1_glasses.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
sylius_fixtures:
suites:
cms:
listeners:
logger: ~
default:
fixtures:
glasses:
name: taxon
priority: -10
options:
custom:
category:
code: 'MENU_CATEGORY'
code: 'category'
name: 'Category'
translations:
en_US:
Expand All @@ -26,6 +25,7 @@ sylius_fixtures:
fr_FR:
name: 'Lunettes'
product:
priority: -10
options:
custom:
sunshine_vision_glasses:
Expand Down
5 changes: 2 additions & 3 deletions config/fixtures/1_media.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ parameters:

sylius_fixtures:
suites:
cms:
listeners:
logger: ~
default:
fixtures:
media:
priority: -10
options:
custom:
mid_season_sale_banner:
Expand Down
5 changes: 2 additions & 3 deletions config/fixtures/1_template.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
sylius_fixtures:
suites:
cms:
listeners:
logger: ~
default:
fixtures:
template:
priority: -10
options:
custom:
homepage:
Expand Down
5 changes: 2 additions & 3 deletions config/fixtures/2_block.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
sylius_fixtures:
suites:
cms:
listeners:
logger: ~
default:
fixtures:
block:
priority: -10
options:
custom:
homepage_new_collection_header:
Expand Down
7 changes: 3 additions & 4 deletions config/fixtures/2_page.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
sylius_fixtures:
suites:
cms:
listeners:
logger: ~
default:
fixtures:
page:
priority: -10
options:
custom:
faq:
Expand Down Expand Up @@ -482,7 +481,7 @@ sylius_fixtures:
<p>Summer 2025 proves that the modern woman can have it all - effortless style that works from beach to boardroom, sustainable choices that feel as good as they look, and versatile pieces that adapt to any adventure. Whether you're embracing Riviera elegance or streetwear, this season's trends celebrate comfort without compromising sophistication. The best part? These aren't just trends to follow, but building blocks for a wardrobe that truly reflects who you are.</p>

blog_post_3:
name: ""
name: "The Modern Man's Summer Playbook"
channels:
- "FASHION_WEB"
collections:
Expand Down
2 changes: 2 additions & 0 deletions config/routes/shop/page.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ sylius_cms_shop_page_show:
methods: [GET]
defaults:
_controller: sylius_cms.controller.page.overriden::showAction
requirements:
slug: .+(?<!/)

sylius_cms_shop_collections_page_index:
path: /collections/{code}/pages
Expand Down
9 changes: 9 additions & 0 deletions features/shop/displaying_page.feature
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,12 @@ Feature: Displaying pages
And this page also has "title" slug
When I go to this page
Then I should see page title "United States"

@ui
Scenario: Displaying page with a nested slug containing a slash
Given there is a page in the store
And this page has "Article one" name
And this page also has "Article one" title
And this page also has "articles/article1" slug
When I go to the "articles/article1" page
Then I should see a page with "Article one" name
2 changes: 1 addition & 1 deletion templates/admin/shared/preview/render.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<div class="modal-dialog modal-lg modal-dialog-centered" style="width: 95%; max-width: 95vw;">
<div class="modal-content" data-live-ignore>
<div class="modal-header justify-content-center">
<div class="d-flex">
<div class="d-flex gap-4">
{{ form_widget(hookable_metadata.context.form.localeCode, {'attr': {'data-model': 'norender|localeCode'}}|sylius_merge_recursive(sylius_test_form_attribute('locale-code'))) }}
<button
class="btn btn-ghost-primary"
Expand Down
Loading