Merge trunk v5.0.2 into develop

Author: shendy-a8c

changelog.txt

@@ -1,5 +1,8 @@
 *** WooCommerce Payments Changelog ***
 
+= 5.0.2 - 2022-11-14 =
+* Fix - Fixed rest api error for payment_gateways endpoint
+
 = 5.0.1 - 2022-11-10 =
 * Fix - Fix fatal error when non-admin access admin pages.
 

includes/class-wc-payment-gateway-wcpay.php

@@ -2946,6 +2946,15 @@ public function append_stripelink_button( $field, $key, $args, $value ) {
 		return $field;
 	}
 
+	/**
+	 * Returns the URL of the configuration screen for this gateway, for use in internal links.
+	 *
+	 * @return string URL of the configuration screen for this gateway
+	 */
+	public static function get_settings_url() {
+		return WC_Payments_Admin_Settings::get_settings_url();
+	}
+
 	// Start: Deprecated functions.
 
 	/**
@@ -2960,18 +2969,6 @@ public static function is_current_page_settings() {
 		return WC_Payments_Admin_Settings::is_current_page_settings();
 	}
 
-	/**
-	 * Returns the URL of the configuration screen for this gateway, for use in internal links.
-	 *
-	 * @deprecated 5.0.0
-	 *
-	 * @return string URL of the configuration screen for this gateway
-	 */
-	public static function get_settings_url() {
-		wc_deprecated_function( __FUNCTION__, '5.0.0', 'WC_Payments_Admin_Settings::get_settings_url' );
-		return WC_Payments_Admin_Settings::get_settings_url();
-	}
-
 	/**
 	 * Generates the configuration values, needed for payment fields.
 	 *

includes/class-wc-payments.php

@@ -387,11 +387,11 @@ public static function init() {
 		WC_Payments_Explicit_Price_Formatter::init();
 
 		include_once WCPAY_ABSPATH . '/includes/class-wc-payments-captured-event-note.php';
+		include_once WCPAY_ABSPATH . 'includes/admin/class-wc-payments-admin-settings.php';
 
 		// Add admin screens.
 		if ( is_admin() ) {
 			include_once WCPAY_ABSPATH . 'includes/admin/class-wc-payments-admin.php';
-			include_once WCPAY_ABSPATH . 'includes/admin/class-wc-payments-admin-settings.php';
 		}
 
 		if ( is_admin() && current_user_can( 'manage_woocommerce' ) ) {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "woocommerce-payments",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "main": "webpack.config.js",
   "author": "Automattic",
   "license": "GPL-3.0-or-later",

package.json

@@ -4,7 +4,7 @@ Tags: payment gateway, payment, apple pay, credit card, google pay
 Requires at least: 5.8
 Tested up to: 6.0
 Requires PHP: 7.0
-Stable tag: 5.0.1
+Stable tag: 5.0.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -98,6 +98,9 @@ Please note that our support for the checkout block is still experimental and th
 
 == Changelog ==
 
+= 5.0.2 - 2022-11-14 =
+* Fix - Fixed rest api error for payment_gateways endpoint
+
 = 5.0.1 - 2022-11-10 =
 * Fix - Fix fatal error when non-admin access admin pages.
 

readme.txt

@@ -12,7 +12,7 @@
  * WC tested up to: 7.0.0
  * Requires at least: 5.8
  * Requires PHP: 7.0
- * Version: 5.0.1
+ * Version: 5.0.2
  *
  * @package WooCommerce\Payments
  */