Use account.charges_enabled to show if Stripe payments are available (#2342)

* Use account.charges_enabled to show if Stripe payments are available.

Partially fixes #2175

* Added 'charges_enabled' Stripe account property to JS mocks

This is a continuation to fixes for #2175. Also removed now unneeded
mock(s).

* Don't check for payout schedule to determine if Stripe payouts enabled

Fixes #2175. Some merchants have payouts "enabled" but do not have a
payout schedule configured in Stripe -- presumably they are triggering
their payouts manually in these cases.

This change makes the Stripe settings show payouts as Enabled if the
`payouts_enabled` property is true in their Stripe account even if they
do not have a payout schedule set up.

* Add changelog entry for #2175 fix

Author: EvanDotPro

changelog.txt

@@ -1,6 +1,7 @@
 *** Changelog ***
 
 = 6.4.0 - 2022-xx-xx =
+* Fix - Changed logic for how 'Enabled/Disabled' statuses are shown for payments and payouts capabilities in settings.
 
 = 6.3.0 - 2022-03-10 =
 * Tweak - Remove html from translatable strings.

client/settings/account-details/__tests__/account-details.test.js

@@ -16,9 +16,6 @@ jest.mock( 'wcstripe/data/account-keys', () => ( {
 
 describe( 'AccountDetails', () => {
 	it( 'renders enabled payments and payouts on account', () => {
-		useGetCapabilities.mockReturnValue( {
-			card_payments: 'active',
-		} );
 		useAccount.mockReturnValue( {
 			data: {
 				account: {
@@ -28,6 +25,7 @@ describe( 'AccountDetails', () => {
 						},
 					},
 					payouts_enabled: true,
+					charges_enabled: true,
 				},
 			},
 		} );
@@ -53,16 +51,14 @@ describe( 'AccountDetails', () => {
 	} );
 
 	it( 'renders disabled payouts and payments on account', () => {
-		useGetCapabilities.mockReturnValue( {
-			card_payments: 'disabled',
-		} );
 		useAccount.mockReturnValue( {
 			data: {
 				account: {
 					settings: {
 						payouts: {},
 					},
 					payouts_enabled: false,
+					charges_enabled: false,
 				},
 			},
 		} );

client/settings/account-details/index.js

@@ -6,23 +6,23 @@ import { Button, ExternalLink } from '@wordpress/components';
 import interpolateComponents from 'interpolate-components';
 import useWebhookStateMessage from './use-webhook-state-message';
 import SectionStatus from './section-status';
-import { useAccount, useGetCapabilities } from 'wcstripe/data/account';
+import { useAccount } from 'wcstripe/data/account';
 import {
 	useAccountKeysTestWebhookSecret,
 	useAccountKeysWebhookSecret,
 } from 'wcstripe/data/account-keys';
 import { WebhookInformation } from 'wcstripe/components/webhook-information';
 
-const useIsCardPaymentsEnabled = () =>
-	useGetCapabilities().card_payments === 'active';
+const useIsCardPaymentsEnabled = () => {
+	const { data } = useAccount();
+
+	return data.account?.charges_enabled;
+};
 
 const useArePayoutsEnabled = () => {
 	const { data } = useAccount();
 
-	return (
-		data.account?.payouts_enabled &&
-		Boolean( data.account?.settings?.payouts?.schedule?.interval )
-	);
+	return data.account?.payouts_enabled;
 };
 
 const PaymentsSection = () => {

readme.txt

@@ -129,5 +129,6 @@ If you get stuck, you can ask for help in the Plugin Forum.
 == Changelog ==
 
 = 6.4.0 - 2022-xx-xx =
+* Fix - Changed logic for how 'Enabled/Disabled' statuses are shown for payments and payouts capabilities in settings.
 
 [See changelog for all versions](https://raw.githubusercontent.com/woocommerce/woocommerce-gateway-stripe/trunk/changelog.txt).