Merge remote-tracking branch 'origin/fix/PIWOO-348' into release/7.4.1

mollie · Oct 24, 2023 · d1424a5 · d1424a5
2 parents 1f47ca9 + 3e7c756
commit d1424a5
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/Gateway/Surcharge.php b/src/Gateway/Surcharge.php
@@ -105,6 +105,10 @@ public function aboveMaxLimit(float $totalAmount, array $gatewaySettings): bool
      */
     public function calculateFeeAmount(WC_Cart $cart, array $gatewaySettings): float
     {
+        if (!isset($gatewaySettings['payment_surcharge'])) {
+            return 0.0;
+        }
+
         $surchargeType = $gatewaySettings['payment_surcharge'];
         $methodName = sprintf('calculate_%s', $surchargeType);
 
@@ -154,7 +158,7 @@ protected function calculate_no_fee(WC_Cart $cart, array $gatewaySettings): floa
      */
     protected function calculate_fixed_fee($cart, array $gatewaySettings)
     {
-        return !empty($gatewaySettings[Surcharge::FIXED_FEE]) ? (float) $gatewaySettings[Surcharge::FIXED_FEE] : 0.0;
+        return !empty($gatewaySettings[Surcharge::FIXED_FEE]) ? (float)$gatewaySettings[Surcharge::FIXED_FEE] : 0.0;
     }
 
     /**
@@ -294,7 +298,12 @@ protected function name_fixed_fee_percentage($paymentMethod)
         $currency = get_woocommerce_currency_symbol();
         $amountPercent = $paymentMethod->getProperty(self::PERCENTAGE);
         /* translators: Placeholder 1: Fee amount tag. Placeholder 2: Currency. Placeholder 3: Percentage amount. */
-        return sprintf(__(' + %1$s %2$s + %3$s%% fee might apply', 'mollie-payments-for-woocommerce'), $currency, $amountFix, $amountPercent);
+        return sprintf(
+            __(' + %1$s %2$s + %3$s%% fee might apply', 'mollie-payments-for-woocommerce'),
+            $currency,
+            $amountFix,
+            $amountPercent
+        );
     }
 
     /**