Repository navigation
[UPMERGE] 5.1 -> 2026.x - #3271
Merged
Merged
Conversation
reviseAction loaded the payment from the paymentId query parameter into $payment and then reused $payment as the loop variable over findForPayable(), which is ordered by id DESC. After the loop $payment always held the order's oldest payment, so a customer returning from a cancelled or failed payment saw the note or state message of an earlier attempt instead of the one that just happened. Pick the requested payment while iterating over the order's own payments. This also stops paymentId from loading a payment of a different order. An unknown order token passed null to findForPayable() and ended in a TypeError (HTTP 500). Return a 404 instead. Add a Behat scenario that creates a failed and then a cancelled payment and checks the revise page shows the cancelled message, plus a scenario for the unknown token.
…ent-loop [FrontendBundle] Show the requested payment on the order revise page
|
github-actions
Bot
force-pushed
the
upmerge/5.1_2026.x
branch
from
October 28, 2026 08:09
135bac3 to
270e4d7
Compare
github-actions
Bot
force-pushed
the
upmerge/5.1_2026.x
branch
from
November 5, 2026 09:15
270e4d7 to
92702e4
Compare
dpfaffenbauer
approved these changes
Nov 5, 2026
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 has been generated automatically.
Merged automatically. Conflicting Studio build artifacts, if any, were resolved in favour of
2026.x.Remember! The upmerge should always be merged with using
Merge pull requestbutton.In case of conflicts, please resolve them manually with usign the following commands: