Release 3.6.1.

Author: IngenicoEPayments

CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 3.6.0 - 2024-03-08
+
+- Add support for voiding orders
+- Switch between cancel and refund depending on transaction status
+
 ## 3.6.0 - 2024-03-07
 
 - Improved handling of credit memos

Gateway/Command/RefundCommand.php

@@ -25,24 +25,45 @@ public function execute(array $commandSubject)
     {
         /** @var Payment $payment */
         $payment = $commandSubject['payment']->getPayment();
-        $creditmemo = $payment->getCreditmemo();
-        $order = $creditmemo->getOrder();
-        $storeId = $creditmemo->getStoreId();
+        $worldlinePaymentId = $payment->getRefundTransactionId();
 
         try {
-            $response = $this->worldlineClient->worldlineRefund(
-                $payment->getRefundTransactionId(),
-                $this->refundRequestBuilder->build($order, (float) $creditmemo->getGrandTotal()),
-                null,
-                $storeId
-            );
-
-            $this->statusResponseManager->set($payment, $response->id, $response);
-
-            $payment->setLastTransId($response->id);
-            $payment->setTransactionId($response->id);
+            $response = $this->worldlineClient->worldlinePayment($worldlinePaymentId);
+            if ($response->statusOutput->isRefundable) {
+                $this->refundPayment($worldlinePaymentId, $payment);
+            } elseif ($response->statusOutput->isCancellable) {
+                $this->cancelPayment($worldlinePaymentId, $payment);
+            }
         } catch (ResponseException $e) {
             $this->apiErrorHandler->handleError($e);
         }
     }
+
+    private function refundPayment(string $worldlinePaymentId, Payment $payment): void
+    {
+        $creditmemo = $payment->getCreditmemo();
+        $response = $this->worldlineClient->worldlineRefund(
+            $worldlinePaymentId,
+            $this->refundRequestBuilder->build($creditmemo->getOrder(), (float) $creditmemo->getGrandTotal()),
+            null,
+            $creditmemo->getStoreId()
+        );
+
+        $this->statusResponseManager->set($payment, $response->id, $response);
+
+        $payment->setLastTransId($response->id);
+        $payment->setTransactionId($response->id);
+    }
+
+    private function cancelPayment(string $worldlinePaymentId, Payment $payment): void
+    {
+        $this->worldlineClient->worldlinePaymentCancel($worldlinePaymentId);
+
+        $response = $this->worldlineClient->worldlinePayment($worldlinePaymentId);
+
+        $this->statusResponseManager->set($payment, $response->id, $response);
+
+        $payment->setLastTransId($response->id);
+        $payment->setTransactionId($response->id);
+    }
 }