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
This PR was merged into the 1.12 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.12 |
| Bug fix? | yes |
| New feature? | kinda |
| BC breaks? | no |
| Deprecations? | no |
| Related tickets | fixes#11927, related #12437 |
| License | MIT |
Commits
-------
6582584837 [Order] Extract payments removal from OrderPaymentProcessor
d2d5734faa [Order] Add `fulfilled` as an unsupported state for OrderPaymentProcessor
c8c956cbef [Order] Make payments removing clearer and extract unavailable order states
f0116e3343 [Maintenance] Update upgrade file
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 | related #12437 |
| License | MIT |
Commits
-------
45fd398438 [Docs] Update order processing info
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 https://github.com/Sylius/Sylius/issues/11977 |
| 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
-->
`Rounding of 2.5%`
- The correct amount is saved to the database, but when we try to edit the actual amount it is showing rounded value without decimal places
before:
after:
Commits
-------
a3ff2373e9 Fix catalog promotion percentage discount to be rounded to 2 decimal places
cecee76932 Fix cart promotion percentage discount to be rounded to 2 decimal places
This PR was merged into the 1.12 branch.
Discussion
----------
`ShopBasedCartContext` now implements the new `ResettingCartContextInterface`.
The service `sylius.context.cart.new_shop_based` is no longer explicitly tagged with the `kernel.reset` tag.
Cart contexts that implement the `ResettingCartContextInterface` will be automatically tagged with the `kernel.reset` tag.
| 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#15021 ](https://github.com/Sylius/Sylius/issues/15021) |
| 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
-------
26c64dcac4 Abstracts out ShopBasedCartContext::reset to an interface
a2b9a1d3a0 Remove custom ResettingCartContextInterface
8f2aee0795 Rename the pass and preventing tagging with the kernel.reset tag twice
0911998d04 Remove leftovers after removing ResettingCartContextInterface
8eb79d79ea Declare symfony/service-contracts dependency where needed
`ShopBasedCartContext` now implements the new `ResettingCartContextInterface`.
The service `sylius.context.cart.new_shop_based` is no longer explicitly tagged with the `kernel.reset` tag.
Cart contexts that implement the `ResettingCartContextInterface` will be automatically tagged with the `kernel.reset` tag.
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
It became pointless to add a conflict for every single `doctrine/orm` version above `2.15.2`. For now, it'll conflict with every future release until we figure out where the problem is with newer versions.
Commits
-------
1d6208074d Add a conflict for doctrine/orm 2.15.2 and higher
