UNZER-523 Fix issue with orders on return from auth

src/PaymentExtensions/UnzerPayment.php

@@ -429,7 +429,7 @@ private function performTransactionForSavedPayment(
                 false,
                 null,
                 null,
-                \UnzerSDK\Constants\RecurrenceTypes::ONE_CLICK
+                RecurrenceTypes::ONE_CLICK
             );
         }
 

src/Service/Payment.php

@@ -8,6 +8,7 @@
 namespace OxidSolutionCatalysts\Unzer\Service;
 
 use Exception;
+use OxidEsales\Eshop\Application\Model\Order;
 use OxidEsales\Eshop\Application\Model\Payment as PaymentModel;
 use OxidEsales\Eshop\Core\Exception\DatabaseConnectionException;
 use OxidEsales\Eshop\Core\Exception\DatabaseErrorException;
@@ -19,7 +20,7 @@
 use OxidSolutionCatalysts\Unzer\Exception\RedirectWithMessage;
 use OxidSolutionCatalysts\Unzer\Exception\UnzerException;
 use OxidSolutionCatalysts\Unzer\Model\TmpOrder;
-use OxidSolutionCatalysts\Unzer\Model\Order;
+
 use OxidSolutionCatalysts\Unzer\PaymentExtensions\UnzerPayment as AbstractUnzerPayment;
 use OxidSolutionCatalysts\Unzer\Service\Transaction as TransactionService;
 use stdClass;

src/Service/Transaction.php

@@ -215,7 +215,7 @@ public function writeChargeToDB(string $orderid, string $userId, ?Charge $unzerC
      */
     protected function prepareTransactionOxid(array $params): string
     {
-        unset($params['oxactiondate'], $params['serialized_basket'], $params['customertype']);
+        unset($params['oxactiondate'], $params['oxtimestamp'], $params['serialized_basket'], $params['customertype']);
 
         /** @var string $jsonEncode */
         $jsonEncode = json_encode($params, JSON_THROW_ON_ERROR);
@@ -228,22 +228,19 @@ protected function prepareTransactionOxid(array $params): string
     protected function saveTransaction(array $params): bool
     {
         $result = false;
-
         $transaction = $this->getNewTransactionObject();
 
-        //check if metadata exists
         $params['metadata'] = $params['metadata'] ?? json_encode('', JSON_THROW_ON_ERROR);
 
-        // building oxid from unique index columns
-        // only write to DB if oxid doesn't exist to prevent multiple entries of the same transaction
         $oxid = $this->prepareTransactionOxid($params);
-        if (!$transaction->load($oxid)) {
+
+        if (!$transaction->load($oxid) && $this->canSaveTransaction($transaction, $params)) {
             $transaction->assign($params);
             $transaction->setId($oxid);
             $transaction->save();
-
             $result = true;
         }
+
         return $result;
     }
 
@@ -706,4 +703,33 @@ private function extendSaveParameters(
                 ->getTransactionParameters($unzerPayment)
         );
     }
+
+    private function canSaveTransaction($transaction, array $params): bool
+    {
+        $orderId = $params['oxorderid'] ?? '';
+        if (!$orderId) {
+            return true;
+        }
+
+        $transactionId = $this->getTransactionIdByOrderId($orderId);
+        if (!$transactionId) {
+            return true;
+        }
+
+        $transactionLoaded = $transaction->load($transactionId);
+        if (!$transactionLoaded) {
+            return true;
+        }
+
+        if (
+            $transaction->getFieldData('oxorderid') === $params['oxorderid']
+            && $transaction->getFieldData('traceid') === $params['traceid']
+            && $transaction->getFieldData('shortid') === $params['shortid']
+
+        ) {
+            return false;
+        }
+
+        return true;
+    }
 }