Ensure the payment method ID is recorded as the payment method of pay…

…ment, not of retrievable type (#2951)

includes/payment-methods/class-wc-stripe-upe-payment-gateway.php

@@ -1517,8 +1517,9 @@ public function set_payment_method_title_for_order( $order, $payment_method_type
 		}
 		$payment_method       = $this->payment_methods[ $payment_method_type ];
 		$payment_method_title = $payment_method->get_label();
+		$payment_method_id    = $payment_method instanceof WC_Stripe_UPE_Payment_Method_CC ? $this->id : $payment_method->id;
 
-		$order->set_payment_method( $this->get_upe_gateway_id_for_order( $payment_method ) );
+		$order->set_payment_method( $payment_method_id );
 		$order->set_payment_method_title( $payment_method_title );
 		$order->save();
 	}