Skip to content

Commit eb688d0

Browse files
authored
rolls back try catch in order extension observer (#295)
1 parent 3765616 commit eb688d0

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

Observer/Order/SaveOrderExtensionDataObserver.php

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use Magento\Framework\Event\Observer;
1212
use Magento\Framework\Event\ObserverInterface;
1313
use Psr\Log\LoggerInterface;
14-
use Throwable;
14+
use Exception;
1515

1616
/**
1717
* Save order extension data.
@@ -72,27 +72,27 @@ public function __construct(
7272
*/
7373
public function execute(Observer $observer)
7474
{
75+
$order = $observer->getEvent()->getOrder();
76+
if ($order->getPayment()->getMethod() !== Service::CODE) {
77+
return;
78+
}
79+
$orderId = (int)$order->getEntityId();
80+
$publicOrderId = $this->checkoutSession->getBoldCheckoutData()['data']['public_order_id'] ?? null;
81+
$this->checkoutSession->setBoldCheckoutData(null);
82+
if (!$publicOrderId) {
83+
$this->logger->error('Public order id for order ID = ' . $order->getId() . 'is missing.');
84+
return;
85+
}
86+
$orderExtensionData = $this->orderExtensionDataFactory->create();
87+
$orderExtensionData->setOrderId($orderId);
88+
$orderExtensionData->setPublicId($publicOrderId);
89+
$this->eventManager->dispatch(
90+
'checkout_save_order_extension_data_before',
91+
['order' => $order, 'orderExtensionData' => $orderExtensionData]
92+
);
7593
try {
76-
$order = $observer->getEvent()->getOrder();
77-
if ($order->getPayment()->getMethod() !== Service::CODE) {
78-
return;
79-
}
80-
$orderId = (int)$order->getEntityId();
81-
$publicOrderId = $this->checkoutSession->getBoldCheckoutData()['data']['public_order_id'] ?? null;
82-
$this->checkoutSession->setBoldCheckoutData(null);
83-
if (!$publicOrderId) {
84-
$this->logger->error('Public order id for order ID = ' . $order->getId() . 'is missing.');
85-
return;
86-
}
87-
$orderExtensionData = $this->orderExtensionDataFactory->create();
88-
$orderExtensionData->setOrderId($orderId);
89-
$orderExtensionData->setPublicId($publicOrderId);
90-
$this->eventManager->dispatch(
91-
'checkout_save_order_extension_data_before',
92-
['order' => $order, 'orderExtensionData' => $orderExtensionData]
93-
);
9494
$this->orderExtensionDataResource->save($orderExtensionData);
95-
} catch (Throwable $e) {
95+
} catch (Exception $e) {
9696
$this->logger->error($e->getMessage());
9797
return;
9898
}

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"license": [
66
"MIT"
77
],
8-
"version": "1.1.37",
8+
"version": "1.1.38",
99
"require": {
1010
"ext-curl": "*",
1111
"magento/framework": ">=102.0.1 <103.0.8",

0 commit comments

Comments
 (0)