Merge remote-tracking branch 'origin/release/6.4.0' into trunk

Author: Kristófer R

.github/workflows/compatibility.yml

@@ -11,7 +11,7 @@ jobs:
       matrix:
         woocommerce: [ 'beta' ]
         wordpress:   [ 'latest' ]
-        php:         [ '7.0', '7.4', '8.0' ]
+        php:         [ '7.2', '7.4', '8.0' ]
 
 
     name: Beta (PHP=${{ matrix.php }}, WP=${{ matrix.wordpress }}, WC=${{ matrix.woocommerce }})

.github/workflows/php-tests.yml

@@ -16,11 +16,11 @@ jobs:
         include:
           # WooCommerce
           - woocommerce_support_policy: L
-            woocommerce: '6.2.0'
+            woocommerce: '6.5.0'
           - woocommerce_support_policy: L-1
-            woocommerce: '6.1.0'
+            woocommerce: '6.4.1'
           - woocommerce_support_policy: L-2
-            woocommerce: '6.0.0'
+            woocommerce: '6.3.1'
           # WordPress
           - wordpress_support_policy: L
             wordpress: '5.9'
@@ -35,6 +35,9 @@ jobs:
             php: '7.4'
           - php_support_policy: L-2
             php: '7.0'
+        exclude:
+          - woocommerce_support_policy: L
+            php_support_policy: L-2
 
     name: Stable (PHP=${{ matrix.php_support_policy }}, WP=${{ matrix.wordpress_support_policy }}, WC=${{ matrix.woocommerce_support_policy }})
     env:

changelog.txt

@@ -1,5 +1,9 @@
 *** Changelog ***
 
+= 6.4.0 - 2022-05-20 =
+* Fix - Changed logic for how 'Enabled/Disabled' statuses are shown for payments and payouts capabilities in settings.
+* Tweak - Updated the minimum supported versions of WordPress and WooCommerce.
+
 = 6.3.0 - 2022-03-10 =
 * Tweak - Remove html from translatable strings.
 * Tweak - Revert the deprecation of the 'wc_stripe_hide_payment_request_on_product_page', 'wc_stripe_show_payment_request_on_checkout', and 'wc_stripe_show_payment_request_on_cart' filters.

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 = () => {

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "woocommerce-gateway-stripe",
   "title": "WooCommerce Gateway Stripe",
-  "version": "6.3.0",
+  "version": "6.4.0",
   "license": "GPL-3.0",
   "homepage": "http://wordpress.org/plugins/woocommerce-gateway-stripe/",
   "repository": {

package.json

@@ -1,10 +1,10 @@
 === WooCommerce Stripe Payment Gateway ===
 Contributors: woocommerce, automattic, royho, akeda, mattyza, bor0, woothemes
 Tags: credit card, stripe, apple pay, payment request, google pay, sepa, sofort, bancontact, alipay, giropay, ideal, p24, woocommerce, automattic
-Requires at least: 5.6
+Requires at least: 5.7
 Tested up to: 5.9
 Requires PHP: 7.0
-Stable tag: 6.3.0
+Stable tag: 6.4.0
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 Attributions: thorsten-stripe
@@ -128,9 +128,8 @@ If you get stuck, you can ask for help in the Plugin Forum.
 
 == Changelog ==
 
-= 6.3.0 - 2022-03-10 =
-* Tweak - Remove html from translatable strings.
-* Tweak - Revert the deprecation of the 'wc_stripe_hide_payment_request_on_product_page', 'wc_stripe_show_payment_request_on_checkout', and 'wc_stripe_show_payment_request_on_cart' filters.
-* Tweak - Address minor styling issues in settings.
+= 6.4.0 - 2022-05-20 =
+* Fix - Changed logic for how 'Enabled/Disabled' statuses are shown for payments and payouts capabilities in settings.
+* Tweak - Updated the minimum supported versions of WordPress and WooCommerce.
 
 [See changelog for all versions](https://raw.githubusercontent.com/woocommerce/woocommerce-gateway-stripe/trunk/changelog.txt).

readme.txt

@@ -3,3 +3,8 @@
  * Set up shared by all tests.
  */
 update_option( 'woocommerce_default_country', 'US:CA' );
+
+if ( version_compare( WC_VERSION, '6.4.1', '=' ) ) {
+	\Automattic\WooCommerce\Internal\Admin\Install::create_tables();
+	\Automattic\WooCommerce\Internal\Admin\Install::create_events();
+}

tests/phpunit/setup.php

@@ -24,7 +24,9 @@ public function test_get_note() {
 			$this->assertSame( 'wc-stripe-upe-availability-note', $enable_upe_action->name );
 			$this->assertSame( 'Enable in your store', $enable_upe_action->label );
 			$this->assertSame( '?page=wc-settings&tab=checkout&section=stripe&panel=settings&highlight=enable-upe', $enable_upe_action->query );
-			$this->assertSame( true, $enable_upe_action->primary );
+			if ( version_compare( WC_VERSION, '6.5.0', '<' ) ) {
+				$this->assertSame( true, $enable_upe_action->primary );
+			}
 		} else {
 			$this->markTestSkipped( 'The used WC components are not backward compatible' );
 		}