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.

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

PISHPS-336: fix webhook error because of timing issues #833

Merged
merged 1 commit into from
Sep 11, 2024
Merged

PISHPS-336: fix webhook error because of timing issues #833

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
12 changes: 10 additions & 2 deletions src/Controller/Storefront/Webhook/NotificationFacade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,15 @@ public function onNotify(string $swTransactionId, Context $context): void
throw new \Exception('Transaction ' . $swTransactionId . ' not found in Shopware');
}

# Apple pay direct creates a payment and then updates order/transaction custom fields, sometimes the webhook is quicker than the process. so we wait once and then read the custom fields again
if ($swTransaction->getCustomFields() === null) {
sleep(2);
$swTransaction = $this->getTransaction($swTransactionId, $context);
if (!$swTransaction instanceof OrderTransactionEntity) {
throw new \Exception('Transaction ' . $swTransactionId . ' not found in Shopware');
}
}

# -----------------------------------------------------------------------------------------------------

$swOrder = $swTransaction->getOrder();
Expand Down Expand Up @@ -285,8 +294,7 @@ public function onNotify(string $swTransactionId, Context $context): void
*/
private function getTransaction(string $transactionId, Context $context): ?OrderTransactionEntity
{
$criteria = new Criteria();
$criteria->addFilter(new EqualsFilter('id', $transactionId));
$criteria = new Criteria([$transactionId]);
$criteria->addAssociation('order');
$criteria->addAssociation('order.salesChannel');
$criteria->addAssociation('order.lineItems');
Expand Down
Loading