--- 3145982-2.patch	2020-06-05 14:50:50
+++ 3145982-7.patch	2025-07-16 11:44:01
@@ -1,11 +1,12 @@
 diff --git a/modules/checkout/src/Plugin/Commerce/CheckoutFlow/CheckoutFlowWithPanesBase.php b/modules/checkout/src/Plugin/Commerce/CheckoutFlow/CheckoutFlowWithPanesBase.php
-index c7d0b2c9..ffc38173 100644
+index 5ef34b4b..1cc63bd6 100644
 --- a/modules/checkout/src/Plugin/Commerce/CheckoutFlow/CheckoutFlowWithPanesBase.php
 +++ b/modules/checkout/src/Plugin/Commerce/CheckoutFlow/CheckoutFlowWithPanesBase.php
-@@ -131,6 +131,14 @@ abstract class CheckoutFlowWithPanesBase extends CheckoutFlowBase implements Che
-     return isset($panes[$pane_id]) ? $panes[$pane_id] : NULL;
+@@ -124,6 +124,15 @@ abstract class CheckoutFlowWithPanesBase extends CheckoutFlowBase implements Che
+     return $panes[$pane_id] ?? NULL;
    }
  
++
 +  /**
 +   * {@inheritdoc}
 +   */
@@ -35,13 +36,13 @@
 +
  }
 diff --git a/modules/payment/src/Plugin/Commerce/CheckoutPane/PaymentProcess.php b/modules/payment/src/Plugin/Commerce/CheckoutPane/PaymentProcess.php
-index 5da41987..5130b0e6 100644
+index 51480526..547c3854 100644
 --- a/modules/payment/src/Plugin/Commerce/CheckoutPane/PaymentProcess.php
 +++ b/modules/payment/src/Plugin/Commerce/CheckoutPane/PaymentProcess.php
-@@ -146,8 +146,9 @@ class PaymentProcess extends CheckoutPaneBase {
-       // No payment is needed if the order is free or has already been paid.
-       return FALSE;
-     }
+@@ -110,8 +110,9 @@ class PaymentProcess extends PaymentCheckoutPaneBase {
+    * {@inheritdoc}
+    */
+   public function isVisible() {
 -    $payment_info_pane = $this->checkoutFlow->getPane('payment_information');
 -    if (!$payment_info_pane->isVisible() || $payment_info_pane->getStepId() == '_disabled') {
 +    $payment_info_id = $this->checkoutFlow->getPaymentPaneId();
@@ -50,7 +51,7 @@
        // Hide the pane if the PaymentInformation pane has been disabled.
        return FALSE;
      }
-@@ -282,12 +283,18 @@ class PaymentProcess extends CheckoutPaneBase {
+@@ -238,12 +239,18 @@ class PaymentProcess extends PaymentCheckoutPaneBase {
     */
    protected function getErrorStepId() {
      // Default to the step that contains the PaymentInformation pane.
@@ -67,7 +68,7 @@
        // was overridden to allow PaymentProcess to be used without a
        // payment_information pane, but this method was not modified.
 -      throw new \RuntimeException('Cannot get the step ID for the payment_information pane. The pane is disabled.');
-+      throw new \RuntimeException(sprintf('Cannot get the step ID for the payment information pane "%s". The pane is disabled.',$payment_info_id));
++      throw new \RuntimeException(sprintf('Cannot get the step ID for the payment information pane "%s". The pane is disabled.', $payment_info_id));
      }
  
      return $step_id;