Merge branch 'main' into develop

Adyen · Nov 5, 2024 · 1c1a20a · 1c1a20a
2 parents 8be07f7 + b3f6830
commit 1c1a20a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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;

diff --git 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);