This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.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.0 -m "Resolve conflicts between 1.14 and 2.0"
```
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 was merged into the api-platform-3 branch.
Discussion
----------
| Q | A
|-----------------|-----
| Branch? | api-platform-3
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | n/a
| License | MIT
Commits
-------
[Api][Admin] Enable Order resource
[Api][Admin] section after the type of service
This PR was merged into the 2.0 branch.
Discussion
----------
| Q | A
|-----------------|-----
| Branch? | 2.0 <!-- see the comment below -->
| Bug fix? | no
| New feature? | yes
| BC breaks? | no
| Deprecations? | no <!-- don't forget to update the UPGRADE-*.md file -->
| License | MIT
<!--
- Bug fixes must be submitted against the 1.13 branch
- Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted against the 2.0 branch
- Make sure that the correct base branch is set
To be sure you are not breaking any Backward Compatibilities, check the documentation:
https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->
Commits
-------
[Behat] Enable all hybrid checkout scenarios except one
[Admin] Render currency test attribute
[Behat] Enable hybrid catalog promotion scenarios
[Behat] Enable editing product option scenario
[Behat] Enable remaining managing users scenario
[Behat] Enable deleting multiple product variants scenario
[Behat] Enable viewing product in store from variant edit page scenarios
[Behat] Improve view product in store action
[Admin] Render view in store button in the variant edit page
[Behat] Enable scenarios and improve implementation for filtered pages redirections
[Admin] Render pagination and enabled filter test attributes
[Behat] Use test attribute to retrieve order notes
[Admin] Add missing order notes information
[Admin] Configure and use anonymous view in store component
This PR was merged into the api-platform-3 branch.
Discussion
----------
| Q | A
|-----------------|-----
| Branch? | api-platform-3
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | n/a
| License | MIT
<!--
- Bug fixes must be submitted against the 1.13 branch
- Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted against the 2.0 branch
- Make sure that the correct base branch is set
To be sure you are not breaking any Backward Compatibilities, check the documentation:
https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->
Commits
-------
[API] Enable Taxon tests
[API] Fix normalisation group
[API] TaxonTranslation cleanup
[API] Enable behat scenarios
[API] Make taxon translation subresource
[API] Remove unnecessary properties
[API] Remove legacy configuration
[API] Revert properties removal
Remove normalization from NotExposed operation
