Skip to content

Legacy mode fix: release reserved increment_id after cancel/submit to… #1964

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.

Sign up for GitHub

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

Merged
garmashdev merged 1 commit into from
May 20, 2026
+18 −0
Merged

Legacy mode fix: release reserved increment_id after cancel/submit to… #1964

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions Helper/Order.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,6 +1222,13 @@ public function dispatchPostCheckoutEvents($order, $quote)
]
);

// Release the reserved increment id after a successful submit so any
// subsequent getBoltpayOrder call on the same (admin) session reserves
// a fresh one and does not trip doesOrderExist() on the placed order.
// Must run AFTER checkout_submit_all_after so observers still see the id.
$quote->setBoltReservedOrderId(null);
$quote->setReservedOrderId(null);

// Set dispatched to be true. Prevents dispatching more then once.
$quote->setBoltDispatched(true);
$this->cartHelper->quoteResourceSave($quote);
Expand Down Expand Up @@ -2779,6 +2786,17 @@ public function cancelFailedPaymentOrder($displayId, $immutableQuoteId)
$parentQuote->setBoltCheckoutType(CartHelper::BOLT_CHECKOUT_TYPE_PPC);
$this->cartHelper->quoteResourceSave($parentQuote->setIsActive(false));
}

// Release the reserved increment id so a retry on the same session
// reserves a fresh one. Without this, doesOrderExist() keeps finding
// the canceled order by increment_id and the merchant sees the
// "Order was created. Please reload the page and try again" popup.
if ($parentQuote) {
$parentQuote->setBoltReservedOrderId(null);
$parentQuote->setReservedOrderId(null);
$this->cartHelper->quoteResourceSave($parentQuote);
}

$this->eventsForThirdPartyModules->dispatchEvent("beforeFailedPaymentOrderSave", $order);

$order->addData(['quote_id' => null]);
Expand Down