Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mark trigger_recollect before collectTotals #1248

Merged
merged 2 commits into from
Jan 20, 2021
Merged

mark trigger_recollect before collectTotals #1248

merged 2 commits into from
Jan 20, 2021

Conversation

empiricompany
Copy link
Contributor

Description (*)

Fix issue that causing the loop if any 3rd party payment/shipping method attempt to reloading the quote before collectTotals is ended

Related Pull Requests

#1244

Fixed Issues (if relevant)

Manual testing scenarios (*)

  1. ...
  2. ...

Questions or comments

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All automated tests passed successfully (all builds are green)

Co-authored-by: Colin Mollenhour <colin@mollenhour.com>
@empiricompany
Copy link
Contributor Author

sorry for the delay, we tested the latest suggested patch from @colinmollenhour in a high traffic / high concurrency store (about 5 orders per second), with about 10 catalog rules and with msp_cashondelivery problematic extension.
we fixed our problems, the rules are being applied in the carts, and there are no more infinite loops
so I can definitely ask for it to be merged in the future release

Copy link
Member

@colinmollenhour colinmollenhour left a comment

Choose a reason for hiding this comment

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

Thanks for the report @empiricompany!

Copy link
Contributor

@Flyingmana Flyingmana left a comment

Choose a reason for hiding this comment

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

Did not test this myself, but the logic of this change makes sense for me.
And in case an exception/error is happening, it still only leads to a new totals collect on a different request, which normally should be safe.

@Flyingmana Flyingmana merged commit bbd05be into OpenMage:1.9.4.x Jan 20, 2021
@github-actions
Copy link
Contributor

Unit Test Results

1 files  1 suites   0s ⏱️
0 tests 0 ✔️ 0 💤 0 ❌
2 runs  2 ✔️ 0 💤 0 ❌

Results for commit bbd05be.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: Sales Relates to Mage_Sales enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants