update: enhance transaction handling for Apple Pay by ensuring txn_id records are saved and logged properly

Author: vegimcarkaxhija

Model/Method/AbstractMethod.php

@@ -805,15 +805,36 @@ public function order(InfoInterface $payment, $amount)
 
         $this->saveTransactionData($response[0], $payment, $this->closeOrderTransaction, true);
 
+        $order = $payment->getOrder();
+        if (!empty($order) && !empty($order->getId())) {
+            try {
+                $payment->save();
+
+                $this->logger2->addDebug(sprintf(
+                    '[%s] Payment transaction persisted successfully for order: %s, transaction ID: %s',
+                    __METHOD__,
+                    $order->getIncrementId(),
+                    $payment->getTransactionId()
+                ));
+            } catch (\Exception $e) {
+                $this->logger2->addError(sprintf(
+                    '[%s] Failed to persist payment transaction - Order: %s, Transaction ID: %s, Error: %s',
+                    __METHOD__,
+                    $order->getIncrementId(),
+                    $payment->getTransactionId(),
+                    $e->getMessage()
+                ));
+                throw $e;
+            }
+        }
+
         // SET REGISTRY BUCKAROO REDIRECT
         $this->_registry->unregister('buckaroo_response');
         $this->_registry->register('buckaroo_response', $response);
 
         if (!(isset($response[0]->RequiredAction->Type) && $response[0]->RequiredAction->Type === 'Redirect')) {
             $this->setPaymentInTransit($payment, false);
         }
-
-        $order = $payment->getOrder();
         $this->helper->setRestoreQuoteLastOrder($order->getId());
 
         $this->eventManager->dispatch('buckaroo_order_after', ['order' => $order]);

Model/Push.php

@@ -275,7 +275,15 @@ public function receivePush()
 
         $this->logging->addDebug(__METHOD__ . '|1_2|');
         $orderIncrementID = $this->getOrderIncrementId();
-        $this->logging->addDebug(__METHOD__ . '|Lock Name| - ' . var_export($orderIncrementID, true));
+        $transactionKey = $this->getTransactionKey();
+
+        $this->logging->addDebug(sprintf(
+            '%s|Processing push for Order: %s, Transaction: %s',
+            __METHOD__,
+            $orderIncrementID,
+            $transactionKey
+        ));
+
         $lockAcquired = $this->lockManager->lockOrder($orderIncrementID, 5);
 
         if (!$lockAcquired) {
@@ -1294,14 +1302,47 @@ protected function getOrderByTransactionKey()
     {
         $trxId = $this->getTransactionKey();
 
-        $this->transaction->load($trxId, 'txn_id');
-        $order = $this->transaction->getOrder();
+        $this->searchCriteriaBuilder->addFilter('txn_id', $trxId, 'eq');
+        $searchCriteria = $this->searchCriteriaBuilder->create();
 
-        if (!$order) {
+        try {
+            $transactionList = $this->transactionRepository->getList($searchCriteria);
+            $items = $transactionList->getItems();
+
+            if (empty($items)) {
+                $this->logging->addError(sprintf(
+                    '%s|No transaction found for txn_id: %s. This may indicate the transaction was not saved properly or a database transaction was rolled back.',
+                    __METHOD__,
+                    $trxId
+                ));
+                throw new Exception(__('There was no order found by transaction Id'));
+            }
+
+            // Get the first (and should be only) transaction
+            $transaction = reset($items);
+            $order = $transaction->getOrder();
+
+            if (!$order || !$order->getId()) {
+                $this->logging->addError(sprintf(
+                    '%s|Transaction found but order is missing for txn_id: %s. Transaction ID: %s',
+                    __METHOD__,
+                    $trxId,
+                    $transaction->getTransactionId()
+                ));
+                throw new Exception(__('There was no order found by transaction Id'));
+            }
+
+            return $order;
+
+        } catch (\Exception $e) {
+            $this->logging->addError(sprintf(
+                '%s|Error loading transaction by txn_id: %s. Error: %s',
+                __METHOD__,
+                $trxId,
+                $e->getMessage()
+            ));
             throw new Exception(__('There was no order found by transaction Id'));
         }
-
-        return $order;
     }
 
     /**