Merge pull request #46 from pronamic/45-prevent-payment-method-change…

…-note

45 prevent payment method change note

src/Gateway.php

@@ -1623,14 +1623,26 @@ public function update_subscription_mandate( Subscription $subscription, $mandat
 		$method_transformer = new MethodTransformer();
 
 		$old_method = $subscription->get_payment_method();
-		$new_method = ( null === $payment_method && \property_exists( $mandate, 'method' ) ? $method_transformer->transform_mollie_to_wp( $mandate->method ) : $payment_method );
+		$new_method = $payment_method;
+
+		if ( null === $payment_method && \property_exists( $mandate, 'method' ) ) {
+			$pronamic_methods = $method_transformer->from_mollie_to_pronamic( $mandate->method );
+
+			$new_method = in_array( $old_method, $pronamic_methods, true ) ? $old_method : null;
+
+			$first_pronamic_method = reset( $pronamic_methods );
+
+			if ( null === $new_method && false !== $first_pronamic_method ) {
+				$new_method = $first_pronamic_method;
+			}
+		}
 
 		if ( ! empty( $old_method ) && $old_method !== $new_method ) {
 			$subscription->set_payment_method( $new_method );
 
 			// Add note.
 			$note = \sprintf(
-			/* translators: 1: old payment method, 2: new payment method */
+				/* translators: 1: old payment method, 2: new payment method */
 				\__( 'Payment method for subscription changed from "%1$s" to "%2$s".', 'pronamic_ideal' ),
 				\esc_html( (string) PaymentMethods::get_name( $old_method ) ),
 				\esc_html( (string) PaymentMethods::get_name( $new_method ) )

src/MethodTransformer.php

@@ -97,7 +97,7 @@ public static function transform_mollie_to_wp( $method ) {
 	 * Transform Mollie method to Pronamic payment method(s).
 	 *
 	 * @param string $method Mollie method.
-	 * @return array
+	 * @return array<string>
 	 */
 	public function from_mollie_to_pronamic( $method ) {
 		return \array_keys(