Merged
Conversation
When cancelling all items in a completed order, if the shipment is not already shipped, it should be marked as cancelled. However, if the shipment has already shipped, we should maintain its state because we treat that state as immutable.
At least, in terms of the state. We shouldn't mark shipped shipments as cancelled even if all of the items in the shipment get cancelled. If a shipment has been marked as shipped, then we need to preserve that state.
github-actions
bot
added
the
changelog:solidus_core
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #6321 +/- ##
=======================================
Coverage 89.35% 89.35%
=======================================
Files 961 961
Lines 20192 20192
=======================================
Hits 18043 18043
Misses 2149 2149 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
jarednorman
approved these changes
Sep 8, 2025
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
3 participants
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.
Summary
Adds some missing test coverage to ensure that when all items in a shipment are cancelled, it is correctly marked as cancelled. Unless the shipment has already been shipped, in that case we should maintain the existing state.
Related to #6314 and #6316.
Checklist
Check out our PR guidelines for more details.
The following are mandatory for all PRs:
The following are not always needed: