From 8a263d2b53156f978323922b0a822b1c578c824e Mon Sep 17 00:00:00 2001 From: "v.carkaxhija" Date: Thu, 30 Jan 2025 16:25:33 +0100 Subject: [PATCH] remove klarnakp check --- Model/Service/Order.php | 2 ++ Observer/HtmlTransactionIdObserver.php | 30 ++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/Model/Service/Order.php b/Model/Service/Order.php index 26912dc69..e3173909f 100644 --- a/Model/Service/Order.php +++ b/Model/Service/Order.php @@ -230,6 +230,8 @@ public function cancel($order, $statusCode) $statusCode, $order ); + $this->logging->addDebug(__METHOD__ . '|vegiiiiiiiiiiiiiiiiiiiii|'); + $this->logging->addDebug($failedStatus); if ($failedStatus) { $order->setStatus($failedStatus); diff --git a/Observer/HtmlTransactionIdObserver.php b/Observer/HtmlTransactionIdObserver.php index e26bc9300..1ebfcf12d 100644 --- a/Observer/HtmlTransactionIdObserver.php +++ b/Observer/HtmlTransactionIdObserver.php @@ -23,9 +23,26 @@ use Magento\Framework\Event\Observer; use Magento\Framework\Event\ObserverInterface; use Magento\Sales\Api\Data\OrderPaymentInterface; +use Magento\Sales\Api\Data\TransactionInterface; +use Magento\Sales\Api\TransactionRepositoryInterface; +use Magento\Sales\Model\Order\Payment\Transaction; class HtmlTransactionIdObserver implements ObserverInterface { + /** + * @var TransactionRepositoryInterface + */ + private $transactionRepository; + + /** + * Example constructor injection if you want your own logger: + * (If you already have a logger property, just reuse that.) + */ + public function __construct( + TransactionRepositoryInterface $transactionRepository + ) { + $this->transactionRepository = $transactionRepository; + } /** * Update txn_id to a link for the plaza transaction * @@ -34,7 +51,7 @@ class HtmlTransactionIdObserver implements ObserverInterface */ public function execute(Observer $observer) { - /** @var \Magento\Sales\Model\Order\Payment\Transaction $transaction */ + /** @var Transaction $transaction */ $transaction = $observer->getDataObject(); $order = $transaction->getOrder(); @@ -42,7 +59,16 @@ public function execute(Observer $observer) $txnId = reset($txnIdArray); if ($this->isBuckarooPayment($order->getPayment()) && $txnId !== false) { - if($transaction->getTxnType() == 'authorization'){ + $txtType = $transaction->getTxnType(); + if ($transaction->getTxnType() === TransactionInterface::TYPE_VOID) { + $parentId = $transaction->getParentId(); + $parentTransaction = $this->transactionRepository->get($parentId); + if ($parentTransaction) { + $txtType = $parentTransaction->getTxnType(); + } + } + + if($txtType == 'authorization'){ $transaction->setData('html_txn_id', sprintf( '%s',