Update account summary API with default values, is_live, test_mode (#2269)

* Wrap account summary API in WP_REST_Response

* Add is_live and test_mode to account summary API (#2272)

* Add is_live and test_mode to account summary API

* Add default value for charges_enabled

* Fix account summary API response when no account linked (#2275)

Author: Brian Yu

changelog.txt

@@ -2,6 +2,9 @@
 
 = 6.1.0 - 2022-xx-xx =
 * Tweak - Use the newly exposed LoadableMask component provided by WooCommerce Blocks to trigger the loading state for Payment Request Buttons.
+* Fix - Response type for account summary API.
+* Fix - Invalid response in account summary API when missing account data.
+* Add - Live and test mode information in account summary API.
 * Add - Add filter call when updating an existent intent (wc_stripe_update_existing_intent_request).
 * Add - Add ability to test Stripe account keys' validity.
 * Fix - Fixed full bank statement field description.

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

@@ -98,18 +98,22 @@ public function get_account() {
 	public function get_account_summary() {
 		$account = $this->account->get_cached_account_data();
 
-		return [
-			'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'] ?? '',
-			'store_currencies'         => [
-				'default'   => $account['default_currency'] ?? '',
-				'supported' => $this->account->get_supported_store_currencies(),
-			],
-			'country'                  => $account['country'] ?? '',
-		];
+		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'] ?? '',
+				'store_currencies'         => [
+					'default'   => $account['default_currency'] ?? get_woocommerce_currency(),
+					'supported' => $this->account->get_supported_store_currencies(),
+				],
+				'country'                  => $account['country'] ?? WC()->countries->get_base_country(),
+				'is_live'                  => $account['charges_enabled'] ?? false,
+				'test_mode'                => WC_Stripe_Webhook_State::get_testmode(),
+			]
+		);
 	}
 
 	/**

includes/class-wc-stripe-account.php

@@ -14,6 +14,7 @@ class WC_Stripe_Account {
 	const TEST_ACCOUNT_OPTION    = 'wcstripe_account_data_test';
 
 	const STATUS_COMPLETE        = 'complete';
+	const STATUS_NO_ACCOUNT      = 'NOACCOUNT';
 	const STATUS_RESTRICTED_SOON = 'restricted_soon';
 	const STATUS_RESTRICTED      = 'restricted';
 
@@ -153,8 +154,12 @@ public function has_overdue_requirements() {
 	 * @return string The account's status.
 	 */
 	public function get_account_status() {
-		$requirements = $this->get_cached_account_data()['requirements'] ?? [];
+		$account = $this->get_cached_account_data();
+		if ( empty( $account ) ) {
+			return self::STATUS_NO_ACCOUNT;
+		}
 
+		$requirements = $account['requirements'] ?? [];
 		if ( empty( $requirements ) ) {
 			return self::STATUS_COMPLETE;
 		}
@@ -189,7 +194,7 @@ public function get_account_status() {
 	public function get_supported_store_currencies(): array {
 		$account = $this->get_cached_account_data();
 		if ( ! isset( $account['external_accounts']['data'] ) ) {
-			return [ $account['default_currency'] ?? '' ];
+			return [ $account['default_currency'] ?? get_woocommerce_currency() ];
 		}
 
 		$currencies = array_filter( array_column( $account['external_accounts']['data'], 'currency' ) );

readme.txt

@@ -130,6 +130,9 @@ If you get stuck, you can ask for help in the Plugin Forum.
 
 = 6.x.x - 2022-xx-xx =
 * Tweak - Use the newly exposed LoadableMask component provided by WooCommerce Blocks to trigger the loading state for Payment Request Buttons.
+* Fix - Response type for account summary API.
+* Fix - Invalid response in account summary API when missing account data.
+* Add - Live and test mode information in account summary API.
 * Add - Add filter call when updating an existent intent (wc_stripe_update_existing_intent_request).
 * Add - Add ability to test Stripe account keys' validity.
 * Fix - Fixed full bank statement field description.