Use settings statement descriptor in account summary API

Author: brianyu28

changelog.txt

@@ -1,7 +1,7 @@
 *** Changelog ***
 
 = 6.2.0 - 2022-xx-xx =
-
+* Fix - Missing statement descriptor in account summary API when not set in Stripe.
 
 = 6.1.0 - 2022-01-26 =
 * Tweak - Use the newly exposed LoadableMask component provided by WooCommerce Blocks to trigger the loading state for Payment Request Buttons.

includes/admin/class-wc-rest-stripe-account-controller.php

@@ -25,7 +25,15 @@ class WC_REST_Stripe_Account_Controller extends WC_Stripe_REST_Base_Controller {
 	 */
 	private $account;
 
-	public function __construct( WC_Stripe_Account $account ) {
+	/**
+	 * Stripe payment gateway.
+	 *
+	 * @var WC_Gateway_Stripe
+	 */
+	private $gateway;
+
+	public function __construct( WC_Gateway_Stripe $gateway, WC_Stripe_Account $account ) {
+		$this->gateway = $gateway;
 		$this->account = $account;
 	}
 
@@ -98,13 +106,19 @@ public function get_account() {
 	public function get_account_summary() {
 		$account = $this->account->get_cached_account_data();
 
+		// Use statement descriptor from settings, falling back to Stripe account statement descriptor if needed.
+		$statement_descriptor = WC_Stripe_Helper::clean_statement_descriptor( $this->gateway->get_option( 'statement_descriptor' ) );
+		if ( empty( $statement_descriptor ) ) {
+			$statement_descriptor = $account['settings']['payments']['statement_descriptor'] ?? '';
+		}
+
 		return new WP_REST_Response(
 			[
 				'has_pending_requirements' => $this->account->has_pending_requirements(),
 				'has_overdue_requirements' => $this->account->has_overdue_requirements(),
 				'current_deadline'         => $account['requirements']['current_deadline'] ?? null,
 				'status'                   => $this->account->get_account_status(),
-				'statement_descriptor'     => $account['settings']['payments']['statement_descriptor'] ?? '',
+				'statement_descriptor'     => $statement_descriptor,
 				'store_currencies'         => [
 					'default'   => $account['default_currency'] ?? get_woocommerce_currency(),
 					'supported' => $this->account->get_supported_store_currencies(),

readme.txt

@@ -129,6 +129,7 @@ If you get stuck, you can ask for help in the Plugin Forum.
 == Changelog ==
 
 = 6.2.0 - 2022-xx-xx =
+* Fix - Missing statement descriptor in account summary API when not set in Stripe.
 
 
 [See changelog for all versions](https://raw.githubusercontent.com/woocommerce/woocommerce-gateway-stripe/trunk/changelog.txt).

woocommerce-gateway-stripe.php

@@ -592,7 +592,7 @@ public function register_routes() {
 				$stripe_tokens_controller     = new WC_REST_Stripe_Tokens_Controller();
 				$oauth_init                   = new WC_Stripe_Connect_REST_Oauth_Init_Controller( $this->connect, $this->api );
 				$oauth_connect                = new WC_Stripe_Connect_REST_Oauth_Connect_Controller( $this->connect, $this->api );
-				$stripe_account_controller    = new WC_REST_Stripe_Account_Controller( $this->account );
+				$stripe_account_controller    = new WC_REST_Stripe_Account_Controller( $this->get_main_stripe_gateway(), $this->account );
 
 				$connection_tokens_controller->register_routes();
 				$locations_controller->register_routes();