Skip to content

[ECP-9895] Fix order cancellation for redirect payments#3231

Merged
candemiralp merged 9 commits intomainfrom
ECP-9895
Jan 27, 2026
Merged

[ECP-9895] Fix order cancellation for redirect payments#3231
candemiralp merged 9 commits intomainfrom
ECP-9895

Conversation

@candemiralp
Copy link
Contributor

@candemiralp candemiralp commented Jan 22, 2026

Description

This PR fixes the bug where the orders stay on Pending state after shopper is being redirected back to Magento from a external hosted payment page.

It has been observed that an out-of-date OrderInterface object overrides the already cancelled order occurring due to incorrect order fetch method. This method has been refactored to use OrderRepository to leverage order registry to assign and consume single OrderInterface object while handling the redirect response especially on handling the /payments/details response.

Tested scenarios

  • Order cancellation after a shopper cancellation of a Klarna flow
  • Order cancellation after an incorrect 3DS2 attempt

@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello @candemiralp, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request refactors the order retrieval logic within the Controller/Return/Index class to adhere more closely to Magento's service contract architecture. By introducing and utilizing the OrderRepositoryInterface, the change promotes a more robust and maintainable approach to fetching order objects, moving away from direct model loading for a specific scenario.

Highlights

  • Dependency Injection: The OrderRepositoryInterface has been introduced and injected into the Controller/Return/Index constructor to facilitate repository-based order retrieval.
  • Order Retrieval Refinement: The getOrder method now utilizes the injected OrderRepositoryInterface to obtain the order object after initially loading by increment ID, aligning with Magento's service contract pattern.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@candemiralp candemiralp changed the title [ECP-9895] Use repository to obtain the order object [ECP-9895] Fix order cancellation for redirect payments Jan 22, 2026
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request introduces the use of OrderRepositoryInterface to obtain the order object in the getOrder method of the Index controller. This change aims to improve code maintainability and adhere to best practices by using the repository pattern for data access. I have identified a potential issue with the instantiation of the order object, which could lead to unexpected behavior. I have provided a suggestion to address this issue.

@candemiralp candemiralp marked this pull request as ready for review January 26, 2026 09:54
@candemiralp candemiralp requested a review from a team as a code owner January 26, 2026 09:54
@sonarqubecloud
Copy link

@candemiralp candemiralp merged commit d630b27 into main Jan 27, 2026
9 of 10 checks passed
@candemiralp candemiralp deleted the ECP-9895 branch January 27, 2026 15:45
@candemiralp candemiralp added the Fix Indicates a bug fix label Feb 3, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Fix Indicates a bug fix

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants