Small refactor

Adyen · Feb 21, 2024 · 0f48b6d · 0f48b6d
1 parent 73287fd
commit 0f48b6d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Gateway/Http/Client/TransactionCancel.php b/Gateway/Http/Client/TransactionCancel.php
@@ -60,6 +60,7 @@ public function placeRequest(TransferInterface $transferObject): array
                 $responseData = json_decode(json_encode($response->jsonSerialize()), true);
                 $this->adyenHelper->logResponse($responseData);
             } catch (AdyenException $e) {
+                $responseData['error'] = $e->getMessage();
                 $this->adyenHelper->logAdyenException($e);
             }
         }

diff --git a/Helper/PaymentMethods.php b/Helper/PaymentMethods.php
@@ -253,7 +253,7 @@ protected function getPaymentMethodsResponse(array $requestParams, Store $store)
         $client = $this->adyenHelper->initializeAdyenClient($store->getId());
 
         // initialize service
-        $service = new PaymentsApi($client);
+        $service =$this->adyenHelper->initializePaymentsApi($client);
 
         try {
             $this->adyenHelper->logRequest($requestParams, Client::API_CHECKOUT_VERSION, '/paymentMethods');

diff --git a/Plugin/PaymentVaultDeleteToken.php b/Plugin/PaymentVaultDeleteToken.php
@@ -3,7 +3,7 @@
  *
  * Adyen Payment module (https://www.adyen.com/)
  *
- * Copyright (c) 2023 Adyen N.V. (https://www.adyen.com/)
+ * Copyright (c) 2024 Adyen N.V. (https://www.adyen.com/)
  * See LICENSE.txt for license details.
  *
  * Author: Adyen <magento@adyen.com>
@@ -18,7 +18,6 @@
 use Adyen\Payment\Helper\Requests;
 use Adyen\Payment\Helper\Vault;
 use Adyen\Payment\Logger\AdyenLogger;
-use Adyen\Service\RecurringApi;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
@@ -62,14 +61,15 @@ public function beforeDelete(PaymentTokenRepositoryInterface $subject, PaymentTo
 
             try {
                 $client = $this->dataHelper->initializeAdyenClient($storeId);
-                $recurringService = $this->dataHelper->createAdyenRecurringService($client);
+                $recurringService = $this->dataHelper->initializeRecurringApi($client);
 
                 $this->dataHelper->logRequest(
                     $request,
                     Client::API_RECURRING_VERSION,
                     sprintf("/pal/servlet/Recurring/%s/disable", Client::API_RECURRING_VERSION)
                 );
-                $response = $recurringService->disable($request);
+
+                $response = $recurringService->disable(new DisableRequest($request));
                 $this->dataHelper->logResponse($response);
             } catch (AdyenException $e) {
                 $this->adyenLogger->error(sprintf(