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 | f |
| 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
-------
Update checkout.rst
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 | |
| 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
-->
This PR fixes UPGRADE-1.12.md wrong sylius version
Commits
-------
6129ae4182 Update UPGRADE-1.12.md
This PR was merged into the 1.12 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.12 |
| Bug fix? | yes |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no --> |
| Related tickets | PR #15162 |
| 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
-->
I can't update a Sylius project I have from 1.12.9 to 1.12.10 because of `symfony/service-contracts` which only accepts version: ^2.5 and i have 3.3.0.
See below the response I get when doing `composer update sylius/sylius:1.12.10`
```bash
Problem 1
- Root composer.json requires sylius/sylius ^1.12 -> satisfiable by sylius/sylius[v1.12.10].
- sylius/sylius v1.12.10 requires symfony/service-contracts ^2.5 -> found symfony/service-contracts[v2.5.0, v2.5.1, v2.5.2] but the package is fixed to v3.3.0 (lock file version) by a partial update and that version does not match. Make sure you list it as an argument for the update command.
```
Commits
-------
fc3dae072c Update composer.json
49d538c51c Update OrderBundle composer.json
6cd7fda7b0 Update Component/Core composer.json
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<!-- don't forget to update the UPGRADE-*.md file --> |
| Related tickets | after https://github.com/Sylius/Sylius/pull/15218#pullrequestreview-1583436331 |
| 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
-------
0974db215f Fix Sylius versions in UPGRADE file
This PR was merged into the 1.12 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.12 <!-- see the comment below --> |
| Bug fix? | yes |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no <!-- don't forget to update the UPGRADE-*.md file --> |
| Related tickets | fixes [#X](https://github.com/Sylius/Sylius/issues/12112) |
| 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
-------
ec4d4d890f Remove usage of defaultLocaleCode from SelectAttributeChoicesCollectionType
fd1834479d Use localeCode in ProductAttribute form to prevent logic from breaking when not using default locale
a959f7c4fc [Behat] Add scenario for checking if attribute is correctly added with values
f297799825 Update upgrade file
a9546e0081 Fix BC Break in SelectAttributeChoicesCollectionType
This PR was merged into the 1.12 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.12 or 1.13 <!-- see the comment below --> |
| Bug fix? | no |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Related tickets | fixes #X, partially #Y, mentioned in #Z |
| 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
-------
Update checkout.rst
Update docs/book/orders/checkout.rst
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<!-- don't forget to update the UPGRADE-*.md file --> |
| Related tickets | fixes#11720 |
| License | MIT |
Channel form:
<img width="661" alt="image" src="https://github.com/Sylius/Sylius/assets/6140884/0ac62417-44a7-4c38-b80c-9b2cb41141fe">
<!--
- 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
-------
[Documentation] Add note about accessing guest orders by shop user
[Admin] Add note to channel form about disabling account verification
This PR was merged into the 1.12 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.12
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | fixes#11677
| License | MIT
Commits
-------
bd61d53a88 Prevent skipping choosing payment step once skipping payment step allowed, but no payment method is available
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 |
| License | MIT
<!--
- Bug fixes must be submitted against the 1.10 branch
- Features and deprecations must be submitted against the master 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
-------
AdminBundle - Flag review on product details
[Admin] Display flag properly based on locale code
[Admin] Import flags macro in catalog promotion details page for translations
This PR was merged into the 1.12 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets |
| License | MIT
Commits
-------
f01bf57303 Remove the conflict for doctrine/orm 2.15.*
This PR was merged into the 1.12 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.12 <!-- see the comment below --> |
| Bug fix? | yes |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | yes <!-- don't forget to update the UPGRADE-*.md file --> |
| Related tickets | fixes [#X](https://github.com/Sylius/Sylius/issues/15193) |
| 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
-->
it is now possible to configure decimal amounts with comma without validation errors
Commits
-------
e85e30b553 Fix configuring amount for catalog promotions fixed discount actions
This PR was merged into the 1.12 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.12 |
| Bug fix? | yes |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Related tickets | |
| License | MIT |
When you are on the cart page and submit the "apply coupon" form and the form errors (e.g. coupon code not valid) then the cart styles are broken.
This is because when viewing the cart the data-route is set to "sylius_shop_cart_summary". When the coupon code error is shown, the data-route is set to "sylius_shop_cart_save" and thus the specific styles for the "sylius_shop_cart_summary" data-route don't match, see the screenshot:
This PR makes sure that all styles for the "sylius_shop_cart_summary" data-route also work for the "sylius_shop_cart_save" data-route, see:
Commits
-------
eac9b3ec63 Fix cart styles after form submission
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<!-- don't forget to update the UPGRADE-*.md file --> |
| Related tickets | |
| 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
-------
[Behat] Fix minor mistake in names of scenarios for receiving discount according to promotions priorities
This PR was merged into the 1.12 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.12 <!-- 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
-->
resolves https://github.com/Sylius/Sylius/pull/15195 comments
Commits
-------
6bbe87c7ff Resolve comments from SYL-2943
This PR was merged into the 1.12 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.12 |
| Bug fix? | somewhat |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Related tickets | - |
| License | MIT |
An oversight, deprecations shouldn't be added in a patch version.
Commits
-------
[Maintenance] Remove depractions from OrderPaymentProcessor
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
Commits
-------
Update catalog_promotions.rst
This PR was merged into the 1.12 branch.
Discussion
----------
| Q | A
| --------------- | -----
| Branch? | 1.9
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets |
| License | MIT
In the current code (1.8 at least) adjustment total is not being updated after shipping fee is added to order. For example in the code below:
f486b804e3/src/Sylius/Component/Core/OrderProcessing/ShippingChargesProcessor.php (L51-L59)
Recalculation is designed to happen when `$adjustment->setAmount()` is called, however the Order object is only added after. (in the last line)
Proposed fixed is to trigger `recalculateAdjustmentsTotal()` whenever adjustment is added (or removed) to order.
Commits
-------
6b69753689 Recalculate order adjustments total after adjustment is added or removed from order.
c925c28fb7 [Improvement] move recalculation to if statement, add tests
ec95d92e4a Recalculate adjustments total on OrderItem and OrderItemUnit level
