MAGE-536: Fix TxStatus association with relevant OrderId

PAYONE-GmbH · May 30, 2024 · 5231b7f · 5231b7f
1 parent 437f671
commit 5231b7f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/...ode/community/Payone/Core/Model/Domain/Resource/Protocol/TransactionStatus/Collection.php b/...ode/community/Payone/Core/Model/Domain/Resource/Protocol/TransactionStatus/Collection.php
@@ -49,6 +49,9 @@ public function _construct()
     public function getByOrder(Mage_Sales_Model_Order $order)
     {
         $this->addFieldToFilter('order_id', $order->getId());
+        if ($order->getData('increment_id') != 0) {
+            $this->addFilter('reference', $order->getData('increment_id'), 'or');
+        }
     }
 
     /**

diff --git a/app/code/community/Payone/Core/controllers/TransactionStatusController.php b/app/code/community/Payone/Core/controllers/TransactionStatusController.php
@@ -79,6 +79,27 @@ public function indexAction()
             // Handle Request:
             $response = $service->handleByPost();
 
+            /**
+             * MAGE-536 : Fix missing OrderId and StoreId in TxStatus when reference exists
+             */
+            if ($response->getStatus() == 'TSOK') {
+                /** @var $transactionStatusCollection Payone_Core_Model_Domain_Resource_Protocol_TransactionStatus_Collection */
+                $transactionStatusCollection = Mage::getModel('payone_core/domain_protocol_transactionStatus')
+                    ->getCollection();
+                $transactionStatusCollection->getItemsByColumnValue('reference', $reference);
+
+                /** @var Payone_Core_Model_Domain_Protocol_TransactionStatus $transactionStatus */
+                foreach ($transactionStatusCollection as $transactionStatus) {
+                    if (empty($transactionStatus->getOrderId())) {
+                        $transactionStatus->setOrderId($order->getId());
+                    }
+                    if (empty($transactionStatus->getStoreId())) {
+                        $transactionStatus->setStoreId($order->getStoreId());
+                    }
+                    $transactionStatus->save();
+                }
+            }
+
             // NEW forwarding handling
             $this->_forwardStatus($order);