This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | N/A
| License | MIT
Commits
-------
0146289e2b [Api][Admin] Add recursively return adjustments for order item
dce6814d9c [Api][Shop][Adjustment] Ensure order item belongs to passed order
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | #15788
| License | MIT
Commits
-------
9bea130b91 [Api] Add subresource operation for orderItemUnit adjustments
32305d2ab4 [Api][Admin] Add subresource operation for shipment adjustments
56f7b2b0dd [Api] Remove collection operation of adjustments
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | N/A
| License | MIT
Commits
-------
215dc694d4 [Api][ProductTaxon] Disable the ability to update product and taxon fields on productTaxon
55a1e8c1b2 Update upgrade file
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
git merge upstream/1.13 --no-commit
```
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
change the commit title to
```
Resolve conflicts between 1.12 and 1.13
```
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | #15795
| License | MIT
Commits
-------
[Promotion] Add form type option to AsPromotionAction attribute
This PR was merged into the 1.12 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.12
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | N/A
| License | MIT
Currently, the local `sylius.storage` configuration for Flysystem creates folders in `media/image` with 700 permissions.Using the option `directory_visibility: public`, it creates them with 755 permission.
Commits
-------
[FLYSYSTEM] Add directory visibility as public to local storage
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13 <!-- see the comment below --> |
| Bug fix? | no |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no <!-- don't forget to update the UPGRADE-*.md file --> |
| License | MIT |
<!--
- Bug fixes must be submitted against the 1.12 branch
- Features and deprecations must be submitted against the 1.13 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
-->
Continuation of https://github.com/Sylius/Sylius/pull/15788
Commits
-------
Resolve comments
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13 <!-- see the comment below --> |
| Bug fix? | no |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no <!-- don't forget to update the UPGRADE-*.md file --> |
| License | MIT |
<!--
- Bug fixes must be submitted against the 1.12 branch
- Features and deprecations must be submitted against the 1.13 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
-->
Based on https://github.com/Sylius/Sylius/pull/15788
Commits
-------
fix ship shipments
[Admin][AdminUser] unify contact tests catalog
[Admin][PriceHistory] unify contract tests catalog
[Admin][Order] unify contract tests catalog
[Admin][Locale] unify contract tests catalog
[Admin][Payment] unify contract tests catalog
[Admin][ShopBillingData] unify contract tests catalog
[Shop][Payment] unify contract tests catalog
[Shop][Locale] unify contract tests catalog
[Shop][ExchangeRate] unify contract tests catalog
[Shop][Country] unify contract tests catalog
[Shop][Order] unify contract tests catalog
[Shop][Channel] unify contract tests catalog
[Shop][ShippingMethods] unify contract tests catalog
[Shop][Product] unify contract tests catalog
[Shop][Taxon] unify contract tests catalog
Move all the contract tests to parent catalog Responses and remove expected catalog
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13 <!-- see the comment below --> |
| Bug fix? | no |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no <!-- don't forget to update the UPGRADE-*.md file --> |
| Related tickets | https://github.com/Sylius/Sylius/pull/15774 |
| License | MIT |
<!--
- Bug fixes must be submitted against the 1.12 branch
- Features and deprecations must be submitted against the 1.13 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
-------
[Admin] Deprecate ShipmentEmailManager and its interface
[Shop] Deprecate ContactEmailManager and its interface
Minor improvements for ShipmentEmailManager
Extract reset password email sending to a dedicated manager
Extract account registration email sending to a dedicated manager
Extract account verification email sending to a dedicated manager
Use OrderEmailManager in SendOrderConfirmationHandler
Use ShipmentEmailManager in SendShipmentConfirmationHandler
Remove obsolete functional tests
Use ContactEmailManager in SendContactRequestHandler
[ECS] Apply ecs fixes
Move shop part of account verification template
[Upgrade] Mention constructor changes in command handlers
Unify account verification template naming in Shop and Core bundles
[Email] Move e-mail sending from SendResetPasswordEmailHandler into ResetPasswordEmailManager
[ApiBundle] Include resource objects checks in the SendAccountVerificationEmailHandler
[Test] Move isSwiftmailerTestEnv helper function into trait
[Email] Change verification email subject path
[Test] Remove swiftmailer test
[Test] Use new user verification message id
[Email] Change translation keys regarding user account verification
[CoreBundle] Add aliases to the new mailer services
[Refactor] Place the EmailManager construct arguments after the repository arguments within command handler classes
Update upgrade api file
Update upgrade file
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13 <!-- see the comment below --> |
| Bug fix? | no |
| New feature? | no |
| BC breaks? | no |
| License | MIT |
<!--
- Bug fixes must be submitted against the 1.12 branch
- Features and deprecations must be submitted against the 1.13 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
-->
Duplicating the serialization groups exposed some places where formatting is wrong [REF](https://github.com/Sylius/Sylius/pull/15803)
Commits
-------
Fix serialization groups config formatting
