Skip to content

fix(cornerstone): TRAC-633 fix shipment info showing for cancelled orders#2654

Merged
mfaris9 merged 2 commits into
masterfrom
LTRAC-648
May 7, 2026
Merged

fix(cornerstone): TRAC-633 fix shipment info showing for cancelled orders#2654
mfaris9 merged 2 commits into
masterfrom
LTRAC-648

Conversation

@mfaris9
Copy link
Copy Markdown
Contributor

@mfaris9 mfaris9 commented May 6, 2026

What?

Cause: Shipment information was being displayed on the Order Details page for orders in a Cancelled state in cornerstone. This was caused because shipping address was tied to if an item was assigned a shipping address.

Fix: Gate is_shipping with order.is_complete. is_complete is flips to true once the order reaches a fulfilled lifecycle state (Shipped, Completed). The theme already trusts this field at templates/pages/account/orders/details.html to gate the "Return this order" button, so reusing it here should be safe.

Requirements

  • CHANGELOG.md entry added.

Tickets / Documentation

Screenshots (if appropriate)

Attach images or add image links here.
Screenshot 2026-05-06 at 3 24 20 PM
Screenshot 2026-05-06 at 3 24 52 PM
Screenshot 2026-05-06 at 3 25 52 PM
Screenshot 2026-05-06 at 3 26 14 PM
Screenshot 2026-05-06 at 3 26 41 PM
Screenshot 2026-05-06 at 3 25 26 PM
Screenshot 2026-05-06 at 3 26 59 PM

@mfaris9 mfaris9 requested a review from a team as a code owner May 6, 2026 20:06
@parthshahp
Copy link
Copy Markdown
Contributor

  • [1] CHANGELOG.md entry added.

Did you mean to put a 1 here? To check it off, you need to put an x. If you're not familiar with markdown syntax, there's a good guide by GitHub!

Also, like that implies, you should fill out an entry in the CHANGELOG.md file!

@parthshahp
Copy link
Copy Markdown
Contributor

🍹 As an aside (and this is purely personal preference), I wouldn't put information like this in the PR itself:

Let me know if you'd still like me to loop in the Orders PM. I'm not sure whether Alex already reached out before I picked this up. I don't think it's strictly necessary; the fix resolves the issue as expected, and the "Ship to" message now only renders when the order is Shipped or Completed (screenshots attached covering the various states). Happy to reach out to Orders if you'd prefer, just let me know.

Also, I'd appreciate any feedback on the code changes or PR itself. This is my first one here and I want to make sure I'm following Commerce's conventions.

We often use the PR to go back and quickly get context on a specific change, and information like this may not be super relevant down the line. You could always put stuff like this in Slack (as a thread on your rfcr message) or as a comment in the PR rather than in the main description.

@mfaris9 mfaris9 changed the title fix(storefront): LTRAC-648 fix shipment info showing for cancelled orders fix(storefront): TRAC-633 fix shipment info showing for cancelled orders May 6, 2026
@mfaris9 mfaris9 changed the title fix(storefront): TRAC-633 fix shipment info showing for cancelled orders fix(cornerstone): TRAC-633 fix shipment info showing for cancelled orders May 6, 2026
Copy link
Copy Markdown
Contributor

@bc-yevhenii-buliuk bc-yevhenii-buliuk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@mfaris9 mfaris9 merged commit 8939bb2 into master May 7, 2026
1 check passed
@mfaris9 mfaris9 deleted the LTRAC-648 branch May 7, 2026 14:07
@mfaris9 mfaris9 mentioned this pull request May 8, 2026
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants