This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/2.1/.github/workflows/upmerge_pr.yaml).
**Remember!** The upmerge should always be merged with using `Merge pull
request` button.
In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/2.2 -m "Resolve conflicts between 2.1 and 2.2"
```
If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/Sylius` repository.
Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/2.1/.github/workflows/upmerge_pr.yaml).
**Remember!** The upmerge should always be merged with using `Merge pull
request` button.
In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/2.2 -m "Resolve conflicts between 2.1 and 2.2"
```
If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/Sylius` repository.
Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.
This is a continuation of pull request
https://github.com/Sylius/Sylius/pull/18477
| Q | A
|-----------------|-----
| Branch? | 2.1
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | https://github.com/Sylius/Sylius/issues/18384
| License | MIT
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
* **Bug Fixes**
* Parent taxon autocomplete search is now case-insensitive for more
reliable results.
* **New Features**
* Admin taxon form returns richer autocomplete results for parent
selection.
* Added UI actions to search and verify parent taxon results.
* Support for creating taxons with explicit codes where needed.
* **Tests**
* New BDD tests covering case-insensitive parent taxon autocomplete and
related scenarios.
<sub>✏️ Tip: You can customize this high-level summary in your review
settings.</sub>
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
| Q | A
|-----------------|-----
| Branch? | 2.1
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | https://github.com/Sylius/Sylius/issues/17718
| License | MIT
I reproduced error when chose nl_NL and ran command bin/console
sylius:install. Bug was caused lack translations for taxons.
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
* **Bug Fixes**
* Admin product list now correctly handles products whose main category
has no name — tooltips and category display no longer error or show
incorrect content.
* **Tests**
* Added a UI scenario and step coverage to verify browsing products with
unnamed main categories in the admin interface.
<sub>✏️ Tip: You can customize this high-level summary in your review
settings.</sub>
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/2.1/.github/workflows/upmerge_pr.yaml).
**Remember!** The upmerge should always be merged with using `Merge pull
request` button.
In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/2.2 -m "Resolve conflicts between 2.1 and 2.2"
```
If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/Sylius` repository.
Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.
| Q | A
|-----------------|-----
| Branch? | 2.1
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | ref #18396
| License | MIT
Migrates admin feature scenarios from `@javascript` (Panther) to
`@mink:chromedriver` tags. This is part of gradual migration to unified
Chromedriver-based testing.
Changes 20 scenarios across 8 admin feature files:
- Impersonating customers
- Managing product options
- Managing taxons (browsing, editing slugs)
- Managing countries and provinces
Ref: #18396
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
* **Tests**
* Updated test execution infrastructure across multiple test suites to
improve automation consistency and reliability.
<sub>✏️ Tip: You can customize this high-level summary in your review
settings.</sub>
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/2.1/.github/workflows/upmerge_pr.yaml).
**Remember!** The upmerge should always be merged with using `Merge pull
request` button.
In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/2.2 -m "Resolve conflicts between 2.1 and 2.2"
```
If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/Sylius` repository.
Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/2.1/.github/workflows/upmerge_pr.yaml).
**Remember!** The upmerge should always be merged with using `Merge pull
request` button.
In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/2.2 -m "Resolve conflicts between 2.1 and 2.2"
```
If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/Sylius` repository.
Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.
- Added Sylius license headers to migration files.
- Removed `gedmo:sortable-position` from `priority` field in Zone ORM mapping.
- Updated Behat scenario to reflect changes in zone priority expectations.
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/2.1/.github/workflows/upmerge_pr.yaml).
**Remember!** The upmerge should always be merged with using `Merge pull
request` button.
In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/2.1 -m "Resolve conflicts between 2.0 and 2.1"
```
If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/Sylius` repository.
Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.
| Q | A
|-----------------|-----
| Branch? | 1.14
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | fixes https://github.com/Sylius/Sylius/issues/17704
| License | MIT
- Block incompatible versions of symfony/ux-live-component (2.28.0,
2.28.1, 2.29.*) in the conflict section to prevent compatibility issues.
- Resolves the issue of address data being cleared from the checkout
after logging in during the addressing step.
- The problem occurs for symfony/ux-live-components > 2.28.2
| Q | A
|---------------- -|-----
| Branch? | 2.0 or 2.1
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| License | MIT
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
- New Features
- No user-facing feature changes in this release.
- Chores
- Updated dependency constraints to allow only patch releases of
symfony/ux-live-component 2.29, aiming to improve stability and reduce
unexpected regressions. No runtime behavior changes expected.
- Tests
- Marked a checkout sign-in scenario as failing to track a known issue
during the addressing step. This change affects test reporting only and
does not impact production functionality.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/2.1/.github/workflows/upmerge_pr.yaml).
**Remember!** The upmerge should always be merged with using `Merge pull
request` button.
In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/2.1 -m "Resolve conflicts between 2.0 and 2.1"
```
If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/Sylius` repository.
Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
- **Bug Fixes**
- Corrected product and variant names shown in order item details to use
the item’s data; product images, links, and variant codes remain
unchanged.
- **New Features**
- Added zone-based shipping eligibility check to prevent selecting
shipping methods that don't match the order's shipping zone.
- Added Behat step to change a shipping method's zone.
- **Tests**
- Added unit tests for zone eligibility and Gherkin scenarios covering
shipping-zone-related checkout behavior.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
| Q | A
|-----------------|-----
| Branch? | 1.14
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | fixes#17862
| License | MIT
This PR is based on the work of @delyriand from PR #17864 and completes
the implementation.
Prerequisites:
- Create one cart promotion with 20$ order fixed discount without rule
- Create one cart promotion with 80$ order fixed discount without rule
- Add to cart 3 items of 10.56$
- Add to cart 1 item of 60$
Before the fix:
<img width="720" height="355" alt="image"
src="https://github.com/user-attachments/assets/669ed562-1a17-4db1-b5b2-9c431a336013"
/>
After:
<img width="720" height="283" alt="image"
src="https://github.com/user-attachments/assets/50239e2a-8918-4d00-803b-03d9475668b9"
/>
