UNZER-523 Fix issue with orders on return from auth

OXID-eSales · Nov 20, 2024 · 9b76526 · 9b76526
1 parent 8d66a2a
commit 9b76526
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/Controller/Admin/OrderMain.php b/src/Controller/Admin/OrderMain.php
@@ -6,7 +6,7 @@
 use OxidEsales\Eshop\Core\Registry;
 use OxidSolutionCatalysts\Unzer\Model\Payment;
 use OxidSolutionCatalysts\Unzer\Service\Payment as PaymentService;
-use OxidSolutionCatalysts\Unzer\Model\Order;
+use OxidEsales\Eshop\Application\Model\Order;
 use OxidSolutionCatalysts\Unzer\Traits\ServiceContainer;
 use UnzerSDK\Exceptions\UnzerApiException;
 

diff --git a/src/Controller/DispatcherController.php b/src/Controller/DispatcherController.php
@@ -9,8 +9,9 @@
 
 use JsonException;
 use OxidEsales\Eshop\Application\Controller\FrontendController;
+use OxidEsales\Eshop\Application\Model\Order;
 use OxidEsales\Eshop\Core\Registry;
-use OxidSolutionCatalysts\Unzer\Model\Order;
+
 use OxidSolutionCatalysts\Unzer\Traits\Request;
 use OxidSolutionCatalysts\Unzer\Model\TmpOrder;
 use OxidSolutionCatalysts\Unzer\Service\Transaction;

diff --git a/src/Service/Transaction.php b/src/Service/Transaction.php
@@ -11,7 +11,7 @@
 use JsonException;
 use OxidEsales\Eshop\Application\Model\User;
 use OxidSolutionCatalysts\Unzer\Exception\UnzerException;
-use OxidSolutionCatalysts\Unzer\Model\Order;
+use OxidEsales\Eshop\Application\Model\Order;
 use OxidSolutionCatalysts\Unzer\Traits\Request;
 use OxidSolutionCatalysts\Unzer\Traits\ServiceContainer;
 use OxidEsales\Eshop\Core\DatabaseProvider;
@@ -234,7 +234,8 @@ protected function saveTransaction(array $params): bool
 
         $oxid = $this->prepareTransactionOxid($params);
 
-        if (!$transaction->load($oxid) && $this->canSaveTransaction($transaction, $params)) {
+//        if (!$transaction->load($oxid) && $this->canSaveTransaction($transaction, $params)) {
+        if (!$transaction->load($oxid)) {
             $transaction->assign($params);
             $transaction->setId($oxid);
             $transaction->save();