Merge pull request #2536 from Adyen/develop-8

Release 8.22.8
Adyen · Mar 8, 2024 · d0df521 · d0df521
2 parents 858ee87 + d8b56aa
commit d0df521
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/Helper/PaymentResponseHandler.php b/Helper/PaymentResponseHandler.php
@@ -20,6 +20,7 @@
 use Adyen\Payment\Model\Ui\AdyenOneclickConfigProvider;
 use Adyen\Payment\Observer\AdyenHppDataAssignObserver;
 use Exception;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Model\Order\Payment;
 use Magento\Sales\Model\ResourceModel\Order;
@@ -89,7 +90,7 @@ class PaymentResponseHandler
      *
      * @param AdyenLogger $adyenLogger
      * @param Data $adyenHelper
-     * @param \Adyen\Payment\Helper\Vault $vaultHelper
+     * @param Vault $vaultHelper
      */
     public function __construct(
         AdyenLogger $adyenLogger,
@@ -113,7 +114,7 @@ public function __construct(
         $this->paymentMethodFactory = $paymentMethodFactory;
     }
 
-    public function formatPaymentResponse($resultCode, $action = null, $additionalData = null, $donationToken = null)
+    public function formatPaymentResponse($resultCode, $action = null, $additionalData = null)
     {
         switch ($resultCode) {
             case self::AUTHORISED:
@@ -122,8 +123,7 @@ public function formatPaymentResponse($resultCode, $action = null, $additionalDa
             case self::POS_SUCCESS:
                 return [
                     "isFinal" => true,
-                    "resultCode" => $resultCode,
-                    "donationToken" => $donationToken
+                    "resultCode" => $resultCode
                 ];
             case self::REDIRECT_SHOPPER:
             case self::IDENTIFY_SHOPPER:
@@ -159,7 +159,7 @@ public function formatPaymentResponse($resultCode, $action = null, $additionalDa
      * @param Payment $payment
      * @param OrderInterface|null $order
      * @return bool
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function handlePaymentResponse($paymentsResponse, $payment, $order = null)
     {

diff --git a/Helper/Webhook.php b/Helper/Webhook.php
@@ -420,7 +420,9 @@ private function updateAdyenAttributes(Order $order, Notification $notification)
              * the  previous notification was authorisation : true do not update pspreference
              */
             if (!$notification->isSuccessful()) {
-                $previousAdyenEventCode = $order->getData('adyen_notification_event_code');
+                $previousAdyenEventCode = $this->orderRepository
+                    ->get($order->getId())
+                    ->getData('adyen_notification_event_code');
                 if ($previousAdyenEventCode != "AUTHORISATION : TRUE") {
                     $this->updateOrderPaymentWithAdyenAttributes($order->getPayment(), $notification, $additionalData);
                 }

diff --git a/Model/Api/AdyenOrderPaymentStatus.php b/Model/Api/AdyenOrderPaymentStatus.php
@@ -17,7 +17,7 @@
 use Adyen\Payment\Helper\PaymentResponseHandler;
 use Adyen\Payment\Logger\AdyenLogger;
 use Magento\Sales\Api\OrderRepositoryInterface;
-use \Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 class AdyenOrderPaymentStatus implements AdyenOrderPaymentStatusInterface
 {
@@ -89,8 +89,7 @@ public function getOrderPaymentStatus($orderId)
         return json_encode($this->paymentResponseHandler->formatPaymentResponse(
             $additionalInformation['resultCode'],
             !empty($additionalInformation['action']) ? $additionalInformation['action'] : null,
-            !empty($additionalInformation['additionalData']) ? $additionalInformation['additionalData'] : null,
-            !empty($additionalInformation['donationToken']) ? $additionalInformation['donationToken'] : null
+            !empty($additionalInformation['additionalData']) ? $additionalInformation['additionalData'] : null
         ));
     }
 }
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "adyen/module-payment",
   "description": "Official Magento2 Plugin to connect to Payment Service Provider Adyen.",
   "type": "magento2-module",
-  "version": "8.22.7",
+  "version": "8.22.8",
   "license": "MIT",
   "repositories": [
     {

diff --git a/etc/module.xml b/etc/module.xml
@@ -11,7 +11,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Adyen_Payment" setup_version="8.22.7">
+    <module name="Adyen_Payment" setup_version="8.22.8">
         <sequence>
             <module name="Magento_Sales"/>
             <module name="Magento_Quote"/>