Skip to content

Commit

Permalink
NTR: PISHPS-336: fix webhook error because of timing issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Vitalij Mik committed Sep 11, 2024
1 parent e3f43c4 commit 434965f
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions src/Controller/Storefront/Webhook/NotificationFacade.php
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

0 comments on commit 434965f

Please sign in to comment.