UNZER-523 Fix issue with orders on return from auth

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);
@@ -232,18 +232,15 @@ protected function saveTransaction(array $params): bool
 
         $params['metadata'] = $params['metadata'] ?? json_encode('', JSON_THROW_ON_ERROR);
 
-        $oxid = $this->getTransactionIdByOrderId($params['oxorderid']);
+        $oxid = $this->prepareTransactionOxid($params);
 
-        if (!$oxid) {
-            $oxid = $this->prepareTransactionOxid($params);
-        }
-
-        if (!$transaction->load($oxid)) {
+        if (!$transaction->load($oxid) && $this->canSaveTransaction($params)) {
             $transaction->assign($params);
+            $transaction->setId($oxid);
             $transaction->save();
-
             $result = true;
         }
+
         return $result;
     }
 
@@ -706,4 +703,26 @@ private function extendSaveParameters(
                 ->getTransactionParameters($unzerPayment)
         );
     }
+
+    private function canSaveTransaction(array $params): bool
+    {
+        $orderId = $params['oxorderid'] ?? '';
+        if (!$orderId) {
+            return true;
+        }
+
+        $transactionId = $this->getTransactionIdByOrderId($orderId);
+        if (!$transactionId) {
+            return true;
+        }
+
+        $transaction = ($this->getNewTransactionObject())->load($transactionId);
+        if (!$transaction) {
+            return true;
+        }
+
+        if ($transaction->getFieldData('oxaction') === 'init') {
+            return true;
+        }
+    }
 }