Skip to content

Commit 53783e2

Browse files
committed
Fixed possible null pointer exception
1 parent 5ee8268 commit 53783e2

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

Observer/ConvertQuoteToOrderObserver.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020

2121
namespace ParadoxLabs\TokenBase\Observer;
2222

23+
use Magento\Quote\Api\Data\PaymentExtensionInterface;
24+
use Magento\Sales\Api\Data\OrderPaymentExtensionInterface;
25+
2326
/**
2427
* Custom data field conversion -- quote to order, etc, etc.
2528
*/
@@ -74,11 +77,15 @@ public function execute(\Magento\Framework\Event\Observer $observer)
7477

7578
if (!$payment->getData('tokenbase_id')) {
7679
$paymentAttributes = $payment->getExtensionAttributes();
77-
if ($paymentAttributes && $paymentAttributes->getTokenbaseId()) {
80+
if ($paymentAttributes instanceof PaymentExtensionInterface && $paymentAttributes->getTokenbaseId()) {
7881
$tokenbaseId = $paymentAttributes->getTokenbaseId();
7982
$payment->setData('tokenbase_id', $tokenbaseId);
80-
$order->getPayment()->getExtensionAttributes()->setTokenbaseId($tokenbaseId);
8183
$order->getPayment()->setData('tokenbase_id', $tokenbaseId);
84+
85+
$orderPaymentExtn = $order->getPayment()->getExtensionAttributes();
86+
if ($orderPaymentExtn instanceof OrderPaymentExtensionInterface) {
87+
$orderPaymentExtn->setTokenbaseId($tokenbaseId);
88+
}
8289
}
8390
}
8491

0 commit comments

Comments
 (0)