[Admin][Core] Fix calculation issues on order show #5169
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- introduced ORDER_SHIPPING_PROMOTION_ADJUSTMENT to separate shipping promotions from order promotions - apply shipping tax based on shipping total AND shipping promotions
Zales0123
changed the title
|
Not including neutral tax adjustments in the tax total is not entirely correct. Even if the taxes are included in price, we need to display the total tax amount correctly - including that tax. |
| @@ -25,3 +28,12 @@ Feature: Seeing taxes of order items | |||
| Then the order's shipping total should be "€0.00" | |||
| And the order's tax total should be "€32.20" | |||
| And the order's total should be "€252.20" | |||
|
|
|||
| @ui | |||
| Scenario: Seeing included in price taxes of order items are not counted in taxes total | |||
There was a problem hiding this comment.
Please extract this to a separate feature file.
- We should not mix included and excluded tax rates within one channel
- The background becomes too big
|
We also should have scenarios for aggregating order promotion and tax adjustments. |
|
@michalmarcinkowski Totally agreed 👍 However, maybe we could introduce them in separate PR, as it's similar but still different problem and we don't want to delay this PR? |
|
Thanks Mateusz! 👍 |
pamil
pushed a commit
to pamil/Sylius
that referenced
this pull request
May 7, 2019
…on-order-show [Admin][Core] Fix calculation issues on order show
pamil
pushed a commit
to pamil/Sylius
that referenced
this pull request
May 7, 2019
…on-order-show [Admin][Core] Fix calculation issues on order show
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR some issues on new admin order show page and introduce new logic of shipping promotions:
order shipping promotionadjustment, that replacesorder promotionusage inshipping discountaction