Fix for Issue #35382 - Order state stuck in 'Payment Review'

[itmsenior]

Description (*)

Ensures order state is correctly updated after IPN capture when order was previously in 'Payment Review' state.

Related Pull Requests

Fixed Issues (if relevant)

1. Fixes Order state stuck in 'Payment_review' after IPN update from PayPal #35382

Manual testing scenarios (*)

1. Place PayPal order and generate 'Payment Review' state
2. Send IPN capture notification via IPN endpoint

Contribution checklist (*)

• Pull request has a meaningful description of its purpose
• All commits are accompanied by meaningful commit messages
• All new or changed code is covered with unit/integration tests (if applicable)
• README.md files for modified modules are updated and included in the pull request if any README.md predefined sections require an update
• All automated tests passed successfully (all builds are green)

[m2-assistant]

Hi @itmsenior. Thank you for your contribution
Here are some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

• @magento give me test instance - deploy test instance based on PR changes
• @magento give me 2.4-develop instance - deploy vanilla Magento instance

❗ Automated tests can be triggered manually with an appropriate comment:

• @magento run all tests - run or re-run all required tests against the PR changes
• @magento run <test-build(s)> - run or re-run specific test build(s)
  For example: @magento run Unit Tests

<test-build(s)> is a comma-separated list of build names. Allowed build names are:

1. Database Compare
2. Functional Tests CE
3. Functional Tests EE,
4. Functional Tests B2B
5. Integration Tests
6. Magento Health Index
7. Sample Data Tests CE
8. Sample Data Tests EE
9. Sample Data Tests B2B
10. Static Tests
11. Unit Tests
12. WebAPI Tests
13. Semantic Version Checker

You can find more information about the builds here

ℹ️ Run only required test builds during development. Run all test builds before sending your pull request for review.

For more details, review the Magento Contributor Guide documentation.

⚠️ According to the Magento Contribution requirements, all Pull Requests must go through the Community Contributions Triage process. Community Contributions Triage is a public meeting.

🕙 You can find the schedule on the Magento Community Calendar page.

📞 The triage of Pull Requests happens in the queue order. If you want to speed up the delivery of your contribution, join the Community Contributions Triage session to discuss the appropriate ticket.

✏️ Feel free to post questions/proposals/feedback related to the Community Contributions Triage process to the corresponding Slack Channel

[itmsenior]

@magento run all tests

[magento-automated-testing]

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please re-request them if they don't show in a reasonable amount of time.

[tobias-forkel]

Just a random thought. In order to support custom statuses from System > Order Status it would be great to have those options configurable in System > Configuration. The system.xml file is already there vendor/magento/module-sales/etc/adminhtml/system.xml.

$stateConfig =  explode(',' $this->scopeConfig->getValue('sales/payment/status_processing'));
$stateProcess = [Order::STATE_NEW, Order::STATE_PENDING_PAYMENT];

if (!empty($stateConfig)) {
$stateProcess = array_merge($stateProcess, $stateConfig);
}

if (in_array($state, $stateProcess)) {
$state = Order::STATE_PROCESSING;
}

or at least cleaned up.

$stateProcess = [Order::STATE_NEW, Order::STATE_PENDING_PAYMENT, Order::STATE_PAYMENT_REVIEW];

if (in_array($state, $stateProcess)) {

}

[Den4ik]

Hey @itmsenior
Thanks for PR.
Please look at failed Static Tests

[itmsenior]

@tobias-forkel Do you want to open a PR with your requested changes and I'll close this one? Or I can update this PR with your suggestions.

[engcom-Charlie]

@magento run all tests

[magento-automated-testing]

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please re-request them if they don't show in a reasonable amount of time.

[engcom-Charlie]

Hi @itmsenior,

Thank you for your contribution!

I will look into the build failures.

Thank you!

[engcom-Charlie]

Hi @Den4ik,

Thank you for your contribution!

Worked on the build failure. Fixed failed static tests. Please review.

Thank you!

[engcom-Charlie]

@magento run all tests

[magento-automated-testing]

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please re-request them if they don't show in a reasonable amount of time.

[superdav42]

After 2 years a 1 line PR is not approved which fixes a critical bug for merchants? What is going on with Magento?

[Den4ik]

@magento run all tests

[Den4ik]

@magento run all tests

[Den4ik]

@magento run Static Tests

[Den4ik]

@magento run Static Tests

[Den4ik]

@magento run all tests

[Den4ik]

Hi @itmsenior
Could you please review Static Tests failure.

[lbajsarowicz]

@Den4ik @itmsenior — this has been waiting on the Static Tests failure since 2022 and the issue (#35382) is still open and reproducible.

@itmsenior, if you are still around and want to finish it, it is yours — please say so and I will step back. Otherwise I will pick it up: rebase on 2.4-develop, fix the static violation, and add the integration test that is still missing. I will open a separate PR from my fork so your authorship here stays intact, and link it from this one.

[lbajsarowicz]

Opened #41165 which continues this PR — rebased onto current 2.4-develop, your commits and authorship preserved (and @engcom-Charlie's static-test fix carried over), plus the integration test that was missing.

For the record, the Static Tests blocker here was already resolved: @engcom-Charlie fixed the long line in 72cfce911ef back in June 2022. There are no check-runs or statuses left on any commit in this PR, so the later "run Static Tests" requests were re-running expired CI on a branch that had fallen behind, not reporting a new violation.

@itmsenior thanks for the original fix. @Den4ik #41165 should be ready for review.