[5.x] Adjustments being dropped on payment - #4346
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR addresses an order-completion edge case where Order::updateOrderPaidInformation() could unintentionally re-enable full recalculation on a now-completed order, allowing later recalculation to drop shipping adjustments (making orders appear overpaid), particularly with dynamically-registered third-party shipping methods.
Changes:
- Update
Order::updateOrderPaidInformation()to only restore the prior recalculation mode if the call did not complete the order. - Add unit tests reproducing the paid/completed “shipping adjustment dropped” scenario and asserting the corrected recalculation lock behavior.
- Add a unit test validating that dropping a shipping adjustment when a method no longer matches is expected cart behavior.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
src/elements/Order.php |
Prevents restoring recalculationMode after updateOrderPaidInformation() when the order becomes completed, keeping completed orders locked against recalculation. |
tests/unit/elements/order/OrderRecalculationTest.php |
Adds regression tests covering the paid/completed recalculation-lock scenario and related control cases. |
tests/unit/adjusters/ShippingTest.php |
Adds a focused test confirming shipping adjustments are dropped when a previously-matching method no longer matches (expected cart behavior). |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
[ci skip]
# Conflicts: # CHANGELOG.md
This file contains hidden or 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
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.
Description
Related issues
#4342