From 5c01c06aec05353933b88abdc40c095e5578069e Mon Sep 17 00:00:00 2001
From: Tamara <tamara@example.com>
Date: Wed, 30 Oct 2024 13:47:31 +0100
Subject: [PATCH 1/2] Fix the issue with carrier id during payment

CS-6078
---
 src/classes/Services/CheckoutHandler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/classes/Services/CheckoutHandler.php b/src/classes/Services/CheckoutHandler.php
index dbd69edf..aeb90b38 100644
--- a/src/classes/Services/CheckoutHandler.php
+++ b/src/classes/Services/CheckoutHandler.php
@@ -123,7 +123,7 @@ public static function getCarrierId(PrestaCart $cart): int
     {
         if (Tools::getValue('controller') === 'paymentconfigexpresscheckout' ||
             Tools::getValue('controller') === 'paymentproduct' ||
-            Tools::getValue('controller') === 'payment'
+            (Tools::getValue('controller') === 'payment' && !$cart->id_carrier)
         ) {
             //Get default carrier for current shop
             $carrierId = (int)Configuration::get('PS_CARRIER_DEFAULT', null, null, $cart->id_shop);

From b3f68306fedc7093b4d784b9f7860d868233ef23 Mon Sep 17 00:00:00 2001
From: Tamara <tamara@example.com>
Date: Tue, 5 Nov 2024 13:33:05 +0100
Subject: [PATCH 2/2] Release version 5.2.1

CS-6078
---
 src/adyenofficial.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/adyenofficial.php b/src/adyenofficial.php
index 56946c73..b8f03672 100755
--- a/src/adyenofficial.php
+++ b/src/adyenofficial.php
@@ -46,7 +46,7 @@ public function __construct()
     {
         $this->name = 'adyenofficial';
         $this->tab = 'payments_gateways';
-        $this->version = '5.2.0';
+        $this->version = '5.2.1';
 
         $this->author = $this->l('Adyen');
         $this->need_instance = 0;