Merge pull request #215 from awesomemotive/release/4.10.0

`release/4.10.0`

gruntfile.js

@@ -57,6 +57,7 @@ module.exports = function (grunt) {
           "_nx:1,2,4c,5d",
           "_n_noop:1,2,3d",
           "_nx_noop:1,2,3c,4d",
+          "wp_set_script_translations:1,2d",
         ],
       },
       files: {

includes/core/admin/class-notice-manager.php

@@ -44,22 +44,22 @@ class Notice_Manager {
 	 */
 	public function __construct() {
 		self::$core_notices = array(
-			'rest_api_error'     => array(
+			'rest_api_error' => array(
 				'dismissible' => false,
 				'type'        => 'error',
 				'callback'    => 'SimplePay\Core\Admin\Notices\no_rest_api',
 			),
-			'ssl_error'          => array(
+			'ssl_error'      => array(
 				'dismissible' => false,
 				'type'        => 'error',
 				'callback'    => 'SimplePay\Core\Admin\Notices\no_ssl',
 			),
-			'php_version_56'     => array(
+			'php_version_72' => array(
 				'dismissible' => false,
 				'type'        => 'error',
-				'callback'    => 'SimplePay\Core\Admin\Notices\php_version_56',
+				'callback'    => 'SimplePay\Core\Admin\Notices\php_version_72',
 			),
-			'stripe_connect'     => array(
+			'stripe_connect' => array(
 				'dismissible' => true,
 				'type'        => 'info',
 				'callback'    => 'SimplePay\Core\Admin\Notices\stripe_connect',
@@ -217,7 +217,7 @@ public static function ajax_dismiss_notice() {
 			return wp_send_json_error();
 		}
 
-		$lifespan  = isset( $_POST['lifespan'] )
+		$lifespan = isset( $_POST['lifespan'] )
 			? sanitize_text_field( $_POST['lifespan'] )
 			: '';
 
@@ -240,7 +240,6 @@ public static function link_dismiss_notice() {
 			? sanitize_text_field( $_GET['simpay_dismiss_notice_nonce'] )
 			: false;
 
-
 		if ( ! current_user_can( 'manage_options' ) ) {
 			return;
 		}

includes/core/admin/functions/notices.php

@@ -115,8 +115,8 @@ function stripe_connect() {
  *
  * @return string
  */
-function php_version_56() {
-	$future_required_version = 5.6;
+function php_version_72() {
+	$future_required_version = 7.2;
 
 	if ( ! version_compare( PHP_VERSION, $future_required_version, '<' ) ) {
 		return false;
@@ -129,80 +129,80 @@ function php_version_56() {
 	<strong><?php esc_html_e( 'WP Simple Pay is increasing its PHP version requirement.', 'stripe' ); ?></strong>
 </p>
 
-<?php
-echo wp_kses(
-	wpautop(
-		sprintf(
+	<?php
+	echo wp_kses(
+		wpautop(
+			sprintf(
 			/* translators: %1$s Future PHP version requirement. %2$s Current PHP version. %3$s Opening anchor tag, do not translate. %4$s Closing anchor tag, do not translate. */
-			__(
-				'WP Simple Pay will be increasing its PHP requirement to version %1$s or higher in an upcoming release. It looks like you\'re using version %2$s, which means you will need to upgrade your version of PHP to allow the plugin to continue to function. Newer versions of PHP are both faster and more secure. The version you\'re using %3$sno longer receives security updates%4$s, which is another great reason to update.',
-				'stripe'
+				__(
+					'WP Simple Pay will be increasing its PHP requirement to version %1$s or higher in an upcoming release. It looks like you\'re using version %2$s, which means you will need to upgrade your version of PHP to allow the plugin to continue to function. Newer versions of PHP are both faster and more secure. The version you\'re using %3$sno longer receives security updates%4$s, which is another great reason to update.',
+					'stripe'
+				),
+				'<code>' . $future_required_version . '</code>',
+				'<code>' . PHP_VERSION . '</code>',
+				'<a href="http://php.net/eol.php" target="_blank" rel="noopener noreferrer">',
+				'</a>'
+			)
+		),
+		array(
+			'code' => true,
+			'a'    => array(
+				'href'   => true,
+				'target' => true,
+				'rel'    => true,
 			),
-			'<code>' . $future_required_version . '</code>',
-			'<code>' . PHP_VERSION . '</code>',
-			'<a href="http://php.net/eol.php" target="_blank" rel="noopener noreferrer">',
-			'</a>'
 		)
-	),
-	array(
-		'code' => true,
-		'a'    => array(
-			'href'   => true,
-			'target' => true,
-			'rel'    => true,
-		),
-	)
-);
-?>
+	);
+	?>
 
 <p>
 	<strong><?php esc_html_e( 'Which version should I upgrade to?', 'stripe' ); ?></strong>
 </p>
 
-<?php
-echo wpautop(
-	wp_kses(
-		sprintf(
+	<?php
+	echo wpautop(
+		wp_kses(
+			sprintf(
 			/* translators: %1$s Future PHP version requirement. */
-			__(
-				'In order to be compatible with future versions of WP Simple Pay, you should update your PHP version to %1$s, <code>7.0</code>, <code>7.1</code>, or <code>7.2</code>. On a normal WordPress site, switching to PHP <code>%1$s</code> should never cause issues. We would however actually recommend you switch to PHP <code>7.1</code> or higher to receive the full speed and security benefits provided to more modern and fully supported versions of PHP. However, some plugins may not be fully compatible with PHP <code>7.x</code>, so more testing may be required.',
-				'stripe'
+				__(
+					'In order to be compatible with future versions of WP Simple Pay, you should update your PHP version to %1$s, <code>7.4</code>, or <code>8.0</code>. On a normal WordPress site, switching to PHP <code>%1$s</code> should never cause issues. We would however actually recommend you switch to PHP <code>8.0</code> or higher to receive the full speed and security benefits provided to more modern and fully supported versions of PHP. However, some plugins may not be fully compatible with PHP <code>8.x</code>, so more testing may be required.',
+					'stripe'
+				),
+				'<code>' . $future_required_version . '</code>'
 			),
-			'<code>' . $future_required_version . '</code>'
-		),
-		array(
-			'code' => true,
+			array(
+				'code' => true,
+			)
 		)
-	)
-);
-?>
+	);
+	?>
 
 <p>
 	<strong><?php esc_html_e( 'Need help upgrading? Ask your web host!', 'stripe' ); ?></strong>
 </p>
 
-<?php
-echo wpautop(
-	wp_kses(
-		sprintf(
+	<?php
+	echo wpautop(
+		wp_kses(
+			sprintf(
 			/* translators: %1$s Opening anchor tag, do not translate. %2$s Closing anchor tag, do not translate. */
-			__(
-				'Many web hosts can give you instructions on how/where to upgrade your version of PHP through their control panel, or may even be able to do it for you. If you need to change hosts, please see %1$sour hosting recommendations%2$s.',
-				'stripe'
-			),
-			'<a href="https://www.wpbeginner.com/wordpress-hosting/" target="_blank" rel="noopener noreferrer">',
-			'</a>'
-		),
-		array(
-			'a'    => array(
-				'href'   => true,
-				'target' => true,
-				'rel'    => true,
+				__(
+					'Many web hosts can give you instructions on how/where to upgrade your version of PHP through their control panel, or may even be able to do it for you. If you need to change hosts, please see %1$sour hosting recommendations%2$s.',
+					'stripe'
+				),
+				'<a href="https://www.wpbeginner.com/wordpress-hosting/" target="_blank" rel="noopener noreferrer">',
+				'</a>'
 			),
+			array(
+				'a' => array(
+					'href'   => true,
+					'target' => true,
+					'rel'    => true,
+				),
+			)
 		)
-	)
-);
-?>
+	);
+	?>
 
 	<?php
 	return ob_get_clean();

includes/core/assets/css/admin/settings.scss

@@ -189,6 +189,11 @@
 		&.simpay-settings-subsection-payment-notification,
 		&.simpay-settings-subsection-upcoming-invoice,
 		&.simpay-settings-subsection-manage-subscriptions,
+		&.simpay-settings-subsection-payment-processing-confirmation,
+		&.simpay-settings-subsection-payment-processing-notification,
+		&.simpay-settings-subsection-payment-refunded-confirmation,
+		&.simpay-settings-subsection-subscription-cancel-confirmation,
+		&.simpay-settings-subsection-subscription-cancel-notification,
 		&.simpay-settings-subsection-invoice-confirmation {
 			display: none;
 		}

includes/core/assets/js/dist/simpay-admin-dashboard-widget-report-css.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '10e0c9aefff5d3a8302d317cb61bc427');
+<?php return array('dependencies' => array(), 'version' => '2fc5df850afb9619b482b2d36d70211f');

includes/core/assets/js/dist/simpay-admin-dashboard-widget-report.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'react', 'wp-api-fetch', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-primitives', 'wp-url'), 'version' => 'af7158193a243840baf147a2c1cd6f5e');
+<?php return array('dependencies' => array('lodash', 'react', 'wp-api-fetch', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-primitives', 'wp-url'), 'version' => '45676981d2cb1015b0e201bc2fd50dc7');

includes/core/assets/js/dist/simpay-admin-form-template-explorer-css.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'f65ff075fab34cb49b6d582d31577036');
+<?php return array('dependencies' => array(), 'version' => '374a19a9c7d1b2e8f63c64cfdc233506');

includes/core/assets/js/dist/simpay-admin-form-template-explorer.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'wp-a11y', 'wp-components', 'wp-compose', 'wp-element', 'wp-i18n', 'wp-primitives', 'wp-url'), 'version' => '5dce049d9407deb8d0ff4624ab58bb21');
+<?php return array('dependencies' => array('lodash', 'wp-a11y', 'wp-components', 'wp-compose', 'wp-element', 'wp-i18n', 'wp-primitives', 'wp-url'), 'version' => 'd317b524f24f6ec8bc0334b96339c4fe');

includes/core/assets/js/dist/simpay-admin-help-css.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '657fa03a722399c998ae7b0233b5bb8d');
+<?php return array('dependencies' => array(), 'version' => '410c8f231808c04de36b327b88c79222');

includes/core/assets/js/dist/simpay-admin-help.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'wp-a11y', 'wp-components', 'wp-compose', 'wp-element', 'wp-i18n', 'wp-keycodes', 'wp-primitives', 'wp-url'), 'version' => '340417a4172b75d60d3db387972142da');
+<?php return array('dependencies' => array('lodash', 'wp-a11y', 'wp-components', 'wp-compose', 'wp-element', 'wp-i18n', 'wp-keycodes', 'wp-primitives', 'wp-url'), 'version' => '2582dbcfcda65c13b2fd8474ce3c3a1b');