Merge pull request #104 from woocommerce/fix/103-dont-override-value-of-other-payment-method

maybe_not_update_payment_method() returns unchanged value of $update if payment method is not Amazon Pay.

Author: shendy-a8c

changelog.txt

@@ -1,5 +1,8 @@
 *** Amazon Pay Changelog ***
 
+= 2.0.4 - 2021-xx-xx =
+* Fix - Interference when subcsriptions' payment method changes to other payment method.
+
 = 2.0.3 - 2021-06-15 =
 * Fix - Issues with state level handling of shipping zones.
 * Fix - Issue that attempted to initialize the plugin in the REST API, throwing a fatal error.

includes/class-wc-gateway-amazon-payments-advanced-subscriptions.php

@@ -708,14 +708,14 @@ public function maybe_change_session_key( $session_key ) {
 	 *
 	 * @param  bool   $update Wether to Update.
 	 * @param  string $method New method.
-	 * @return bool|string False if the gateway shouldn't update, the gateway id if it should be updated.
+	 * @return bool   False if the gateway shouldn't update. True, otherwise.
 	 */
 	public function maybe_not_update_payment_method( $update, $method ) {
 		$id = wc_apa()->get_gateway()->id;
 		if ( $method === $id ) {
 			return false;
 		}
-		return $id;
+		return $update;
 	}
 
 	/**

readme.txt

@@ -54,6 +54,9 @@ Automatic updates should work like a charm; as always though, ensure you backup
 
 == Changelog ==
 
+= 2.0.4 - 2021-xx-xx =
+* Fix - Interference when subcsriptions' payment method changes to other payment method.
+
 = 2.0.3 - 2021-06-15 =
 * Fix - Issues with state level handling of shipping zones.
 * Fix - Issue that attempted to initialize the plugin in the REST API, throwing a fatal error.