From 3f6036c1be1834d12935aaac7ac7c63b17f9d44e Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Wed, 16 Feb 2022 14:41:21 +0100
Subject: [PATCH 01/87] Introduce new `$gateway->get_mode()` function.

---
 src/Core/Gateway.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Core/Gateway.php b/src/Core/Gateway.php
index 9a4ded41..a42748a5 100644
--- a/src/Core/Gateway.php
+++ b/src/Core/Gateway.php
@@ -831,4 +831,13 @@ public function create_invoice( $payment ) {
 	public function cancel_reservation( $payment ) {
 		return false;
 	}
+
+	/**
+	 * Get mode.
+	 * 
+	 * @return string
+	 */
+	public function get_mode() {
+		return self::MODE_LIVE;
+	}
 }

From b9dee633d9a87479e4e7f40ee46c200e450774ce Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Wed, 16 Feb 2022 14:42:11 +0100
Subject: [PATCH 02/87] No longer use '_pronamic_gateway_mode' meta in config
 select options.

---
 src/Plugin.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Plugin.php b/src/Plugin.php
index a0e17950..bbc090e2 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -769,11 +769,7 @@ public static function get_config_select_options( $payment_method = null ) {
 
 			$id = $post->ID;
 
-			$options[ $id ] = sprintf(
-				'%s (%s)',
-				get_the_title( $id ),
-				get_post_meta( $id, '_pronamic_gateway_mode', true )
-			);
+			$options[ $id ] = \get_the_title( $id );
 		}
 
 		return $options;

From 20417d05c8fb9181b19d3f00a918ceef459fcabf Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Wed, 16 Feb 2022 14:42:37 +0100
Subject: [PATCH 03/87] No longer complement payment mode from
 '_pronamic_gateway_mode' meta.

---
 src/Plugin.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/Plugin.php b/src/Plugin.php
index bbc090e2..56ac272c 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -915,15 +915,6 @@ public static function complement_payment( Payment $payment ) {
 			$payment->set_version( pronamic_pay_plugin()->get_version() );
 		}
 
-		// Mode.
-		$config_id = $payment->get_config_id();
-
-		if ( null === $payment->get_mode() && null !== $config_id ) {
-			$mode = get_post_meta( $config_id, '_pronamic_gateway_mode', true );
-
-			$payment->set_mode( $mode );
-		}
-
 		// Issuer.
 		$issuer = $payment->get_meta( 'issuer' );
 
@@ -1052,6 +1043,9 @@ public static function start_payment( Payment $payment ) {
 			return $payment;
 		}
 
+		// Mode.
+		$payment->set_mode( $gateway->get_mode() );
+
 		// Subscriptions.
 		$subscriptions = $payment->get_subscriptions();
 

From d0a7eecb3d228b3652245ec4a8078c80189bcd26 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Wed, 16 Feb 2022 14:44:49 +0100
Subject: [PATCH 04/87] Remove global mode setting.

---
 src/Admin/AdminGatewayPostType.php |  7 ------
 views/meta-box-gateway-config.php  | 37 ------------------------------
 2 files changed, 44 deletions(-)

diff --git a/src/Admin/AdminGatewayPostType.php b/src/Admin/AdminGatewayPostType.php
index 4db581a1..1d5ca01b 100644
--- a/src/Admin/AdminGatewayPostType.php
+++ b/src/Admin/AdminGatewayPostType.php
@@ -429,13 +429,6 @@ public function save_post( $post_id ) {
 
 		\update_post_meta( $post_id, '_pronamic_gateway_id', $gateway_id );
 
-		// Mode.
-		if ( \filter_has_var( INPUT_POST, '_pronamic_gateway_mode' ) ) {
-			$gateway_mode = \filter_input( INPUT_POST, '_pronamic_gateway_mode', FILTER_SANITIZE_STRING );
-
-			\update_post_meta( $post_id, '_pronamic_gateway_mode', $gateway_mode );
-		}
-
 		// Transient.
 		\delete_transient( 'pronamic_outdated_webhook_urls' );
 
diff --git a/views/meta-box-gateway-config.php b/views/meta-box-gateway-config.php
index 71c4e5de..a7b5bac4 100644
--- a/views/meta-box-gateway-config.php
+++ b/views/meta-box-gateway-config.php
@@ -126,43 +126,6 @@ function( $integration_a, $integration_b ) {
 				<p id="pronamic-pay-gateway-description"></p>
 			</td>
 		</tr>
-		<tr class="">
-			<th scope="row">
-				<label for="pronamic_ideal_mode">
-					<?php echo esc_html__( 'Mode', 'pronamic_ideal' ); ?>
-				</label>
-			</th>
-			<td>
-				<?php
-
-				$attributes = array(
-					'id'    => 'pronamic_ideal_mode',
-					'name'  => '_pronamic_gateway_mode',
-					'class' => 'pronamic-pay-form-control',
-				);
-
-				$options = array(
-					array(
-						'options' => array(
-							'test' => __( 'Test', 'pronamic_ideal' ),
-							'live' => __( 'Live', 'pronamic_ideal' ),
-						),
-					),
-				);
-
-				$value = get_post_meta( $config_id, '_pronamic_gateway_mode', true );
-
-				printf(
-					'<select %s>%s</select>',
-					// @codingStandardsIgnoreStart
-					Util::array_to_html_attributes( $attributes ),
-					Util::select_options_grouped( $options, $value )
-					// @codingStandardsIgnoreEnd
-				);
-
-				?>
-			</td>
-		</tr>
 	</table>
 </div>
 

From aedc385606c604c9cdfa6cb4b3ba9e89d7038bf6 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Wed, 16 Feb 2022 14:51:55 +0100
Subject: [PATCH 05/87] No longer use '_pronamic_gateway_mode' in site health
 information.

---
 src/Admin/AdminHealth.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Admin/AdminHealth.php b/src/Admin/AdminHealth.php
index 961e8e4d..619d5c7e 100644
--- a/src/Admin/AdminHealth.php
+++ b/src/Admin/AdminHealth.php
@@ -161,11 +161,7 @@ private function get_active_gateway_integrations_debug() {
 
 			$integration = $this->plugin->gateway_integrations->get_integration( $gateway_id );
 
-			$active[] = sprintf(
-				'%s (%s)',
-				null === $integration ? $gateway_id : $integration->get_name(),
-				\get_post_meta( $post->ID, '_pronamic_gateway_mode', true )
-			);
+			$active[] = ( null === $integration ) ? $gateway_id : $integration->get_name();
 		}
 
 		$active = \array_unique( $active );

From 4a7f526686efce7d9667c8635d263c83e5bf85c8 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Thu, 17 Feb 2022 09:02:51 +0100
Subject: [PATCH 06/87] Remove general mode var from gateway config.

---
 src/Core/GatewayConfig.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/Core/GatewayConfig.php b/src/Core/GatewayConfig.php
index 9d615a58..da377e75 100644
--- a/src/Core/GatewayConfig.php
+++ b/src/Core/GatewayConfig.php
@@ -21,10 +21,5 @@
  * @since   1.0.0
  */
 abstract class GatewayConfig {
-	/**
-	 * Mode
-	 *
-	 * @var string
-	 */
-	public $mode;
+
 }

From 5fa1437a14be6332c3be10247d1de9f5de6456ce Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Thu, 17 Feb 2022 09:15:47 +0100
Subject: [PATCH 07/87] Allow callable for default value.

---
 views/meta-box-gateway-settings.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/views/meta-box-gateway-settings.php b/views/meta-box-gateway-settings.php
index 88e8ac42..d8130939 100644
--- a/views/meta-box-gateway-settings.php
+++ b/views/meta-box-gateway-settings.php
@@ -275,6 +275,8 @@ function( $section ) {
 
 							// Set default.
 							if ( empty( $value ) && isset( $field['default'] ) ) {
+								$default = $field['default'];
+
 								/**
 								 * An empty value can also be an empty string, this
 								 * should not always be overwritten with the default
@@ -286,7 +288,7 @@ function( $section ) {
 								$meta = get_post_meta( $config_id, $field['meta_key'], false );
 
 								if ( empty( $meta ) ) {
-									$value = $field['default'];
+									$value = \is_callable( $default ) ? call_user_func( $default, $config_id ) : $default;
 								}
 							}
 

From 91630102fbf8db7b13617df0a7e47b80c940ee7f Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Thu, 17 Feb 2022 09:50:30 +0100
Subject: [PATCH 08/87] Add mode trait.

---
 src/AbstractGatewayIntegration.php |  7 ++++
 src/Core/Gateway.php               | 11 ++----
 src/Core/ModeTrait.php             | 56 ++++++++++++++++++++++++++++++
 src/Payments/PaymentInfo.php       | 37 ++------------------
 4 files changed, 67 insertions(+), 44 deletions(-)
 create mode 100644 src/Core/ModeTrait.php

diff --git a/src/AbstractGatewayIntegration.php b/src/AbstractGatewayIntegration.php
index 2fe03a71..7b77ec8c 100644
--- a/src/AbstractGatewayIntegration.php
+++ b/src/AbstractGatewayIntegration.php
@@ -12,6 +12,7 @@
 
 use Pronamic\WordPress\Pay\Core\Gateway;
 use Pronamic\WordPress\Pay\Core\GatewayConfig;
+use Pronamic\WordPress\Pay\Core\ModeTrait;
 
 /**
  * Title: Abstract gateway integration
@@ -67,6 +68,8 @@ abstract class AbstractGatewayIntegration extends AbstractIntegration {
 	 */
 	protected $supports = array();
 
+	use ModeTrait;
+
 	/**
 	 * Construct.
 	 *
@@ -76,6 +79,7 @@ public function __construct( $args = array() ) {
 		$args = wp_parse_args(
 			$args,
 			array(
+				'mode'          => 'live',
 				'provider'      => null,
 				'url'           => null,
 				'product_url'   => null,
@@ -87,6 +91,9 @@ public function __construct( $args = array() ) {
 
 		parent::__construct( $args );
 
+		// Mode.
+		$this->set_mode( $args['mode'] );
+
 		// Provider.
 		$this->provider = $args['provider'];
 
diff --git a/src/Core/Gateway.php b/src/Core/Gateway.php
index a42748a5..4668fed0 100644
--- a/src/Core/Gateway.php
+++ b/src/Core/Gateway.php
@@ -107,6 +107,8 @@ abstract class Gateway {
 	 */
 	public $error;
 
+	use ModeTrait;
+
 	/**
 	 * Constructs and initializes an gateway
 	 *
@@ -831,13 +833,4 @@ public function create_invoice( $payment ) {
 	public function cancel_reservation( $payment ) {
 		return false;
 	}
-
-	/**
-	 * Get mode.
-	 * 
-	 * @return string
-	 */
-	public function get_mode() {
-		return self::MODE_LIVE;
-	}
 }
diff --git a/src/Core/ModeTrait.php b/src/Core/ModeTrait.php
new file mode 100644
index 00000000..2daebab2
--- /dev/null
+++ b/src/Core/ModeTrait.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Mode Trait
+ *
+ * @author    Pronamic <info@pronamic.eu>
+ * @copyright 2005-2022 Pronamic
+ * @license   GPL-3.0-or-later
+ * @package   Pronamic\WordPress\Pay\Privacy
+ */
+
+namespace Pronamic\WordPress\Pay\Core;
+
+/**
+ * Mode Trait
+ *
+ * @author  Remco Tolsma
+ * @version 2.5.0
+ * @since   2.5.0
+ * @link    https://github.com/search?q=%22trait+VersionTrait%22+language%3APHP&type=Code
+ */
+trait ModeTrait {
+	/**
+	 * Mode.
+	 *
+	 * @var string
+	 */
+	private $mode = 'live';
+
+	/**
+	 * Set mode.
+	 *
+	 * @param string $mode Mode.
+	 * @return void
+	 * @throws \InvalidArgumentException Throws invalid argument exception when mode is not a string or not one of the mode constants.
+	 */
+	public function set_mode( $mode ) {
+		if ( ! is_string( $mode ) ) {
+			throw new \InvalidArgumentException( 'Mode must be a string.' );
+		}
+
+		if ( ! in_array( $mode, array( Gateway::MODE_TEST, Gateway::MODE_LIVE ), true ) ) {
+			throw new \InvalidArgumentException( 'Invalid mode.' );
+		}
+
+		$this->mode = $mode;
+	}
+
+	/**
+	 * Get mode.
+	 *
+	 * @return string
+	 */
+	public function get_mode() {
+		return $this->mode;
+	}
+}
diff --git a/src/Payments/PaymentInfo.php b/src/Payments/PaymentInfo.php
index 802fe944..8e3f0fa1 100644
--- a/src/Payments/PaymentInfo.php
+++ b/src/Payments/PaymentInfo.php
@@ -34,6 +34,8 @@ abstract class PaymentInfo {
 
 	use \Pronamic\WordPress\Pay\Core\VersionTrait;
 
+	use \Pronamic\WordPress\Pay\Core\ModeTrait;
+
 	use \Pronamic\WordPress\Pay\Privacy\AnonymizedTrait;
 
 	use \Pronamic\WordPress\Pay\Payments\PaymentInfoTrait;
@@ -174,13 +176,6 @@ abstract class PaymentInfo {
 	 */
 	public $lines;
 
-	/**
-	 * Mode.
-	 *
-	 * @var string|null
-	 */
-	private $mode;
-
 	/**
 	 * Credit card
 	 *
@@ -557,34 +552,6 @@ public function get_credit_card() {
 		return $this->credit_card;
 	}
 
-	/**
-	 * Set mode.
-	 *
-	 * @param string|null $mode Mode.
-	 * @return void
-	 * @throws \InvalidArgumentException Throws invalid argument exception when mode is not a string or not one of the mode constants.
-	 */
-	public function set_mode( $mode ) {
-		if ( ! is_string( $mode ) ) {
-			throw new \InvalidArgumentException( 'Mode must be a string.' );
-		}
-
-		if ( ! in_array( $mode, array( Gateway::MODE_TEST, Gateway::MODE_LIVE ), true ) ) {
-			throw new \InvalidArgumentException( 'Invalid mode.' );
-		}
-
-		$this->mode = $mode;
-	}
-
-	/**
-	 * Get mode.
-	 *
-	 * @return string|null
-	 */
-	public function get_mode() {
-		return $this->mode;
-	}
-
 	/**
 	 * Get the unique key.
 	 *

From 1905e669f6b71aa13b575e9b352adbdf54258814 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Thu, 17 Feb 2022 12:07:23 +0100
Subject: [PATCH 09/87] Simplify dashboard URL's, just one URL allowed.

---
 src/AbstractGatewayIntegration.php | 18 ++++--------------
 views/meta-box-gateway-config.php  | 26 +++++---------------------
 2 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/src/AbstractGatewayIntegration.php b/src/AbstractGatewayIntegration.php
index 7b77ec8c..ff54d54d 100644
--- a/src/AbstractGatewayIntegration.php
+++ b/src/AbstractGatewayIntegration.php
@@ -50,7 +50,7 @@ abstract class AbstractGatewayIntegration extends AbstractIntegration {
 	/**
 	 * Dashboard URL.
 	 *
-	 * @var string|array
+	 * @var string|null
 	 */
 	public $dashboard_url;
 
@@ -83,7 +83,7 @@ public function __construct( $args = array() ) {
 				'provider'      => null,
 				'url'           => null,
 				'product_url'   => null,
-				'dashboard_url' => array(),
+				'dashboard_url' => null,
 				'manual_url'    => null,
 				'supports'      => array(),
 			)
@@ -138,20 +138,10 @@ public function get_settings_fields() {
 	/**
 	 * Get dashboard URL.
 	 *
-	 * @return array
+	 * @return string|null
 	 */
 	public function get_dashboard_url() {
-		$url = array();
-
-		if ( isset( $this->dashboard_url ) ) {
-			if ( is_string( $this->dashboard_url ) ) {
-				$url = array( $this->dashboard_url );
-			} elseif ( is_array( $this->dashboard_url ) ) {
-				$url = $this->dashboard_url;
-			}
-		}
-
-		return $url;
+		return $this->dashboard_url;
 	}
 
 	/**
diff --git a/views/meta-box-gateway-config.php b/views/meta-box-gateway-config.php
index a7b5bac4..757046cd 100644
--- a/views/meta-box-gateway-config.php
+++ b/views/meta-box-gateway-config.php
@@ -60,29 +60,13 @@ function( $integration_a, $integration_b ) {
 						}
 
 						// Dashboard links.
-						$dashboards = $integration->get_dashboard_url();
+						$dashboard_url = $integration->get_dashboard_url();
 
-						if ( 1 === count( $dashboards ) ) {
+						if ( null !== $dashboard_url ) {if ( is_array( $dashboard_url ) ) {var_dump($integration );}
 							$links[] = sprintf(
-								'<a href="%s" title="%s">%2$s</a>',
-								esc_attr( $dashboards[0] ),
-								__( 'Dashboard', 'pronamic_ideal' )
-							);
-						} elseif ( count( $dashboards ) > 1 ) {
-							$dashboard_urls = array();
-
-							foreach ( $dashboards as $dashboard_name => $dashboard_url ) {
-								$dashboard_urls[] = sprintf(
-									'<a href="%s" title="%s">%2$s</a>',
-									esc_attr( $dashboard_url ),
-									esc_html( ucfirst( $dashboard_name ) )
-								);
-							}
-
-							$links[] = sprintf(
-								'%s: %s',
-								__( 'Dashboards', 'pronamic_ideal' ),
-								strtolower( implode( ', ', $dashboard_urls ) )
+								'<a href="%s">%2$s</a>',
+								\esc_url( $dashboard_url ),
+								\esc_html__( 'Dashboard', 'pronamic_ideal' )
 							);
 						}
 

From a28fe2a058e447a33939b5333dafe570cb331560 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Thu, 17 Feb 2022 12:10:52 +0100
Subject: [PATCH 10/87] Remove title attribute and use correct escape
 functions.

---
 views/meta-box-gateway-config.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/views/meta-box-gateway-config.php b/views/meta-box-gateway-config.php
index 757046cd..4ef451d7 100644
--- a/views/meta-box-gateway-config.php
+++ b/views/meta-box-gateway-config.php
@@ -73,9 +73,9 @@ function( $integration_a, $integration_b ) {
 						// Product link.
 						if ( null !== $integration->get_product_url() ) {
 							$links[] = sprintf(
-								'<a href="%s" target="_blank" title="%s">%2$s</a>',
-								$integration->get_product_url(),
-								__( 'Product information', 'pronamic_ideal' )
+								'<a href="%s" target="_blank">%s</a>',
+								\esc_url( $integration->get_product_url() ),
+								\esc_html__( 'Product information', 'pronamic_ideal' )
 							);
 						}
 
@@ -84,9 +84,8 @@ function( $integration_a, $integration_b ) {
 
 						if ( null !== $manual_url ) {
 							$links[] = sprintf(
-								'<a href="%s" target="_blank" title="%s">%s</a>',
+								'<a href="%s" target="_blank">%s</a>',
 								\esc_url( $plugin->tracking_module->get_tracking_url( $manual_url ) ),
-								\esc_attr__( 'Manual', 'pronamic_ideal' ),
 								\esc_html__( 'Manual', 'pronamic_ideal' )
 							);
 						}

From 00f610ff2c70802f9825e10a32c7e5c977afd24b Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Thu, 17 Feb 2022 13:28:07 +0100
Subject: [PATCH 11/87] Remove `$gateway->set_error()`, no longer used.

---
 src/Core/Gateway.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/Core/Gateway.php b/src/Core/Gateway.php
index 4668fed0..ab415520 100644
--- a/src/Core/Gateway.php
+++ b/src/Core/Gateway.php
@@ -158,16 +158,6 @@ public function has_error() {
 		return null !== $this->error;
 	}
 
-	/**
-	 * Set error
-	 *
-	 * @param WP_Error|null $error WordPress error object or null.
-	 * @return void
-	 */
-	public function set_error( WP_Error $error = null ) {
-		$this->error = $error;
-	}
-
 	/**
 	 * Set the method.
 	 *

From e850cb2f4cafd26040eabbbd30512f17e3026f06 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Thu, 17 Feb 2022 13:29:22 +0100
Subject: [PATCH 12/87] No longer need to check for gateway error, we will use
 exceptions only.

---
 src/Plugin.php | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/Plugin.php b/src/Plugin.php
index 56ac272c..3cf7268a 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -1072,21 +1072,6 @@ public static function start_payment( Payment $payment ) {
 		// Start payment at the gateway.
 		try {
 			$gateway->start( $payment );
-
-			// Add gateway errors as payment notes.
-			$error = $gateway->get_error();
-
-			if ( $error instanceof \WP_Error ) {
-				$message = $error->get_error_message();
-				$code    = $error->get_error_code();
-
-				if ( ! \is_int( $code ) ) {
-					$message = sprintf( '%s: %s', $code, $message );
-					$code    = 0;
-				}
-
-				throw new \Exception( $message, $code );
-			}
 		} catch ( \Exception $error ) {
 			$message = $error->getMessage();
 

From 396e80219b68b7fa8f053f9471ebc45f5086000e Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Thu, 17 Feb 2022 13:30:36 +0100
Subject: [PATCH 13/87] No longer need to check for gateway error, will use
 exceptions only.

---
 src/Subscriptions/SubscriptionsModule.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/Subscriptions/SubscriptionsModule.php b/src/Subscriptions/SubscriptionsModule.php
index 7f809a0d..0c49966e 100644
--- a/src/Subscriptions/SubscriptionsModule.php
+++ b/src/Subscriptions/SubscriptionsModule.php
@@ -515,14 +515,6 @@ private function handle_subscription_mandate( Subscription $subscription ) {
 				exit;
 			}
 
-			$error = $gateway->get_error();
-
-			if ( $error instanceof WP_Error ) {
-				Plugin::render_errors( $error );
-
-				exit;
-			}
-
 			$gateway->redirect( $payment );
 
 			return;

From 874e0ef92e94a6617b5924f0e16a9c745eda836a Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Thu, 17 Feb 2022 13:30:58 +0100
Subject: [PATCH 14/87] No longer need to check for gateway error, will use
 exceptions only.

---
 src/Subscriptions/SubscriptionsModule.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/Subscriptions/SubscriptionsModule.php b/src/Subscriptions/SubscriptionsModule.php
index 0c49966e..a421990f 100644
--- a/src/Subscriptions/SubscriptionsModule.php
+++ b/src/Subscriptions/SubscriptionsModule.php
@@ -395,14 +395,6 @@ private function handle_subscription_renew( Subscription $subscription ) {
 				exit;
 			}
 
-			$error = $gateway->get_error();
-
-			if ( $error instanceof WP_Error ) {
-				Plugin::render_errors( $error );
-
-				exit;
-			}
-
 			// Redirect.
 			try {
 				$gateway->redirect( $payment );

From 0d52ed6813891d063de01a632fe84b684dc7d416 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Thu, 17 Feb 2022 13:35:15 +0100
Subject: [PATCH 15/87] No longer check for gateway error, step towards
 exceptions only.

---
 views/meta-box-gateway-test.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/views/meta-box-gateway-test.php b/views/meta-box-gateway-test.php
index 19b9201e..a4fa1952 100644
--- a/views/meta-box-gateway-test.php
+++ b/views/meta-box-gateway-test.php
@@ -54,10 +54,6 @@
 	}
 }
 
-if ( $gateway->has_error() ) {
-	$pronamic_ideal_errors[] = $gateway->get_error();
-}
-
 require Plugin::$dirname . '/views/errors.php';
 
 $currency = Currency::get_instance( 'EUR' );

From d196e6316ca9540157b758331b860bcadb038526 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Thu, 17 Feb 2022 13:35:49 +0100
Subject: [PATCH 16/87] Remove `$gateway->has_error()`, no longer used.

---
 src/Core/Gateway.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/Core/Gateway.php b/src/Core/Gateway.php
index ab415520..13be181b 100644
--- a/src/Core/Gateway.php
+++ b/src/Core/Gateway.php
@@ -149,15 +149,6 @@ public function get_error() {
 		return $this->error;
 	}
 
-	/**
-	 * Has error
-	 *
-	 * @return boolean
-	 */
-	public function has_error() {
-		return null !== $this->error;
-	}
-
 	/**
 	 * Set the method.
 	 *

From d8c83fabdb1a4d63eb8e47a05e5a92f97e31efef Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Thu, 17 Feb 2022 13:46:04 +0100
Subject: [PATCH 17/87] No longer check on gateway error, requires exception
 handling.

---
 src/Plugin.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/Plugin.php b/src/Plugin.php
index 3cf7268a..46a8c017 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -522,13 +522,7 @@ public function maybe_redirect() {
 			if ( $gateway->is_html_form() ) {
 				$gateway->start( $payment );
 
-				$error = $gateway->get_error();
-
-				if ( $error instanceof WP_Error ) {
-					self::render_errors( $error );
-				} else {
-					$gateway->redirect( $payment );
-				}
+				$gateway->redirect( $payment );
 			}
 		}
 

From ecc2ebd6bdbec7f5eca916c75561b9c6da60571c Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Thu, 17 Feb 2022 13:48:37 +0100
Subject: [PATCH 18/87] No longer check on gateway error, instead catch
 exceptions for payment note.

---
 src/Plugin.php | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/Plugin.php b/src/Plugin.php
index 46a8c017..a9347dcf 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -369,19 +369,24 @@ public static function update_payment( $payment = null, $can_redirect = true ) {
 		}
 
 		// Update status.
-		$gateway->update_status( $payment );
+		try {
+			$gateway->update_status( $payment );
 
-		// Add gateway errors as payment notes.
-		$error = $gateway->get_error();
+			// Update payment in data store.
+			$payment->save();
+		} catch ( \Exception $error ) {
+			$message = $error->getMessage();
+
+			// Maybe include error code in message.
+			$code = $error->getCode();
 
-		if ( $error instanceof WP_Error ) {
-			foreach ( $error->get_error_codes() as $code ) {
-				$payment->add_note( sprintf( '%s: %s', $code, $error->get_error_message( $code ) ) );
+			if ( $code > 0 ) {
+				$message = \sprintf( '%s: %s', $code, $message );
 			}
-		}
 
-		// Update payment in data store.
-		$payment->save();
+			// Add note.
+			$payment->add_note( $message );
+		}
 
 		// Maybe redirect.
 		if ( ! $can_redirect ) {

From 930353dd222b09eda003741f2eeb33006133f699 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Thu, 17 Feb 2022 13:50:21 +0100
Subject: [PATCH 19/87] Remove error from gateway, no longer used.

---
 src/Core/Gateway.php | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/Core/Gateway.php b/src/Core/Gateway.php
index 13be181b..16329609 100644
--- a/src/Core/Gateway.php
+++ b/src/Core/Gateway.php
@@ -100,13 +100,6 @@ abstract class Gateway {
 	 */
 	protected $supports;
 
-	/**
-	 * Error
-	 *
-	 * @var WP_Error|null
-	 */
-	public $error;
-
 	use ModeTrait;
 
 	/**
@@ -140,15 +133,6 @@ public function supports( $feature ) {
 		return in_array( $feature, $this->supports, true );
 	}
 
-	/**
-	 * Get the error
-	 *
-	 * @return WP_Error|null
-	 */
-	public function get_error() {
-		return $this->error;
-	}
-
 	/**
 	 * Set the method.
 	 *

From fa8e6977f1ebfc2bd68733eb89de8882d917c754 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Thu, 17 Feb 2022 14:08:12 +0100
Subject: [PATCH 20/87] Dashboard URL update.

---
 src/Admin/AdminGatewayPostType.php | 30 +++++-------------------------
 1 file changed, 5 insertions(+), 25 deletions(-)

diff --git a/src/Admin/AdminGatewayPostType.php b/src/Admin/AdminGatewayPostType.php
index 1d5ca01b..44f3618f 100644
--- a/src/Admin/AdminGatewayPostType.php
+++ b/src/Admin/AdminGatewayPostType.php
@@ -177,35 +177,15 @@ public function custom_columns( $column, $post_id ) {
 				break;
 			case 'pronamic_gateway_dashboard':
 				if ( isset( $integration ) ) {
-					$urls = $integration->get_dashboard_url();
+					$url = $integration->get_dashboard_url();
 
-					// Output.
-					$content = array();
-
-					foreach ( $urls as $name => $url ) {
-						if ( empty( $name ) ) {
-							$name = __( 'Dashboard', 'pronamic_ideal' );
-						}
-
-						$content[] = sprintf(
+					if ( null !== $url ) {
+						\printf(
 							'<a href="%s" target="_blank">%s</a>',
-							esc_attr( $url ),
-							esc_html( ucfirst( strval( $name ) ) )
+							esc_url( $url ),
+							esc_html__( 'Dashboard', 'pronamic_ideal' )
 						);
 					}
-
-					echo wp_kses(
-						implode(
-							' | ',
-							$content
-						),
-						array(
-							'a' => array(
-								'href'   => array(),
-								'target' => array(),
-							),
-						)
-					);
 				}
 
 				break;

From 2ac4833c95b3f4e5963f9e53155bc1983033ba58 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Thu, 17 Feb 2022 17:06:08 +0100
Subject: [PATCH 21/87] Remove gateway configuration.

---
 src/Core/Gateway.php | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/Core/Gateway.php b/src/Core/Gateway.php
index 16329609..2d7fc871 100644
--- a/src/Core/Gateway.php
+++ b/src/Core/Gateway.php
@@ -56,13 +56,6 @@ abstract class Gateway {
 	 */
 	const MODE_LIVE = 'live';
 
-	/**
-	 * Config
-	 *
-	 * @var GatewayConfig
-	 */
-	protected $config;
-
 	/**
 	 * The method of this gateway
 	 *
@@ -107,9 +100,7 @@ abstract class Gateway {
 	 *
 	 * @param GatewayConfig $config Gateway configuration object.
 	 */
-	public function __construct( GatewayConfig $config ) {
-		$this->config = $config;
-
+	public function __construct( GatewayConfig $config = null ) {
 		/**
 		 * Supported features.
 		 *
@@ -188,7 +179,7 @@ public function get_transient_issuers() {
 		$issuers = null;
 
 		// Transient name.
-		$transient = 'pronamic_pay_issuers_' . md5( serialize( $this->config ) );
+		$transient = 'pronamic_pay_issuers_' . md5( serialize( $this ) );
 
 		$result = get_transient( $transient );
 
@@ -215,7 +206,7 @@ public function get_transient_credit_card_issuers() {
 		$issuers = null;
 
 		// Transient name.
-		$transient = 'pronamic_pay_credit_card_issuers_' . md5( serialize( $this->config ) );
+		$transient = 'pronamic_pay_credit_card_issuers_' . md5( serialize( $this ) );
 
 		$result = get_transient( $transient );
 
@@ -274,7 +265,7 @@ public function get_available_payment_methods() {
 	 */
 	public function get_transient_available_payment_methods( $update_active_methods = true ) {
 		// Transient name.
-		$transient = 'pronamic_gateway_payment_methods_' . md5( serialize( $this->config ) );
+		$transient = 'pronamic_gateway_payment_methods_' . md5( serialize( $this ) );
 
 		$methods = get_transient( $transient );
 

From 4a405bf440ef7b4bb50742a2b634628be410da27 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Fri, 18 Feb 2022 10:53:55 +0100
Subject: [PATCH 22/87] Update composer.json

---
 composer.json | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index d7f6d33b..5980ea51 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,12 @@
 		]
 	},
 	"config": {
-		"sort-packages": true
+		"sort-packages": true,
+		"allow-plugins": {
+			"dealerdirect/phpcodesniffer-composer-installer": true,
+			"bamarni/composer-bin-plugin": true,
+			"roots/wordpress-core-installer": true
+		}
 	},
 	"repositories": [
 		{
@@ -46,7 +51,6 @@
 		"ext-dom": "*",
 		"ext-libxml": "*",
 		"ext-simplexml": "*",
-		"composer/installers": "^1.7",
 		"pronamic/wp-datetime": "^2.0",
 		"pronamic/wp-html": "^2.0",
 		"pronamic/wp-http": "^1.0",
@@ -57,6 +61,7 @@
 		"woocommerce/action-scheduler": "^3.0"
 	},
 	"require-dev": {
+		"automattic/wordbless": "^0.3.1",
 		"bamarni/composer-bin-plugin": "^1.4",
 		"overtrue/phplint": "^2.2",
 		"php-coveralls/php-coveralls": "^2.4",

From ea2407518e68d686c9972fd2b10e345e1cfafd29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Tue, 22 Feb 2022 09:17:22 +0100
Subject: [PATCH 23/87] Fix "Notice: Undefined variable: error".

---
 src/Plugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Plugin.php b/src/Plugin.php
index a9347dcf..32540f8f 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -1097,7 +1097,7 @@ public static function start_payment( Payment $payment ) {
 		}
 
 		// Throw/rethrow exception.
-		if ( $error instanceof \Exception ) {
+		if ( isset( $error ) && $error instanceof \Exception ) {
 			throw $error;
 		}
 

From b3d8a403b53bbf064c9bd4a9c32a2ffbae72b8fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Tue, 22 Feb 2022 10:24:34 +0100
Subject: [PATCH 24/87] Remove debug code.

---
 composer.json                     |  3 ++-
 docs/hooks.md                     | 10 +++++-----
 views/meta-box-gateway-config.php |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index 5980ea51..631b8d4d 100644
--- a/composer.json
+++ b/composer.json
@@ -37,7 +37,8 @@
 		"allow-plugins": {
 			"dealerdirect/phpcodesniffer-composer-installer": true,
 			"bamarni/composer-bin-plugin": true,
-			"roots/wordpress-core-installer": true
+			"roots/wordpress-core-installer": true,
+			"composer/installers": true
 		}
 	},
 	"repositories": [
diff --git a/docs/hooks.md b/docs/hooks.md
index 6b3289ef..8c615633 100644
--- a/docs/hooks.md
+++ b/docs/hooks.md
@@ -368,7 +368,7 @@ Argument | Type | Description
 `$should_redirect` | `bool` | Flag to indicate if redirect is allowed on handling payment return.
 `$payment` | `\Pronamic\WordPress\Pay\Payments\Payment` | Payment.
 
-Source: [src/Plugin.php](../src/Plugin.php), [line 457](../src/Plugin.php#L457-L463)
+Source: [src/Plugin.php](../src/Plugin.php), [line 462](../src/Plugin.php#L462-L468)
 
 ### `pronamic_pay_gateways`
 
@@ -380,7 +380,7 @@ Argument | Type | Description
 -------- | ---- | -----------
 `$gateways` | `\Pronamic\WordPress\Pay\AbstractGatewayIntegration[]` | Gateway integrations.
 
-Source: [src/Plugin.php](../src/Plugin.php), [line 623](../src/Plugin.php#L623-L628)
+Source: [src/Plugin.php](../src/Plugin.php), [line 622](../src/Plugin.php#L622-L627)
 
 ### `pronamic_pay_plugin_integrations`
 
@@ -392,7 +392,7 @@ Argument | Type | Description
 -------- | ---- | -----------
 `$plugin_integrations` | `\Pronamic\WordPress\Pay\AbstractPluginIntegration[]` | Plugin integrations.
 
-Source: [src/Plugin.php](../src/Plugin.php), [line 638](../src/Plugin.php#L638-L643)
+Source: [src/Plugin.php](../src/Plugin.php), [line 637](../src/Plugin.php#L637-L642)
 
 ### `pronamic_payment_gateway_configuration_id`
 
@@ -405,7 +405,7 @@ Argument | Type | Description
 `$config_id` | `null\|int` | Gateway configuration ID.
 `$payment` | `\Pronamic\WordPress\Pay\Payments\Payment` | Payment.
 
-Source: [src/Plugin.php](../src/Plugin.php), [line 1033](../src/Plugin.php#L1033-L1039)
+Source: [src/Plugin.php](../src/Plugin.php), [line 1019](../src/Plugin.php#L1019-L1025)
 
 ### `pronamic_payment_redirect_url_{$source}`
 
@@ -418,7 +418,7 @@ Argument | Type | Description
 `$url` | `null\|string` | Redirect URL.
 `$payment` | `\Pronamic\WordPress\Pay\Payments\Payment` | Payment.
 
-Source: [src/Plugin.php](../src/Plugin.php), [line 1233](../src/Plugin.php#L1233-L1239)
+Source: [src/Plugin.php](../src/Plugin.php), [line 1207](../src/Plugin.php#L1207-L1213)
 
 ### `pronamic_gateway_configuration_display_value`
 
diff --git a/views/meta-box-gateway-config.php b/views/meta-box-gateway-config.php
index 4ef451d7..44fcd45b 100644
--- a/views/meta-box-gateway-config.php
+++ b/views/meta-box-gateway-config.php
@@ -62,7 +62,7 @@ function( $integration_a, $integration_b ) {
 						// Dashboard links.
 						$dashboard_url = $integration->get_dashboard_url();
 
-						if ( null !== $dashboard_url ) {if ( is_array( $dashboard_url ) ) {var_dump($integration );}
+						if ( null !== $dashboard_url ) {
 							$links[] = sprintf(
 								'<a href="%s">%2$s</a>',
 								\esc_url( $dashboard_url ),

From 7117045fe5aea93de00696bbf0e23b41c549109f Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Mon, 28 Feb 2022 15:52:59 +0100
Subject: [PATCH 25/87] Simplify exception handling.

---
 src/Plugin.php | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/Plugin.php b/src/Plugin.php
index 32540f8f..8aee716d 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -1071,11 +1071,11 @@ public static function start_payment( Payment $payment ) {
 		// Start payment at the gateway.
 		try {
 			$gateway->start( $payment );
-		} catch ( \Exception $error ) {
-			$message = $error->getMessage();
+		} catch ( \Exception $exception ) {
+			$message = $exception->getMessage();
 
 			// Maybe include error code in message.
-			$code = $error->getCode();
+			$code = $exception->getCode();
 
 			if ( $code > 0 ) {
 				$message = \sprintf( '%s: %s', $code, $message );
@@ -1086,21 +1086,19 @@ public static function start_payment( Payment $payment ) {
 
 			// Set payment status.
 			$payment->set_status( PaymentStatus::FAILURE );
-		}
 
-		// Save payment.
-		$payment->save();
+			// Rethrow.
+			throw $exception;
+		} finally {
+			// Save payment.
+			$payment->save();
+		}
 
 		// Schedule payment status check.
 		if ( $gateway->supports( 'payment_status_request' ) ) {
 			StatusChecker::schedule_event( $payment );
 		}
 
-		// Throw/rethrow exception.
-		if ( isset( $error ) && $error instanceof \Exception ) {
-			throw $error;
-		}
-
 		return $payment;
 	}
 

From fce326aa450054ed27656e0a4d27203825f8025b Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Mon, 28 Feb 2022 15:54:06 +0100
Subject: [PATCH 26/87] Obvious.

---
 src/Plugin.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Plugin.php b/src/Plugin.php
index 8aee716d..b8d236d1 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -1081,16 +1081,12 @@ public static function start_payment( Payment $payment ) {
 				$message = \sprintf( '%s: %s', $code, $message );
 			}
 
-			// Add note.
 			$payment->add_note( $message );
 
-			// Set payment status.
 			$payment->set_status( PaymentStatus::FAILURE );
 
-			// Rethrow.
 			throw $exception;
 		} finally {
-			// Save payment.
 			$payment->save();
 		}
 

From b7cb9a10682937087f22844fc872d3f3220c08c5 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Mon, 28 Feb 2022 16:04:22 +0100
Subject: [PATCH 27/87] Catch exception, no longer use `errors.php` from plugin
 repo.

---
 views/meta-box-gateway-test.php | 44 ++++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/views/meta-box-gateway-test.php b/views/meta-box-gateway-test.php
index a4fa1952..819ae984 100644
--- a/views/meta-box-gateway-test.php
+++ b/views/meta-box-gateway-test.php
@@ -36,26 +36,42 @@
 
 $inputs = array();
 
-foreach ( $payment_methods as $payment_method => $method_name ) {
-	if ( ! \is_string( $payment_method ) ) {
-		$payment_method = null;
-	}
+try {
+	foreach ( $payment_methods as $payment_method => $method_name ) {
+		if ( ! \is_string( $payment_method ) ) {
+			$payment_method = null;
+		}
 
-	$gateway->set_payment_method( $payment_method );
+		$gateway->set_payment_method( $payment_method );
 
-	// Payment method input HTML.
-	$html = $gateway->get_input_html();
+		// Payment method input HTML.
+		$html = $gateway->get_input_html();
 
-	if ( ! empty( $html ) ) {
-		$inputs[ $payment_method ] = array(
-			'label' => $method_name,
-			'html'  => $html,
-		);
+		if ( ! empty( $html ) ) {
+			$inputs[ $payment_method ] = array(
+				'label' => $method_name,
+				'html'  => $html,
+			);
+		}
 	}
+} catch ( \Exception $exception ) {
+	?>
+	<div class="error">
+		<dl>
+			<dt><?php esc_html_e( 'Message', 'pronamic_ideal' ); ?></dt>
+			<dd><?php echo esc_html( $exception->getMessage() ); ?></dd>
+
+			<?php if ( 0 !== $exception->getCode() ) : ?>
+
+				<dt><?php esc_html_e( 'Code', 'pronamic_ideal' ); ?></dt>
+				<dd><?php echo esc_html( $exception->getCode() ); ?></dd>
+
+			<?php endif; ?>
+		</dl>
+	</div>
+	<?php
 }
 
-require Plugin::$dirname . '/views/errors.php';
-
 $currency = Currency::get_instance( 'EUR' );
 
 ?>

From 6f29d4fb5b2f533753f67e9f1fc54ea2728ab1e4 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Mon, 28 Feb 2022 16:07:33 +0100
Subject: [PATCH 28/87] No longer use global `$pronamic_ideal_errors`.

---
 views/meta-box-gateway-test.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/views/meta-box-gateway-test.php b/views/meta-box-gateway-test.php
index 819ae984..6ebdba99 100644
--- a/views/meta-box-gateway-test.php
+++ b/views/meta-box-gateway-test.php
@@ -6,8 +6,7 @@
  * @copyright 2005-2022 Pronamic
  * @license GPL-3.0-or-later
  * @package Pronamic\WordPress\Pay
- * @var \WP_Post $post                  WordPress post.
- * @var array    $pronamic_ideal_errors Pronamic IDEAL errors.
+ * @var \WP_Post $post WordPress post.
  */
 
 use Pronamic\WordPress\Money\Currency;
@@ -16,8 +15,6 @@
 use Pronamic\WordPress\Pay\Gateways\IDealBasic\Gateway as IDealBasic_Gateway;
 use Pronamic\WordPress\Pay\Plugin;
 
-global $pronamic_ideal_errors;
-
 $gateway = Plugin::get_gateway( $post->ID );
 
 if ( null === $gateway ) {

From 3dcff397d36fb11bb4d737da174c8609b12cc5e9 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Mon, 28 Feb 2022 16:08:45 +0100
Subject: [PATCH 29/87] Remove unused use statements.

---
 views/meta-box-gateway-test.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/views/meta-box-gateway-test.php b/views/meta-box-gateway-test.php
index 6ebdba99..557848ef 100644
--- a/views/meta-box-gateway-test.php
+++ b/views/meta-box-gateway-test.php
@@ -11,8 +11,6 @@
 
 use Pronamic\WordPress\Money\Currency;
 use Pronamic\WordPress\Pay\Core\PaymentMethods;
-use Pronamic\WordPress\Pay\Gateways\IDealAdvancedV3\Gateway as IDealAdvancedV3_Gateway;
-use Pronamic\WordPress\Pay\Gateways\IDealBasic\Gateway as IDealBasic_Gateway;
 use Pronamic\WordPress\Pay\Plugin;
 
 $gateway = Plugin::get_gateway( $post->ID );

From c3e836b0e40adf9ff1c4f11855c9c07f8bddc4ac Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Tue, 1 Mar 2022 10:02:51 +0100
Subject: [PATCH 30/87] Also display pay redirect URL #57.

---
 views/meta-box-payment-info.php | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/views/meta-box-payment-info.php b/views/meta-box-payment-info.php
index f8774597..efa428e3 100644
--- a/views/meta-box-payment-info.php
+++ b/views/meta-box-payment-info.php
@@ -897,6 +897,24 @@
 			?>
 		</td>
 	</tr>
+	<tr>
+		<th scope="row">
+			<?php esc_html_e( 'Pay Redirect URL', 'pronamic_ideal' ); ?>
+		</th>
+		<td>
+			<?php
+
+			$url = $payment->get_pay_redirect_url();
+
+			printf(
+				'<a href="%s">%s</a>',
+				esc_attr( $url ),
+				esc_html( $url )
+			);
+
+			?>
+		</td>
+	</tr>
 	<tr>
 		<th scope="row">
 			<?php esc_html_e( 'Return URL', 'pronamic_ideal' ); ?>
@@ -917,7 +935,7 @@
 	</tr>
 	<tr>
 		<th scope="row">
-			<?php esc_html_e( 'Redirect URL', 'pronamic_ideal' ); ?>
+			<?php esc_html_e( 'Return Redirect URL', 'pronamic_ideal' ); ?>
 		</th>
 		<td>
 			<?php

From ad9878b2f55ef57b1a0856cc5bf44cb2d73c9642 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Wed, 2 Mar 2022 10:52:39 +0100
Subject: [PATCH 31/87] Fix typo in subscription end date post meta key.

---
 src/Subscriptions/SubscriptionsDataStoreCPT.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Subscriptions/SubscriptionsDataStoreCPT.php b/src/Subscriptions/SubscriptionsDataStoreCPT.php
index e639137d..3117334f 100644
--- a/src/Subscriptions/SubscriptionsDataStoreCPT.php
+++ b/src/Subscriptions/SubscriptionsDataStoreCPT.php
@@ -670,7 +670,7 @@ private function update_post_meta( $subscription ) {
 		$this->update_meta( $id, 'source', $subscription->source );
 		$this->update_meta( $id, 'source_id', $subscription->source_id );
 		$this->update_meta( $id, 'email', ( null === $customer ? null : $customer->get_email() ) );
-		$this->update_meta( $id, 'end_payment', $subscription->get_end_date() );
+		$this->update_meta( $id, 'end_date', $subscription->get_end_date() );
 		$this->update_meta( $id, 'next_payment', $subscription->get_next_payment_date() );
 		$this->update_meta( $id, 'next_payment_delivery_date', $subscription->get_next_payment_delivery_date() );
 		$this->update_meta( $id, 'version', $subscription->get_version() );

From e82565cebb0c892e58f2a38ee4364f9df4a01ce6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Wed, 9 Mar 2022 15:44:49 +0100
Subject: [PATCH 32/87] Columns with transaction ID and customer name are not
 sortable (resolves #58).

---
 src/Admin/AdminPaymentPostType.php      | 45 ++-----------------------
 src/Admin/AdminSubscriptionPostType.php |  5 +--
 2 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/src/Admin/AdminPaymentPostType.php b/src/Admin/AdminPaymentPostType.php
index 1313ba2a..961bfc39 100644
--- a/src/Admin/AdminPaymentPostType.php
+++ b/src/Admin/AdminPaymentPostType.php
@@ -15,7 +15,6 @@
 use Pronamic\WordPress\Pay\Payments\PaymentPostType;
 use Pronamic\WordPress\Pay\Plugin;
 use WP_Post;
-use WP_Query;
 
 /**
  * WordPress admin payment post type
@@ -71,8 +70,6 @@ public function __construct( $plugin ) {
 
 		add_filter( 'post_row_actions', array( $this, 'post_row_actions' ), 10, 2 );
 
-		add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ) );
-
 		add_filter( 'default_hidden_columns', array( $this, 'default_hidden_columns' ) );
 
 		add_filter( 'post_updated_messages', array( $this, 'post_updated_messages' ) );
@@ -272,42 +269,6 @@ public function admin_notices() {
 		}
 	}
 
-	/**
-	 * Pre get posts.
-	 *
-	 * @param WP_Query $query WordPress query.
-	 * @return void
-	 */
-	public function pre_get_posts( $query ) {
-		/**
-		 * The `WP_Query::get` function can return different variable type.
-		 * For now this function can only handle one specific string orderby.
-		 *
-		 * @link https://developer.wordpress.org/reference/classes/wp_query/get/
-		 * @link https://developer.wordpress.org/reference/classes/wp_query/#order-orderby-parameters
-		 * @link https://github.com/WordPress/WordPress/blob/5.2/wp-includes/class-wp-query.php#L1697-L1713
-		 */
-		$orderby = $query->get( 'orderby' );
-
-		if ( ! is_string( $orderby ) ) {
-			return;
-		}
-
-		$map = array(
-			'pronamic_payment_customer'    => '_pronamic_payment_customer_name',
-			'pronamic_payment_transaction' => '_pronamic_payment_transaction_id',
-		);
-
-		if ( ! isset( $map[ $orderby ] ) ) {
-			return;
-		}
-
-		$meta_key = $map[ $orderby ];
-
-		$query->set( 'meta_key', $meta_key );
-		$query->set( 'orderby', 'meta_value' );
-	}
-
 	/**
 	 * Columns.
 	 *
@@ -360,10 +321,8 @@ public function default_hidden_columns( $hidden ) {
 	 * @return array
 	 */
 	public function sortable_columns( $sortable_columns ) {
-		$sortable_columns['pronamic_payment_title']       = 'ID';
-		$sortable_columns['pronamic_payment_transaction'] = 'pronamic_payment_transaction';
-		$sortable_columns['pronamic_payment_customer']    = 'pronamic_payment_customer';
-		$sortable_columns['pronamic_payment_date']        = 'date';
+		$sortable_columns['pronamic_payment_title'] = 'ID';
+		$sortable_columns['pronamic_payment_date']  = 'date';
 
 		return $sortable_columns;
 	}
diff --git a/src/Admin/AdminSubscriptionPostType.php b/src/Admin/AdminSubscriptionPostType.php
index ec6f9682..0d8e47ea 100644
--- a/src/Admin/AdminSubscriptionPostType.php
+++ b/src/Admin/AdminSubscriptionPostType.php
@@ -14,9 +14,8 @@
 use Pronamic\WordPress\Pay\Core\PaymentMethods;
 use Pronamic\WordPress\Pay\Plugin;
 use Pronamic\WordPress\Pay\Subscriptions\SubscriptionPeriod;
-use Pronamic\WordPress\Pay\Subscriptions\SubscriptionStatus;
-use Pronamic\WordPress\Pay\Util;
 use Pronamic\WordPress\Pay\Subscriptions\SubscriptionPostType;
+use Pronamic\WordPress\Pay\Util;
 use WP_Post;
 use WP_Query;
 
@@ -252,7 +251,6 @@ public function pre_get_posts( $query ) {
 		}
 
 		$map = array(
-			'pronamic_subscription_customer'     => '_pronamic_subscription_customer_name',
 			'pronamic_subscription_next_payment' => '_pronamic_subscription_next_payment',
 		);
 
@@ -300,7 +298,6 @@ public function columns( $columns ) {
 	 */
 	public function sortable_columns( $sortable_columns ) {
 		$sortable_columns['pronamic_subscription_title']        = 'ID';
-		$sortable_columns['pronamic_subscription_customer']     = 'pronamic_subscription_customer_name';
 		$sortable_columns['pronamic_subscription_next_payment'] = 'pronamic_subscription_next_payment';
 		$sortable_columns['pronamic_subscription_date']         = 'date';
 

From a2d9047652f07219eb8cbe37a20bafca32fc255a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Thu, 10 Mar 2022 11:39:18 +0100
Subject: [PATCH 33/87] Use source `subscription_payment_method_change` for
 subscription payment method changes.

---
 src/Subscriptions/SubscriptionsModule.php | 36 ++++++++++++++++++-----
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/Subscriptions/SubscriptionsModule.php b/src/Subscriptions/SubscriptionsModule.php
index a421990f..32a4ee15 100644
--- a/src/Subscriptions/SubscriptionsModule.php
+++ b/src/Subscriptions/SubscriptionsModule.php
@@ -10,20 +10,14 @@
 
 namespace Pronamic\WordPress\Pay\Subscriptions;
 
-use DateInterval;
-use Pronamic\WordPress\DateTime\DateTime;
 use Pronamic\WordPress\DateTime\DateTimeImmutable;
-use Pronamic\WordPress\DateTime\DateTimeZone;
 use Pronamic\WordPress\Money\Money;
 use Pronamic\WordPress\Pay\Core\PaymentMethods;
 use Pronamic\WordPress\Pay\Core\Server;
-use Pronamic\WordPress\Pay\Payments\PaymentStatus;
 use Pronamic\WordPress\Pay\Core\Util;
 use Pronamic\WordPress\Pay\Payments\Payment;
+use Pronamic\WordPress\Pay\Payments\PaymentStatus;
 use Pronamic\WordPress\Pay\Plugin;
-use WP_CLI;
-use WP_Error;
-use WP_Query;
 
 /**
  * Title: Subscriptions module
@@ -74,6 +68,10 @@ public function __construct( Plugin $plugin ) {
 		\add_action( 'pronamic_pay_pre_create_subscription', array( SubscriptionHelper::class, 'complement_subscription' ), 10, 1 );
 		\add_action( 'pronamic_pay_pre_create_payment', array( $this, 'complement_subscription_by_payment' ), 10, 1 );
 
+		// Payment source filters.
+		\add_filter( 'pronamic_payment_source_text_subscription_payment_method_change', array( $this, 'source_text_subscription_payment_method_change' ) );
+		\add_filter( 'pronamic_payment_source_description_subscription_payment_method_change', array( $this, 'source_description_subscription_payment_method_change' ) );
+
 		// Listen to payment status changes so we can update related subscriptions.
 		\add_action( 'pronamic_payment_status_update', array( $this, 'payment_status_update' ) );
 
@@ -458,6 +456,10 @@ private function handle_subscription_mandate( Subscription $subscription ) {
 			try {
 				$payment = $subscription->new_payment();
 
+				// Set source.
+				$payment->set_source( 'subscription_payment_method_change' );
+				$payment->set_source_id( null );
+
 				// Set payment method.
 				$payment_method = \filter_input( \INPUT_POST, 'pronamic_pay_subscription_payment_method', \FILTER_SANITIZE_STRING );
 
@@ -714,4 +716,24 @@ public function rest_api_subscription_phase( \WP_REST_Request $request ) {
 
 		return $phase;
 	}
+
+	/**
+	 * Source text filter.
+	 *
+	 * @param string $text The source text to filter.
+	 * @return string
+	 */
+	public function source_text_subscription_payment_method_change( $text ) {
+		return __( 'Subscription payment method change', 'pronamic_ideal' );
+	}
+
+	/**
+	 * Source description filter.
+	 *
+	 * @param string $text The source text to filter.
+	 * @return string
+	 */
+	public function source_description_subscription_payment_method_change( $text ) {
+		return __( 'subscription payment method change', 'pronamic_ideal' );
+	}
 }

From 01086c3caf4518d0e609e7d43c7b1d22ee090187 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Tue, 15 Mar 2022 12:13:24 +0100
Subject: [PATCH 34/87] Update default error message.

---
 src/Plugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Plugin.php b/src/Plugin.php
index b8d236d1..d94c6dde 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -716,7 +716,7 @@ public function datetime_format( $format ) {
 	 * @return string
 	 */
 	public static function get_default_error_message() {
-		return __( 'Something went wrong with the payment. Please try again later or pay another way.', 'pronamic_ideal' );
+		return __( 'Something went wrong with the payment. Please try again or pay another way.', 'pronamic_ideal' );
 	}
 
 	/**

From e1f9fdf85b4d97828c9e4af03a389004eb4a7f51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Fri, 25 Mar 2022 10:58:18 +0100
Subject: [PATCH 35/87] Add menu badge for subscriptions 'On hold'
 (pronamic/wp-pronamic-pay#315).

---
 src/Admin/AdminModule.php | 87 ++++++++++++++++++++++++++++++++-------
 1 file changed, 72 insertions(+), 15 deletions(-)

diff --git a/src/Admin/AdminModule.php b/src/Admin/AdminModule.php
index aa262482..6e44b87f 100644
--- a/src/Admin/AdminModule.php
+++ b/src/Admin/AdminModule.php
@@ -907,34 +907,81 @@ private function get_menu_icon_url() {
 	 * @return void
 	 */
 	public function admin_menu() {
-		// @link https://github.com/woothemes/woocommerce/blob/2.3.13/includes/admin/class-wc-admin-menus.php#L145
+		/**
+		 * Badges.
+		 *
+		 * @link https://github.com/woothemes/woocommerce/blob/2.3.13/includes/admin/class-wc-admin-menus.php#L145
+		 */
 		$counts = wp_count_posts( 'pronamic_payment' );
 
-		$badge = '';
+		$payments_pending_count = \property_exists( $counts, 'payment_pending' ) ? $counts->payment_pending : 0;
 
-		if ( isset( $counts->payment_pending ) && $counts->payment_pending > 0 ) {
-			$badge = sprintf(
-				' <span class="awaiting-mod update-plugins count-%1$s" title="%2$s"><span class="processing-count">%1$s</span></span>',
-				$counts->payment_pending,
-				sprintf(
-					/* translators: %d: pending payments count */
-					\_n( '%d payment pending', '%d payments pending', $counts->payment_pending, 'pronamic_ideal' ),
-					$counts->payment_pending
-				)
+		$counts = wp_count_posts( 'pronamic_pay_subscr' );
+
+		$subscriptions_on_hold_count = \property_exists( $counts, 'subscr_on_hold' ) ? $counts->subscr_on_hold : 0;
+
+		$badges = array(
+			'pay'           => array(
+				'title' => array(),
+				'count' => 0,
+				'html'  => '',
+			),
+			'payments'      => array(
+				'title' => \sprintf(
+					/* translators: %d: payments pending count */
+					\_n( '%d payment pending', '%d payments pending', $payments_pending_count, 'pronamic_ideal' ),
+					$payments_pending_count
+				),
+				'count' => $payments_pending_count,
+				'html'  => '',
+			),
+			'subscriptions' => array(
+				'title' => \sprintf(
+					/* translators: %d: subscriptions on hold count */
+					\_n( '%d subscription on hold', '%d subscriptions on hold', $subscriptions_on_hold_count, 'pronamic_ideal' ),
+					$subscriptions_on_hold_count
+				),
+				'count' => $subscriptions_on_hold_count,
+				'html'  => '',
+			),
+		);
+
+		foreach ( $badges as &$badge ) {
+			$count = $badge['count'];
+
+			if ( 0 === $count ) {
+				continue;
+			}
+
+			$title = \array_key_exists( 'title', $badge ) && \is_string( $badge['title'] ) ? $badge['title'] : '';
+
+			$badge['html'] = \sprintf(
+				' <span class="awaiting-mod update-plugins count-%1$d" title="%2$s"><span class="processing-count">%1$d</span></span>',
+				$count,
+				$title
 			);
+
+			// Pay badge.
+			$badges['pay']['count'] += $count;
+
+			if ( ! empty( $title ) ) {
+				$badges['pay']['title'][] = $title;
+			}
 		}
 
-		// Submenu pages.
+		/**
+		 * Submenu pages.
+		 */
 		$submenu_pages = array(
 			array(
 				'page_title' => __( 'Payments', 'pronamic_ideal' ),
-				'menu_title' => __( 'Payments', 'pronamic_ideal' ) . $badge,
+				'menu_title' => __( 'Payments', 'pronamic_ideal' ) . $badges['payments']['html'],
 				'capability' => 'edit_payments',
 				'menu_slug'  => 'edit.php?post_type=pronamic_payment',
 			),
 			array(
 				'page_title' => __( 'Subscriptions', 'pronamic_ideal' ),
-				'menu_title' => __( 'Subscriptions', 'pronamic_ideal' ),
+				'menu_title' => __( 'Subscriptions', 'pronamic_ideal' ) . $badges['subscriptions']['html'],
 				'capability' => 'edit_payments',
 				'menu_slug'  => 'edit.php?post_type=pronamic_pay_subscr',
 			),
@@ -998,9 +1045,19 @@ public function admin_menu() {
 			$menu_icon_url = 'dashicons-money';
 		}
 
+		$pay_badge = '';
+
+		if ( 0 !== $badges['pay']['count'] ) {
+			$pay_badge = \sprintf(
+				' <span class="awaiting-mod update-plugins count-%1$d" title="%2$s"><span class="processing-count">%1$d</span></span>',
+				$badges['pay']['count'],
+				\implode( ', ', $badges['pay']['title'] )
+			);
+		}
+
 		add_menu_page(
 			__( 'Pronamic Pay', 'pronamic_ideal' ),
-			__( 'Pay', 'pronamic_ideal' ) . $badge,
+			__( 'Pay', 'pronamic_ideal' ) . $pay_badge,
 			$minimum_capability,
 			'pronamic_ideal',
 			function() {

From adabed15a451264c32bb410d3c03c8705ee70293 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Fri, 25 Mar 2022 12:29:08 +0100
Subject: [PATCH 36/87] Remove default `edit` bulk action for subscriptions
 (only allowed incorrect status changes).

---
 src/Admin/AdminSubscriptionPostType.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/Admin/AdminSubscriptionPostType.php b/src/Admin/AdminSubscriptionPostType.php
index 0d8e47ea..3b3babac 100644
--- a/src/Admin/AdminSubscriptionPostType.php
+++ b/src/Admin/AdminSubscriptionPostType.php
@@ -53,6 +53,7 @@ public function __construct( $plugin ) {
 
 		add_filter( 'manage_edit-' . self::POST_TYPE . '_columns', array( $this, 'columns' ) );
 		add_filter( 'manage_edit-' . self::POST_TYPE . '_sortable_columns', array( $this, 'sortable_columns' ) );
+		add_filter( 'bulk_actions-edit-' . self::POST_TYPE, array( $this, 'bulk_actions' ) );
 		add_filter( 'list_table_primary_column', array( $this, 'primary_column' ), 10, 2 );
 
 		add_action( 'manage_' . self::POST_TYPE . '_posts_custom_column', array( $this, 'custom_columns' ), 10, 2 );
@@ -116,6 +117,21 @@ public function removable_query_args( $args ) {
 		return $args;
 	}
 
+	/**
+	 * Custom bulk actions.
+	 *
+	 * @link https://make.wordpress.org/core/2016/10/04/custom-bulk-actions/
+	 * @link https://github.com/WordPress/WordPress/blob/4.7/wp-admin/includes/class-wp-list-table.php#L440-L452
+	 * @param array $bulk_actions Bulk actions.
+	 * @return array
+	 */
+	public function bulk_actions( $bulk_actions ) {
+		// Don't allow edit in bulk.
+		unset( $bulk_actions['edit'] );
+
+		return $bulk_actions;
+	}
+
 	/**
 	 * Maybe process subscription action.
 	 *

From 5d5eeac079986fdcf39bb6233bf8755d288e384d Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Fri, 25 Mar 2022 12:52:47 +0100
Subject: [PATCH 37/87] Create Updater.php

---
 src/Updater.php | 199 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 199 insertions(+)
 create mode 100644 src/Updater.php

diff --git a/src/Updater.php b/src/Updater.php
new file mode 100644
index 00000000..36bf99fa
--- /dev/null
+++ b/src/Updater.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * Updater
+ *
+ * @author    Pronamic <info@pronamic.eu>
+ * @copyright 2005-2022 Pronamic
+ * @license   GPL-3.0-or-later
+ * @package   Pronamic\WordPress\Pay
+ */
+
+namespace Pronamic\WordPress\Pay;
+
+/**
+ * Updater class
+ *
+ * @author  Remco Tolsma
+ * @version 2.5.0
+ * @since   2.0.1
+ */
+class Updater {
+	/**
+	 * Plugins filter callback.
+	 *
+	 * @var callable|null
+	 */
+	private $plugins_filter_callback;
+
+	/**
+	 * Instance of this class.
+	 *
+	 * @since 1.1.0
+	 * @var self
+	 */
+	protected static $instance = null;
+
+	/**
+	 * Construct updater.
+	 *
+	 * @param callable|null $plugins_filter_callback Plugins filter callback.
+	 */
+	private function __construct( $plugins_filter_callback ) {
+		$this->plugins_filter_callback = $plugins_filter_callback;
+
+		\add_filter( 'http_response', array( $this, 'http_response' ), 10, 3 );
+
+		\add_filter( 'plugins_api', array( $this, 'plugins_api' ), 10, 3 );
+	}
+
+	/**
+	 * HTTP Response.
+	 *
+	 * @link https://github.com/WordPress/WordPress/blob/5.5/wp-includes/class-http.php#L437-L446
+	 * @param array  $response    HTTP response.
+	 * @param array  $parsed_args HTTP request arguments.
+	 * @param string $url         The request URL.
+	 * @return array
+	 */
+	public function http_response( $response, $parsed_args, $url ) {
+		if ( ! \array_key_exists( 'method', $parsed_args ) ) {
+			return $repsonse;
+		}
+
+		if ( 'POST' !== $parsed_args['method'] ) {
+			return $response;
+		}
+
+		if ( false !== strpos( $url, '//api.wordpress.org/plugins/update-check/' ) ) {
+			$response = $this->extend_response_with_pronamic( $response, $parsed_args, 'plugins' );
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Extends WordPress.org API repsonse with Pronamic API response.
+	 *
+	 * @param array  $response    HTTP response.
+	 * @param array  $parsed_args HTTP request arguments.
+	 * @param string $type        Type.
+	 * @return array
+	 */
+	public function extend_response_with_pronamic( $response, $parsed_args, $type ) {
+		$data = \json_decode( \wp_remote_retrieve_body( $response ), true );
+
+		if ( ! is_array( $data ) ) {
+			return $response;
+		}
+
+		$pronamic_data = $this->request_plugins_update_check( $parsed_args );
+
+		if ( false === $pronamic_data ) {
+			return $response;
+		}
+
+		if ( ! array_key_exists( $type, $data ) ) {
+			$data[ $type ] = array();
+		}
+
+		if ( \is_array( $pronamic_data[ $type ] ) ) {
+			$data[ $type ] = array_merge( $data[ $type ], $pronamic_data[ $type ] );
+		}
+
+		$response['body'] = \wp_json_encode( $data );
+
+		return $response;
+	}
+
+	/**
+	 * Remote post.
+	 *
+	 * @param string $url         URL to retrieve.
+	 * @param array  $args        Request arguments.
+	 * @param array  $parsed_args Parsed request arguments.
+	 * @return array
+	 */
+	private function remote_post( $url, $args, $parsed_args ) {
+		$keys = array(
+			'timeout',
+			'user-agent',
+			'headers',
+		);
+
+		foreach ( $keys as $key ) {
+			if ( \array_key_exists( $key, $parsed_args ) ) {
+				$args[ $key ] = $parsed_args[ $key ];
+			}
+		}
+
+		return \wp_remote_post( $url, $args );
+	}
+
+	/**
+	 * Request plugins update check.
+	 *
+	 * @param array $parsed_args HTTP request arguments.
+	 * @return array
+	 */
+	private function request_plugins_update_check( $parsed_args ) {
+		$plugins = $this->get_plugins();
+
+		if ( 0 === \count( $plugins ) ) {
+			return false;
+		}
+
+		$raw_response = $this->remote_post(
+			'https://api.pronamic.eu/plugins/update-check/1.2/',
+			array(
+				'body' => array(
+					'plugins' => \wp_json_encode( $plugins ),
+				),
+			),
+			$parsed_args
+		);
+
+		// phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
+		if ( \is_wp_error( $raw_response ) || '200' != \wp_remote_retrieve_response_code( $raw_response ) ) {
+			return false;
+		}
+
+		$response = \json_decode( \wp_remote_retrieve_body( $raw_response ), true );
+
+		return $response;
+	}
+
+	/**
+	 * Get plugins.
+	 *
+	 * @link https://github.com/pronamic/wp-pronamic-client/blob/ce45ff5b1cde51aa3959750f2a03ad76c3be0463/includes/functions.php#L3-L25
+	 * @return array
+	 */
+	private function get_plugins() {
+		if ( ! function_exists( '\get_plugins' ) ) {
+			return array();
+		}
+
+		$plugins = \get_plugins();
+
+		if ( null !== $this->plugins_filter_callback ) {
+			$plugins = \array_filter( $plugins, $this->plugins_filter_callback );
+		}
+
+		return $plugins;
+	}
+
+	/**
+	 * Return an instance of this class.
+	 *
+	 * @param callable $plugins_filter_callback Plugins filter callback.
+	 * @return self A single instance of this class.
+	 */
+	public static function instance( $plugins_filter_callback = null ) {
+		// If the single instance hasn't been set, set it now.
+		if ( null === self::$instance ) {
+			self::$instance = new self( $plugins_filter_callback );
+		}
+
+		return self::$instance;
+	}
+}

From 91ff3946a772845b6a1233e955ef36a43ed6002a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Fri, 25 Mar 2022 16:38:13 +0100
Subject: [PATCH 38/87] Update payment and subscription update meta boxes.

---
 css/admin.css                          |  26 +--
 css/admin.css.map                      |   2 +-
 docs/hooks.md                          |   2 +-
 js/dist/admin.js                       |  56 +++++
 js/src/admin.js                        |  56 +++++
 scss/admin/_meta-box-update.scss       |   8 +
 views/meta-box-payment-info.php        |  35 ++--
 views/meta-box-payment-update.php      | 274 ++++++++++++++-----------
 views/meta-box-subscription-info.php   |  18 --
 views/meta-box-subscription-update.php |  72 +++++--
 10 files changed, 367 insertions(+), 182 deletions(-)

diff --git a/css/admin.css b/css/admin.css
index e956acdb..0ffee749 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -25,18 +25,13 @@
 }
 .pronamic-pay-chart-legend li {
   border-right: 5px solid #aaa;
-  -webkit-box-shadow: inset 0 -1px 0 0 #e5e5e5;
-          box-shadow: inset 0 -1px 0 0 #e5e5e5;
+  box-shadow: inset 0 -1px 0 0 #e5e5e5;
   color: #aaa;
   display: block;
   margin: 0;
   padding: 1em;
-  -webkit-transition-duration: 0.5s;
-          transition-duration: 0.5s;
-  -webkit-transition-property: border, padding, -webkit-box-shadow;
-  transition-property: border, padding, -webkit-box-shadow;
+  transition-duration: 0.5s;
   transition-property: border, box-shadow, padding;
-  transition-property: border, box-shadow, padding, -webkit-box-shadow;
 }
 .pronamic-pay-chart-legend li.completed-count {
   border-right-color: #dbe1e3;
@@ -58,8 +53,7 @@
 }
 .pronamic-pay-chart-legend li:hover {
   border-right-color: #23282f;
-  -webkit-box-shadow: inset 0 -1px 0 0 #e5e5e5, inset 300px 0 0 #f9f9f9;
-          box-shadow: inset 0 -1px 0 0 #e5e5e5, inset 300px 0 0 #f9f9f9;
+  box-shadow: inset 0 -1px 0 0 #e5e5e5, inset 300px 0 0 #f9f9f9;
   padding-left: 1.5em;
 }
 .pronamic-pay-chart-legend strong {
@@ -80,8 +74,7 @@
 }
 .pronamic-pay-status-list li {
   border-top: 1px solid #eee;
-  -webkit-box-sizing: border-box;
-          box-sizing: border-box;
+  box-sizing: border-box;
   color: #aaa;
   float: left;
   margin: 0;
@@ -94,7 +87,6 @@
   font-size: 12px;
   padding: 9px 12px;
   position: relative;
-  -webkit-transition: color ease 0.5s;
   transition: color ease 0.5s;
 }
 .pronamic-pay-status-list li a strong {
@@ -290,6 +282,14 @@ body.post-type-pronamic_payment #post-body-content, body.post-type-pronamic_pay_
   text-align: right;
 }
 
+#pronamic-pay-status-display {
+  font-weight: 600;
+}
+
+#pronamic-pay-post-status-select {
+  margin-top: 3px;
+}
+
 .pronamic-pay-settings select {
   width: 25em;
 }
@@ -477,3 +477,5 @@ body.post-type-pronamic_payment #post-body-content, body.post-type-pronamic_pay_
 .pronamic-pay-cloack {
   display: none;
 }
+
+/*# sourceMappingURL=admin.css.map */
diff --git a/css/admin.css.map b/css/admin.css.map
index 58bbcd40..44869103 100644
--- a/css/admin.css.map
+++ b/css/admin.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../fonts/src/_variables.scss","../scss/admin/_buttons.scss","../scss/admin/_chart.scss","../scss/admin/_variables.scss","../scss/admin/_dashboard-widget-payments.scss","../scss/admin/_edit-form-post.scss","../scss/admin/_forms.scss","../scss/admin/_icons.scss","../scss/admin/_lists.scss","../scss/admin/_meta-box-gateway-config.scss","../scss/admin/_meta-box-gateway-test.scss","../scss/admin/_meta-box-payment-log.scss","../scss/admin/_meta-box-subscription-info.scss","../scss/admin/_meta-box-update.scss","../scss/admin/_settings.scss","../scss/admin/_tables.scss","../scss/admin/_tabs.scss","../scss/admin/_text.scss","../scss/admin/_tip.scss","../scss/admin/_utilities.scss"],"names":[],"mappings":"AAAA;ACGA;EACC;EAEA;;;ACFA;EACC;;;AAIF;EACC;EAEA;EAEA;;;AAGD;EACC,YCfO;EDiBP;EACA;EACA;EAEA;EAEA;EACA;;AAEA;EACC;EAEA;EAEA,OCvBK;EDyBL;EAEA;EACA;EAEA;EACA;;AAEA;EACC,oBCyDkC;;ADtDnC;EACC,oBCsD8B;;ADnD/B;EACC,oBCmDgC;;ADhDjC;EACC,oBCgDgC;;AD7CjC;EACC,oBC6C8B;;AD1C/B;EACC,oBC0C6B;;ADvC9B;EACC,oBCuCwB;EDrCxB;EAEA;;AAIF;EACC,OChDc;EDkDd;EAEA;EACA;EAEA;;;AEjFA;EACC;;;AAKH;EACC;EAEA;;AAEA;EACC;EAEA;EAEA,ODTK;ECWL;EAEA;EACA;EAEA;;AAEA;EACC,ODnBI;ECqBJ;EAEA;EAEA;EAEA;EAEA;;AAEA;EACC,ODTS;ECWT;EAEA;EACA;EAEA;;AAGD;EACC,ODlBe;;ACoBf;AAAA;EAEC,ODtBc;;AC2BjB;EACC;EAEA;;AAGD;EACC;;;AClED;EACC;;;ACLH;EACC;;;AAID;EACC;;;AAMA;EACC;EAEA;EAEA;EACA;EAEA;EAEA;EAEA;EACA;;;ACzBF;EACC;EAEA;EAEA;EACA;;AAEA;EACC,SPEsB;EOAtB;EAEA;EAEA;EACA;EACA;EAEA;EAEA;EAEA;EACA;;;AAKD;EACC,OJmD2B;EIlD3B,SPrBmB;;;AO0BpB;EACC,OJXS;EIYT,SPhCqB;;;AOqCtB;EACC,OJ0C8B;EIzC9B,SPlCsB;;;AOuCvB;EACC,OJsC6B;EIrC7B,SP7CqB;;;AOkDtB;EACC,OJjBc;EIkBd,SP/CoB;;;AOoDrB;EACC,OJ6B0B;EI5B1B,SP1DkB;;;AO+DnB;EACC,OJ/Bc;EIgCd,SPhEmB;;;AOqEpB;EACC,OJtCc;EIuCd,SP3Ec;;;AOgFf;EACC,OJG6B;EIF7B,SPlFc;;;AOuFf;EACC,OJpDc;EIqDd,SP1FkB;;;AQFlB;EACC;EACA;EACA;EACA;EACA;;AAMA;EACC;;AAKH;EACC;;AAIA;EACC,OL6D6B;;AKxD9B;EACC,OLpBI;;;AKyBP;EAGG;IACC;;EAEA;IACC;;EAIF;IACC;;;AC7CH;EACC;;AAGD;EACC;;AAEA;EACC;;;ACRD;EACC;;;ACDD;EACC;EACA;;AAIF;EACC;;;ACPA;EACC;;;ACDF;AAAA;EACC;EACA;;;AAIF;EACC;EACA;;;AAGD;EACC,YViD8C;EU/C9C;EAEA;;;AAGD;EACC;EAEA;;;ACvBA;EAEC;;;ACJF;EACC;;;AAKC;EACC;;AAKD;AAAA;EAEC,OZHI;;AYQL;EACC;;AAEA;EACC;;;AAQH;EACC;;;AAQC;EACC,YZegC;;;AYPnC;EACC,YZMkC;;;AYCjC;EACC;EACA;EACA;EACA;EACA;;;AAOJ;EACC;;AAIE;EACC;;;AASH;AAAA;AAAA;EAGC;;AAGD;AAAA;EAEC;;;AAIF;EAUK;IAGC;;EAEA;IACC;;EAOD;IAGC;;;ACzHP;EACC;EAEA;EAEA;EAEA;EAEA;;AAEA;EACC,YbsCwB;EapCxB;EACA;EAEA;EAEA;EAEA;EAEA;EACA;;AAEA;EACC,YbzBK;Ea2BL;EAEA;;;AAqBC;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAwBlB;EACC;EACA;EAEA;;AAGA;EAEC;;AAEA;EAEC;;;AAKH;EACC;;;AAGD;EACC;IACC;;;EAGD;IACC;;EAEA;IACC;;;AAKH;EAGG;AAAA;IAEC;;;AClGJ;EACC;;;AAGD;EACC,OdFK;;;AcKN;EACC,OdJQ;;;AePP;EACC,OfkBS;EehBT;;;AAOD;EACC;;;ACXH;EACC","file":"admin.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../fonts/src/_variables.scss","../scss/admin/_buttons.scss","../scss/admin/_chart.scss","../scss/admin/_variables.scss","../scss/admin/_dashboard-widget-payments.scss","../scss/admin/_edit-form-post.scss","../scss/admin/_forms.scss","../scss/admin/_icons.scss","../scss/admin/_lists.scss","../scss/admin/_meta-box-gateway-config.scss","../scss/admin/_meta-box-gateway-test.scss","../scss/admin/_meta-box-payment-log.scss","../scss/admin/_meta-box-subscription-info.scss","../scss/admin/_meta-box-update.scss","../scss/admin/_settings.scss","../scss/admin/_tables.scss","../scss/admin/_tabs.scss","../scss/admin/_text.scss","../scss/admin/_tip.scss","../scss/admin/_utilities.scss"],"names":[],"mappings":"AAAA;ACGA;EACC;EAEA;;;ACFA;EACC;;;AAIF;EACC;EAEA;EAEA;;;AAGD;EACC,YCfO;EDiBP;EACA;EACA;EAEA;EAEA;EACA;;AAEA;EACC;EAEA;EAEA,OCvBK;EDyBL;EAEA;EACA;EAEA;EACA;;AAEA;EACC,oBCyDkC;;ADtDnC;EACC,oBCsD8B;;ADnD/B;EACC,oBCmDgC;;ADhDjC;EACC,oBCgDgC;;AD7CjC;EACC,oBC6C8B;;AD1C/B;EACC,oBC0C6B;;ADvC9B;EACC,oBCuCwB;EDrCxB;EAEA;;AAIF;EACC,OChDc;EDkDd;EAEA;EACA;EAEA;;;AEjFA;EACC;;;AAKH;EACC;EAEA;;AAEA;EACC;EAEA;EAEA,ODTK;ECWL;EAEA;EACA;EAEA;;AAEA;EACC,ODnBI;ECqBJ;EAEA;EAEA;EAEA;EAEA;;AAEA;EACC,ODTS;ECWT;EAEA;EACA;EAEA;;AAGD;EACC,ODlBe;;ACoBf;AAAA;EAEC,ODtBc;;AC2BjB;EACC;EAEA;;AAGD;EACC;;;AClED;EACC;;;ACLH;EACC;;;AAID;EACC;;;AAMA;EACC;EAEA;EAEA;EACA;EAEA;EAEA;EAEA;EACA;;;ACzBF;EACC;EAEA;EAEA;EACA;;AAEA;EACC,SPEsB;EOAtB;EAEA;EAEA;EACA;EACA;EAEA;EAEA;EAEA;EACA;;;AAKD;EACC,OJmD2B;EIlD3B,SPrBmB;;;AO0BpB;EACC,OJXS;EIYT,SPhCqB;;;AOqCtB;EACC,OJ0C8B;EIzC9B,SPlCsB;;;AOuCvB;EACC,OJsC6B;EIrC7B,SP7CqB;;;AOkDtB;EACC,OJjBc;EIkBd,SP/CoB;;;AOoDrB;EACC,OJ6B0B;EI5B1B,SP1DkB;;;AO+DnB;EACC,OJ/Bc;EIgCd,SPhEmB;;;AOqEpB;EACC,OJtCc;EIuCd,SP3Ec;;;AOgFf;EACC,OJG6B;EIF7B,SPlFc;;;AOuFf;EACC,OJpDc;EIqDd,SP1FkB;;;AQFlB;EACC;EACA;EACA;EACA;EACA;;AAMA;EACC;;AAKH;EACC;;AAIA;EACC,OL6D6B;;AKxD9B;EACC,OLpBI;;;AKyBP;EAGG;IACC;;EAEA;IACC;;EAIF;IACC;;;AC7CH;EACC;;AAGD;EACC;;AAEA;EACC;;;ACRD;EACC;;;ACDD;EACC;EACA;;AAIF;EACC;;;ACPA;EACC;;;ACDF;AAAA;EACC;EACA;;;AAIF;EACC;EACA;;;AAGD;EACC,YViD8C;EU/C9C;EAEA;;;AAGD;EACC;EAEA;;;AAGD;EACC;;;AAGD;EACC;;;AC/BA;EAEC;;;ACJF;EACC;;;AAKC;EACC;;AAKD;AAAA;EAEC,OZHI;;AYQL;EACC;;AAEA;EACC;;;AAQH;EACC;;;AAQC;EACC,YZegC;;;AYPnC;EACC,YZMkC;;;AYCjC;EACC;EACA;EACA;EACA;EACA;;;AAOJ;EACC;;AAIE;EACC;;;AASH;AAAA;AAAA;EAGC;;AAGD;AAAA;EAEC;;;AAIF;EAUK;IAGC;;EAEA;IACC;;EAOD;IAGC;;;ACzHP;EACC;EAEA;EAEA;EAEA;EAEA;;AAEA;EACC,YbsCwB;EapCxB;EACA;EAEA;EAEA;EAEA;EAEA;EACA;;AAEA;EACC,YbzBK;Ea2BL;EAEA;;;AAqBC;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAwBlB;EACC;EACA;EAEA;;AAGA;EAEC;;AAEA;EAEC;;;AAKH;EACC;;;AAGD;EACC;IACC;;;EAGD;IACC;;EAEA;IACC;;;AAKH;EAGG;AAAA;IAEC;;;AClGJ;EACC;;;AAGD;EACC,OdFK;;;AcKN;EACC,OdJQ;;;AePP;EACC,OfkBS;EehBT;;;AAOD;EACC;;;ACXH;EACC","file":"admin.css"}
\ No newline at end of file
diff --git a/docs/hooks.md b/docs/hooks.md
index 8c615633..3b146fd7 100644
--- a/docs/hooks.md
+++ b/docs/hooks.md
@@ -418,7 +418,7 @@ Argument | Type | Description
 `$url` | `null\|string` | Redirect URL.
 `$payment` | `\Pronamic\WordPress\Pay\Payments\Payment` | Payment.
 
-Source: [src/Plugin.php](../src/Plugin.php), [line 1207](../src/Plugin.php#L1207-L1213)
+Source: [src/Plugin.php](../src/Plugin.php), [line 1201](../src/Plugin.php#L1201-L1207)
 
 ### `pronamic_gateway_configuration_display_value`
 
diff --git a/js/dist/admin.js b/js/dist/admin.js
index 98640a07..cde037e6 100644
--- a/js/dist/admin.js
+++ b/js/dist/admin.js
@@ -233,6 +233,61 @@
 		} );
 	};
 
+	/**
+	 * Pronamic Pay post status.
+	 */
+	var PronamicPayPostStatus = function( element ) {
+		var $element = $( element );
+
+		// Post Status edit click.
+		$element.siblings( 'a.edit-pronamic-pay-post-status' ).on( 'click', function( event ) {
+			if ( $element.is( ':hidden' ) ) {
+				$element.slideDown( 'fast', function() { $element.find( 'select' ).trigger( 'focus' ); } );
+
+				$( this ).hide();
+			}
+
+			event.preventDefault();
+		} );
+
+		// Save post status changes and hide options.
+		$element.find( '.save-pronamic-pay-post-status' ).on( 'click', function( event ) {
+			$element.slideUp( 'fast' ).siblings( 'a.edit-pronamic-pay-post-status' ).show().trigger( 'focus' );
+
+			$( '#pronamic-pay-status-display' ).text( $( '#pronamic-pay-post-status option:selected' ).text() );
+
+			event.preventDefault();
+		} );
+
+		// Cancel post status editing and hide options.
+		$element.find( '.cancel-pronamic-pay-post-status' ).on( 'click', function( event ) {
+			$element.slideUp( 'fast' ).siblings( 'a.edit-pronamic-pay-post-status' ).show().trigger( 'focus' );
+
+			$( '#pronamic-pay-post-status' ).val( $( '#hidden_pronamic_pay_post_status' ).val() );
+
+			$( '#pronamic-pay-status-display' ).text( $( '#pronamic-pay-post-status option:selected' ).text() );
+
+			event.preventDefault();
+		} );
+	};
+
+	/**
+	 * jQuery plugin - Pronamic Pay post status
+	 */
+	$.fn.pronamicPayPostStatus = function() {
+		return this.each( function() {
+			var $this = $( this );
+
+			if ( $this.data( 'pronamic-pay-post-status' ) ) {
+				return;
+			}
+
+			var postStatus = new PronamicPayPostStatus( this );
+
+			$this.data( 'pronamic-pay-post-status', postStatus );
+		} );
+	};
+
 	/**
 	 * Pronamic pay gateway test
 	 */
@@ -370,6 +425,7 @@
 	$( document ).ready( function() {
 		$( '#pronamic-pay-gateway-config-editor' ).pronamicPayGatewayConfigEditor();
 		$( '#pronamic_payment_form_options').pronamicPayFormOptions();
+		$( '#pronamic-pay-post-status-select' ).pronamicPayPostStatus();
 		$( '#pronamic_gateway_test').pronamicPayGatewayTest();
 		$( '.pronamic-pay-tabs' ).pronamicPayTabs();
 
diff --git a/js/src/admin.js b/js/src/admin.js
index 98640a07..cde037e6 100644
--- a/js/src/admin.js
+++ b/js/src/admin.js
@@ -233,6 +233,61 @@
 		} );
 	};
 
+	/**
+	 * Pronamic Pay post status.
+	 */
+	var PronamicPayPostStatus = function( element ) {
+		var $element = $( element );
+
+		// Post Status edit click.
+		$element.siblings( 'a.edit-pronamic-pay-post-status' ).on( 'click', function( event ) {
+			if ( $element.is( ':hidden' ) ) {
+				$element.slideDown( 'fast', function() { $element.find( 'select' ).trigger( 'focus' ); } );
+
+				$( this ).hide();
+			}
+
+			event.preventDefault();
+		} );
+
+		// Save post status changes and hide options.
+		$element.find( '.save-pronamic-pay-post-status' ).on( 'click', function( event ) {
+			$element.slideUp( 'fast' ).siblings( 'a.edit-pronamic-pay-post-status' ).show().trigger( 'focus' );
+
+			$( '#pronamic-pay-status-display' ).text( $( '#pronamic-pay-post-status option:selected' ).text() );
+
+			event.preventDefault();
+		} );
+
+		// Cancel post status editing and hide options.
+		$element.find( '.cancel-pronamic-pay-post-status' ).on( 'click', function( event ) {
+			$element.slideUp( 'fast' ).siblings( 'a.edit-pronamic-pay-post-status' ).show().trigger( 'focus' );
+
+			$( '#pronamic-pay-post-status' ).val( $( '#hidden_pronamic_pay_post_status' ).val() );
+
+			$( '#pronamic-pay-status-display' ).text( $( '#pronamic-pay-post-status option:selected' ).text() );
+
+			event.preventDefault();
+		} );
+	};
+
+	/**
+	 * jQuery plugin - Pronamic Pay post status
+	 */
+	$.fn.pronamicPayPostStatus = function() {
+		return this.each( function() {
+			var $this = $( this );
+
+			if ( $this.data( 'pronamic-pay-post-status' ) ) {
+				return;
+			}
+
+			var postStatus = new PronamicPayPostStatus( this );
+
+			$this.data( 'pronamic-pay-post-status', postStatus );
+		} );
+	};
+
 	/**
 	 * Pronamic pay gateway test
 	 */
@@ -370,6 +425,7 @@
 	$( document ).ready( function() {
 		$( '#pronamic-pay-gateway-config-editor' ).pronamicPayGatewayConfigEditor();
 		$( '#pronamic_payment_form_options').pronamicPayFormOptions();
+		$( '#pronamic-pay-post-status-select' ).pronamicPayPostStatus();
 		$( '#pronamic_gateway_test').pronamicPayGatewayTest();
 		$( '.pronamic-pay-tabs' ).pronamicPayTabs();
 
diff --git a/scss/admin/_meta-box-update.scss b/scss/admin/_meta-box-update.scss
index 7da83173..0b0bd41d 100644
--- a/scss/admin/_meta-box-update.scss
+++ b/scss/admin/_meta-box-update.scss
@@ -25,3 +25,11 @@
 
 	text-align: right;
 }
+
+#pronamic-pay-status-display {
+	font-weight: 600;
+}
+
+#pronamic-pay-post-status-select {
+	margin-top: 3px;
+}
diff --git a/views/meta-box-payment-info.php b/views/meta-box-payment-info.php
index efa428e3..fc4bdfc6 100644
--- a/views/meta-box-payment-info.php
+++ b/views/meta-box-payment-info.php
@@ -25,32 +25,37 @@
 			<?php echo esc_html( $payment->date->format_i18n() ); ?>
 		</td>
 	</tr>
-	<tr>
-		<th scope="row">
-			<?php esc_html_e( 'Status', 'pronamic_ideal' ); ?>
-		</th>
-		<td>
-			<?php
 
-			$status_label = $payment->get_status_label();
+	<?php
+
+	$failure_reason = $payment->get_failure_reason();
+
+	if ( PaymentStatus::FAILURE === $payment->get_status() && null !== $failure_reason ) :
+
+		?>
 
-			echo \esc_html( ( null === $status_label ) ? '—' : $status_label );
+		<tr>
+			<th scope="row">
+				<?php esc_html_e( 'Status', 'pronamic_ideal' ); ?>
+			</th>
+			<td>
+				<?php
 
-			// Failure reason.
-			$failure_reason = $payment->get_failure_reason();
+				$status_label = $payment->get_status_label();
 
-			if ( PaymentStatus::FAILURE === $payment->get_status() && null !== $failure_reason ) :
+				echo \esc_html( ( null === $status_label ) ? '—' : $status_label );
 
 				printf(
 					' — %s',
 					esc_html( $failure_reason )
 				);
 
-			endif;
+				?>
+			</td>
+		</tr>
+
+	<?php endif; ?>
 
-			?>
-		</td>
-	</tr>
 	<tr>
 		<th scope="row">
 			<?php esc_html_e( 'ID', 'pronamic_ideal' ); ?>
diff --git a/views/meta-box-payment-update.php b/views/meta-box-payment-update.php
index e9c489cb..4b122133 100644
--- a/views/meta-box-payment-update.php
+++ b/views/meta-box-payment-update.php
@@ -10,7 +10,6 @@
 
 use Pronamic\WordPress\Pay\Core\PaymentMethods;
 use Pronamic\WordPress\Pay\Payments\PaymentPostType;
-use Pronamic\WordPress\Pay\Plugin;
 
 if ( ! isset( $post ) ) {
 	return;
@@ -24,6 +23,8 @@
 	return;
 }
 
+ksort( $states );
+
 // WordPress by default doesn't allow `post_author` values of `0`, that's why we use a dash (`-`).
 // @link https://github.com/WordPress/WordPress/blob/4.9.5/wp-admin/includes/post.php#L56-L64.
 $post_author = get_post_field( 'post_author' );
@@ -33,139 +34,168 @@
 <input type="hidden" name="post_author_override" value="<?php echo esc_attr( $post_author ); ?>" />
 
 <div class="pronamic-pay-inner">
-	<p>
-		<label for="pronamic-payment-status">Status:&nbsp;</label>
-		<select id="pronamic-payment-status" name="pronamic_payment_post_status" class="medium-text">
+	<div id="minor-publishing-actions">
+		<div class="clear"></div>
+	</div>
+
+	<div class="pronamic-pay-minor-actions">
+		<div class="misc-pub-post-status">
+			<?php echo esc_html( __( 'Status:', 'pronamic_ideal' ) ); ?>
+
 			<?php
 
-			foreach ( $states as $payment_status => $label ) {
-				printf(
-					'<option value="%s" %s>%s</option>',
-					esc_attr( $payment_status ),
-					selected( $payment_status, $post->post_status, false ),
-					esc_html( $label )
-				);
-			}
+			$status_object = get_post_status_object( $post->post_status );
+
+			$status_label = isset( $status_object, $status_object->label ) ? $status_object->label : '—';
 
 			?>
-		</select>
-	</p>
-
-	<?php
-
-	$gateway = $payment->get_gateway();
-
-	/**
-	 * Check status button.
-	 */
-	if ( null !== $gateway && $gateway->supports( 'payment_status_request' ) ) {
-		// Only show button if gateway exists and status check is supported.
-		$action_url = wp_nonce_url(
-			add_query_arg(
-				array(
-					'post'                      => $post->ID,
-					'action'                    => 'edit',
-					'pronamic_pay_check_status' => true,
-				),
-				admin_url( 'post.php' )
-			),
-			'pronamic_payment_check_status_' . $post->ID
-		);
 
-		printf(
-			'<p><a class="button" href="%s">%s</a></p>',
-			esc_url( $action_url ),
-			esc_html__( 'Check status', 'pronamic_ideal' )
-		);
-	}
-
-	/**
-	 * Create invoice for reserved payment.
-	 */
-	if ( $gateway && $gateway->supports( 'reservation_payments' ) && 'payment_reserved' === get_post_status( $post->ID ) ) {
-		// Only show button if gateway exists and reservation payments are supported.
-		$action_url = wp_nonce_url(
-			add_query_arg(
-				array(
-					'post'                        => $post->ID,
-					'action'                      => 'edit',
-					'pronamic_pay_create_invoice' => true,
-				),
-				admin_url( 'post.php' )
-			),
-			'pronamic_payment_create_invoice_' . $post->ID
-		);
+			<span id="pronamic-pay-status-display"><?php echo esc_html( $status_label ); ?></span>
 
-		$link_text = sprintf(
-			/* translators: %s: payment method name */
-			__( 'Create %1$s invoice', 'pronamic_ideal' ),
-			PaymentMethods::get_name( $payment->get_payment_method() )
-		);
+			<a href="#pronamic-pay-post-status" class="edit-pronamic-pay-post-status hide-if-no-js" role="button">
+				<span aria-hidden="true"><?php _e( 'Edit', 'pronamic_ideal' ); ?></span>
+				<span class="screen-reader-text"><?php _e( 'Edit status', 'pronamic_ideal' ); ?></span>
+			</a>
 
-		printf(
-			'<p><a class="button" href="%s">%s</a></p>',
-			esc_url( $action_url ),
-			esc_html( $link_text )
-		);
-	}
-
-	/**
-	 * Cancel payment reservations.
-	 */
-	if ( $gateway && $gateway->supports( 'reservation_payments' ) && 'payment_reserved' === get_post_status( $post->ID ) ) {
-		// Only show button if gateway exists and reservation payments are supported.
-		$action_url = wp_nonce_url(
-			add_query_arg(
-				array(
-					'post'                            => $post->ID,
-					'action'                          => 'edit',
-					'pronamic_pay_cancel_reservation' => true,
-				),
-				admin_url( 'post.php' )
-			),
-			'pronamic_payment_cancel_reservation_' . $post->ID
-		);
+			<div id="pronamic-pay-post-status-select" class="hide-if-js">
+				<input type="hidden" name="hidden_pronamic_pay_post_status" id="hidden_pronamic_pay_post_status" value="<?php echo esc_attr( ( 'auto-draft' === $post->post_status ) ? 'draft' : $post->post_status ); ?>" />
+				<label for="pronamic-pay-post-status" class="screen-reader-text"><?php _e( 'Set status' ); ?></label>
+				<select id="pronamic-pay-post-status" name="pronamic_payment_post_status">
+					<?php
 
-		$link_text = sprintf(
-			/* translators: %s: payment method name */
-			__( 'Cancel %1$s reservation', 'pronamic_ideal' ),
-			PaymentMethods::get_name( $payment->get_payment_method() )
-		);
+					foreach ( $states as $payment_status => $label ) {
+						printf(
+							'<option value="%s" %s>%s</option>',
+							esc_attr( $payment_status ),
+							selected( $payment_status, $post->post_status, false ),
+							esc_html( $label )
+						);
+					}
 
-		printf(
-			'<p><a class="button" href="%s">%s</a></p>',
-			esc_url( $action_url ),
-			esc_html( $link_text )
-		);
-	}
-
-	/**
-	 * Send to Google Analytics button.
-	 */
-	$can_track = pronamic_pay_plugin()->google_analytics_ecommerce->valid_payment( $payment );
-
-	if ( $can_track ) {
-		// Only show button for payments that can be tracked.
-		$action_url = wp_nonce_url(
-			add_query_arg(
-				array(
-					'post'                  => $post->ID,
-					'action'                => 'edit',
-					'pronamic_pay_ga_track' => true,
+					?>
+				</select>
+
+				<a href="#pronamic-pay-post-status" class="save-pronamic-pay-post-status hide-if-no-js button"><?php _e( 'OK' ); ?></a>
+				<a href="#pronamic-pay-post-status" class="cancel-pronamic-pay-post-status hide-if-no-js button-cancel"><?php _e( 'Cancel' ); ?></a>
+			</div>
+		</div>
+
+		<?php
+
+		$gateway = $payment->get_gateway();
+
+		/**
+		 * Check status button.
+		 */
+		if ( null !== $gateway && $gateway->supports( 'payment_status_request' ) ) {
+			// Only show button if gateway exists and status check is supported.
+			$action_url = wp_nonce_url(
+				add_query_arg(
+					array(
+						'post'                      => $post->ID,
+						'action'                    => 'edit',
+						'pronamic_pay_check_status' => true,
+					),
+					admin_url( 'post.php' )
 				),
-				admin_url( 'post.php' )
-			),
-			'pronamic_payment_ga_track_' . $post->ID
-		);
+				'pronamic_payment_check_status_' . $post->ID
+			);
+
+			printf(
+				'<p><a class="button" href="%s">%s</a></p>',
+				esc_url( $action_url ),
+				esc_html__( 'Check status', 'pronamic_ideal' )
+			);
+		}
+
+		/**
+		 * Create invoice for reserved payment.
+		 */
+		if ( $gateway && $gateway->supports( 'reservation_payments' ) && 'payment_reserved' === get_post_status( $post->ID ) ) {
+			// Only show button if gateway exists and reservation payments are supported.
+			$action_url = wp_nonce_url(
+				add_query_arg(
+					array(
+						'post'                        => $post->ID,
+						'action'                      => 'edit',
+						'pronamic_pay_create_invoice' => true,
+					),
+					admin_url( 'post.php' )
+				),
+				'pronamic_payment_create_invoice_' . $post->ID
+			);
+
+			$link_text = sprintf(
+				/* translators: %s: payment method name */
+				__( 'Create %1$s invoice', 'pronamic_ideal' ),
+				PaymentMethods::get_name( $payment->get_payment_method() )
+			);
+
+			printf(
+				'<p><a class="button" href="%s">%s</a></p>',
+				esc_url( $action_url ),
+				esc_html( $link_text )
+			);
+		}
+
+		/**
+		 * Cancel payment reservations.
+		 */
+		if ( $gateway && $gateway->supports( 'reservation_payments' ) && 'payment_reserved' === get_post_status( $post->ID ) ) {
+			// Only show button if gateway exists and reservation payments are supported.
+			$action_url = wp_nonce_url(
+				add_query_arg(
+					array(
+						'post'                            => $post->ID,
+						'action'                          => 'edit',
+						'pronamic_pay_cancel_reservation' => true,
+					),
+					admin_url( 'post.php' )
+				),
+				'pronamic_payment_cancel_reservation_' . $post->ID
+			);
+
+			$link_text = sprintf(
+				/* translators: %s: payment method name */
+				__( 'Cancel %1$s reservation', 'pronamic_ideal' ),
+				PaymentMethods::get_name( $payment->get_payment_method() )
+			);
+
+			printf(
+				'<p><a class="button" href="%s">%s</a></p>',
+				esc_url( $action_url ),
+				esc_html( $link_text )
+			);
+		}
+
+		/**
+		 * Send to Google Analytics button.
+		 */
+		$can_track = pronamic_pay_plugin()->google_analytics_ecommerce->valid_payment( $payment );
+
+		if ( $can_track ) {
+			// Only show button for payments that can be tracked.
+			$action_url = wp_nonce_url(
+				add_query_arg(
+					array(
+						'post'                  => $post->ID,
+						'action'                => 'edit',
+						'pronamic_pay_ga_track' => true,
+					),
+					admin_url( 'post.php' )
+				),
+				'pronamic_payment_ga_track_' . $post->ID
+			);
 
-		printf(
-			'<p><a class="button" href="%s">%s</a></p>',
-			esc_url( $action_url ),
-			esc_html__( 'Send to Google Analytics', 'pronamic_ideal' )
-		);
-	}
+			printf(
+				'<p><a class="button" href="%s">%s</a></p>',
+				esc_url( $action_url ),
+				esc_html__( 'Send to Google Analytics', 'pronamic_ideal' )
+			);
+		}
 
-	?>
+		?>
+	</div>
 </div>
 
 <div class="pronamic-pay-major-actions">
diff --git a/views/meta-box-subscription-info.php b/views/meta-box-subscription-info.php
index 5bf64acf..64e5bf86 100644
--- a/views/meta-box-subscription-info.php
+++ b/views/meta-box-subscription-info.php
@@ -32,24 +32,6 @@
 			<?php the_time( __( 'l jS \o\f F Y, h:ia', 'pronamic_ideal' ) ); ?>
 		</td>
 	</tr>
-	<tr>
-		<th scope="row">
-			<?php esc_html_e( 'Status', 'pronamic_ideal' ); ?>
-		</th>
-		<td>
-			<?php
-
-			$status_object = get_post_status_object( (string) get_post_status( $subscription->get_id() ) );
-
-			if ( isset( $status_object, $status_object->label ) ) {
-				echo esc_html( $status_object->label );
-			} else {
-				echo '—';
-			}
-
-			?>
-		</td>
-	</tr>
 	<tr>
 		<th scope="row">
 			<?php esc_html_e( 'ID', 'pronamic_ideal' ); ?>
diff --git a/views/meta-box-subscription-update.php b/views/meta-box-subscription-update.php
index 83bfc9a5..101a0d20 100644
--- a/views/meta-box-subscription-update.php
+++ b/views/meta-box-subscription-update.php
@@ -9,6 +9,7 @@
  */
 
 use Pronamic\WordPress\Pay\Subscriptions\SubscriptionPostType;
+use Pronamic\WordPress\Pay\Subscriptions\SubscriptionStatus;
 
 if ( ! isset( $post ) ) {
 	return;
@@ -16,6 +17,8 @@
 
 $states = SubscriptionPostType::get_states();
 
+ksort( $states );
+
 // WordPress by default doesn't allow `post_author` values of `0`, that's why we use a dash (`-`).
 // @link https://github.com/WordPress/WordPress/blob/4.9.5/wp-admin/includes/post.php#L56-L64.
 $post_author = get_post_field( 'post_author' );
@@ -25,23 +28,66 @@
 <input type="hidden" name="post_author_override" value="<?php echo esc_attr( $post_author ); ?>" />
 
 <div class="pronamic-pay-inner">
-	<p>
-		<label for="pronamic-subscription-status">Status:&nbsp;</label>
-		<select id="pronamic-subscription-status" name="pronamic_subscription_post_status" class="medium-text">
+	<div id="minor-publishing-actions">
+		<div class="clear"></div>
+	</div>
+
+	<div class="pronamic-pay-minor-actions">
+		<div class="misc-pub-post-status">
+			<?php echo esc_html( __( 'Status:', 'pronamic_ideal' ) ); ?>
+
 			<?php
 
-			foreach ( $states as $subscription_status => $label ) {
-				printf(
-					'<option value="%s" %s>%s</option>',
-					esc_attr( $subscription_status ),
-					selected( $subscription_status, $post->post_status, false ),
-					esc_html( $label )
-				);
-			}
+			$status_object = get_post_status_object( $post->post_status );
+
+			$status_label = isset( $status_object, $status_object->label ) ? $status_object->label : '—';
 
 			?>
-		</select>
-	</p>
+
+			<span id="pronamic-pay-status-display"><?php echo esc_html( $status_label ); ?></span>
+
+			<?php if ( 'subscr_completed' !== $post->post_status ) : ?>
+
+				<a href="#pronamic-pay-post-status" class="edit-pronamic-pay-post-status hide-if-no-js" role="button">
+					<span aria-hidden="true"><?php _e( 'Edit', 'pronamic_ideal' ); ?></span>
+					<span class="screen-reader-text"><?php _e( 'Edit status', 'pronamic_ideal' ); ?></span>
+				</a>
+
+				<div id="pronamic-pay-post-status-select" class="hide-if-js">
+					<input type="hidden" name="hidden_pronamic_pay_post_status" id="hidden_pronamic_pay_post_status" value="<?php echo esc_attr( ( 'auto-draft' === $post->post_status ) ? 'draft' : $post->post_status ); ?>" />
+					<label for="pronamic-pay-post-status" class="screen-reader-text"><?php _e( 'Set status' ); ?></label>
+					<select id="pronamic-pay-post-status" name="pronamic_subscription_post_status">
+						<?php
+
+						$states_options = array(
+							'subscr_active',
+							'subscr_cancelled',
+							'subscr_on_hold',
+						);
+
+						foreach ( $states as $subscription_status => $label ) {
+							if ( ! in_array( $subscription_status, $states_options, true ) && $subscription_status !== $post->post_status ) {
+								continue;
+							}
+
+							printf(
+								'<option value="%s" %s>%s</option>',
+								esc_attr( $subscription_status ),
+								selected( $subscription_status, $post->post_status, false ),
+								esc_html( $label )
+							);
+						}
+
+						?>
+					</select>
+
+					<a href="#pronamic-pay-post-status" class="save-pronamic-pay-post-status hide-if-no-js button"><?php _e( 'OK' ); ?></a>
+					<a href="#pronamic-pay-post-status" class="cancel-pronamic-pay-post-status hide-if-no-js button-cancel"><?php _e( 'Cancel' ); ?></a>
+				</div>
+
+			<?php endif; ?>
+		</div>
+	</div>
 </div>
 
 <div class="pronamic-pay-major-actions">

From 74669857fe523586c7be71d399bc178bb8e57f55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Fri, 25 Mar 2022 16:38:46 +0100
Subject: [PATCH 39/87] Make `mode` property visibility protected.

---
 src/Core/ModeTrait.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/ModeTrait.php b/src/Core/ModeTrait.php
index 2daebab2..2323cc70 100644
--- a/src/Core/ModeTrait.php
+++ b/src/Core/ModeTrait.php
@@ -24,7 +24,7 @@ trait ModeTrait {
 	 *
 	 * @var string
 	 */
-	private $mode = 'live';
+	protected $mode = 'live';
 
 	/**
 	 * Set mode.

From 79f5b64c879808e165302ca9f423dcf10e702215 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Fri, 25 Mar 2022 16:39:14 +0100
Subject: [PATCH 40/87] Only query active subscriptions for follow-up payments.

---
 src/Subscriptions/SubscriptionsFollowUpPaymentsController.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Subscriptions/SubscriptionsFollowUpPaymentsController.php b/src/Subscriptions/SubscriptionsFollowUpPaymentsController.php
index a6c4d59d..067ecae3 100644
--- a/src/Subscriptions/SubscriptionsFollowUpPaymentsController.php
+++ b/src/Subscriptions/SubscriptionsFollowUpPaymentsController.php
@@ -388,8 +388,6 @@ private function get_subscriptions_wp_query_that_require_follow_up_payment( $arg
 			 */
 			'posts_per_page' => 100,
 			'post_status'    => array(
-				'subscr_pending',
-				'subscr_failed',
 				'subscr_active',
 			),
 			'meta_query'     => array(

From 6261864630a9fea27267aa57efac599a7505455c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Fri, 25 Mar 2022 16:39:52 +0100
Subject: [PATCH 41/87] Put subscriptions on hold when payment failed.

---
 src/Subscriptions/SubscriptionsModule.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Subscriptions/SubscriptionsModule.php b/src/Subscriptions/SubscriptionsModule.php
index 32a4ee15..dd6bc045 100644
--- a/src/Subscriptions/SubscriptionsModule.php
+++ b/src/Subscriptions/SubscriptionsModule.php
@@ -160,7 +160,7 @@ public function payment_status_update( $payment ) {
 					 * @link https://www.europeanpaymentscouncil.eu/document-library/guidance-documents/guidance-reason-codes-sepa-direct-debit-r-transactions
 					 * @link https://github.com/pronamic/wp-pronamic-ideal/commit/48449417eac49eb6a93480e3b523a396c7db9b3d#diff-6712c698c6b38adfa7190a4be983a093
 					 */
-					$status_update = SubscriptionStatus::FAILURE;
+					$status_update = SubscriptionStatus::ON_HOLD;
 
 					break;
 				case PaymentStatus::CANCELLED:

From 39431d6275172c85d7567bec7d899375a5184db0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Fri, 25 Mar 2022 16:40:15 +0100
Subject: [PATCH 42/87] Simplify subscription cancellation.

---
 views/subscription-cancel.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/views/subscription-cancel.php b/views/subscription-cancel.php
index 3cf73713..9f23215c 100644
--- a/views/subscription-cancel.php
+++ b/views/subscription-cancel.php
@@ -45,11 +45,9 @@
 						// Subscription details.
 						require __DIR__ . '/subscription-details.php';
 
-						$is_active = in_array( $subscription->get_status(), array( SubscriptionStatus::ACTIVE, SubscriptionStatus::FAILURE, SubscriptionStatus::EXPIRED, SubscriptionStatus::ON_HOLD, SubscriptionStatus::OPEN ), true );
-
 						?>
 
-						<?php if ( ! $is_active ) : ?>
+						<?php if ( SubscriptionStatus::ACTIVE !== $subscription->get_status() ) : ?>
 
 							<p>
 								<?php esc_html_e( 'The subscription can not be canceled as it is not active anymore.', 'pronamic_ideal' ); ?>
@@ -58,7 +56,7 @@
 						<?php endif; ?>
 					</div>
 
-					<?php if ( $is_active ) : ?>
+					<?php if ( SubscriptionStatus::ACTIVE === $subscription->get_status() ) : ?>
 
 						<div class="pp-page-section-wrapper">
 

From 5de364a3204d3b8d8c5c574563a44188a26ff8ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Fri, 25 Mar 2022 20:05:40 +0100
Subject: [PATCH 43/87] Only query active subscriptions for subscription
 notifications.

---
 src/Subscriptions/SubscriptionsNotificationsController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Subscriptions/SubscriptionsNotificationsController.php b/src/Subscriptions/SubscriptionsNotificationsController.php
index 3760231a..c0f4f6e7 100644
--- a/src/Subscriptions/SubscriptionsNotificationsController.php
+++ b/src/Subscriptions/SubscriptionsNotificationsController.php
@@ -275,7 +275,6 @@ private function get_subscriptions_wp_query_that_require_notification( $args = a
 			 */
 			'posts_per_page' => 100,
 			'post_status'    => array(
-				'subscr_pending',
 				'subscr_active',
 			),
 			'meta_query'     => array(

From 28aefd79b0851255495f57b19bf2775c7880fe78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Mon, 28 Mar 2022 14:17:58 +0200
Subject: [PATCH 44/87] Remove unused 'Status' column from subscription phases
 meta box.

---
 views/meta-box-subscription-phases.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/views/meta-box-subscription-phases.php b/views/meta-box-subscription-phases.php
index 3178ebac..740691a1 100644
--- a/views/meta-box-subscription-phases.php
+++ b/views/meta-box-subscription-phases.php
@@ -23,9 +23,6 @@
 		<table class="pronamic-pay-table widefat">
 			<thead>
 				<tr>
-					<th scope="col">
-						<span class="pronamic-pay-tip pronamic-pay-icon pronamic-pay-status" title="<?php esc_attr_e( 'Status', 'pronamic_ideal' ); ?>"><?php esc_html_e( 'Status', 'pronamic_ideal' ); ?></span>
-					</th>
 					<th scope="col"><?php esc_html_e( 'Amount', 'pronamic_ideal' ); ?></th>
 					<th scope="col"><?php esc_html_e( 'Recurrence', 'pronamic_ideal' ); ?></th>
 					<th scope="col"><?php esc_html_e( 'Start Date', 'pronamic_ideal' ); ?></th>
@@ -50,7 +47,6 @@
 					?>
 
 					<tr>
-						<td></td>
 						<td>
 							<?php echo esc_html( $phase->get_amount()->format_i18n() ); ?>
 						</td>

From d9fe23e223791643c625ac77dd7515a99947eca8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Mon, 28 Mar 2022 14:25:27 +0200
Subject: [PATCH 45/87] Only show next payment (delivery) date in subscription
 info meta box if subscription is active.

---
 views/meta-box-subscription-info.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/meta-box-subscription-info.php b/views/meta-box-subscription-info.php
index 64e5bf86..65a5758a 100644
--- a/views/meta-box-subscription-info.php
+++ b/views/meta-box-subscription-info.php
@@ -134,8 +134,8 @@
 
 	<?php
 
-	// Show next payment (delivery) date if subscription is not cancelled or completed.
-	if ( ! in_array( $subscription->get_status(), array( SubscriptionStatus::CANCELLED, SubscriptionStatus::COMPLETED, SubscriptionStatus::EXPIRED ), true ) ) :
+	// Show next payment (delivery) date if subscription is active.
+	if ( SubscriptionStatus::ACTIVE === $subscription->get_status() ) :
 
 		?>
 

From 75f6df98e32562f13e4ae2b7ffd42a348b7e7872 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Mon, 28 Mar 2022 14:30:22 +0200
Subject: [PATCH 46/87] Uppercase first letter of payment and subscription
 source text.

---
 src/Payments/Payment.php           | 2 +-
 src/Subscriptions/Subscription.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Payments/Payment.php b/src/Payments/Payment.php
index 88181941..33d9dca7 100644
--- a/src/Payments/Payment.php
+++ b/src/Payments/Payment.php
@@ -418,7 +418,7 @@ public function get_edit_payment_url() {
 	 */
 	public function get_source_text() {
 		$pieces = array(
-			$this->get_source(),
+			\ucfirst( (string) $this->get_source() ),
 			$this->get_source_id(),
 		);
 
diff --git a/src/Subscriptions/Subscription.php b/src/Subscriptions/Subscription.php
index e1470c2f..07d70f35 100644
--- a/src/Subscriptions/Subscription.php
+++ b/src/Subscriptions/Subscription.php
@@ -141,7 +141,7 @@ public function add_note( $note ) {
 	 */
 	public function get_source_text() {
 		$pieces = array(
-			$this->get_source(),
+			\ucfirst( (string) $this->get_source() ),
 			$this->get_source_id(),
 		);
 

From 39a2d70aa4d22fcc63d2f643592b92819f3fbebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Mon, 28 Mar 2022 15:05:31 +0200
Subject: [PATCH 47/87] Update `http://` URL to `https://`.

---
 views/page-dashboard.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/page-dashboard.php b/views/page-dashboard.php
index 2e73ac38..301b1570 100644
--- a/views/page-dashboard.php
+++ b/views/page-dashboard.php
@@ -423,7 +423,7 @@
 							<?php
 
 							wp_widget_rss_output(
-								'http://feeds.feedburner.com/pronamic',
+								'https://feeds.feedburner.com/pronamic',
 								array(
 									'link'  => __( 'http://www.pronamic.eu/', 'pronamic_ideal' ),
 									'url'   => 'http://feeds.feedburner.com/pronamic',

From d709bfe3bfe66a9907749763fe32a80976ad293b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Mon, 28 Mar 2022 16:16:29 +0200
Subject: [PATCH 48/87] Only display trial, alignment and proration columns in
 subscription phases when applicable.

---
 views/meta-box-subscription-phases.php | 77 ++++++++++++++++++--------
 1 file changed, 53 insertions(+), 24 deletions(-)

diff --git a/views/meta-box-subscription-phases.php b/views/meta-box-subscription-phases.php
index 740691a1..e3a88ec0 100644
--- a/views/meta-box-subscription-phases.php
+++ b/views/meta-box-subscription-phases.php
@@ -19,6 +19,23 @@
 
 <?php else : ?>
 
+	<?php
+
+	$has_trial     = false;
+	$has_alignment = false;
+
+	foreach ( $phases as $phase ) {
+		if ( $phase->is_trial() ) {
+			$has_trial = true;
+		}
+
+		if ( $phase->is_alignment() || $phase->is_prorated() ) {
+			$has_alignment = true;
+		}
+	}
+
+	?>
+
 	<div class="pronamic-pay-table-responsive">
 		<table class="pronamic-pay-table widefat">
 			<thead>
@@ -28,10 +45,19 @@
 					<th scope="col"><?php esc_html_e( 'Start Date', 'pronamic_ideal' ); ?></th>
 					<th scope="col"><?php esc_html_e( 'End Date', 'pronamic_ideal' ); ?></th>
 					<th scope="col"><?php esc_html_e( 'Next Date', 'pronamic_ideal' ); ?></th>
-					<th scope="col"><?php esc_html_e( 'Periods created', 'pronamic_ideal' ); ?></th>
-					<th scope="col"><?php esc_html_e( 'Trial', 'pronamic_ideal' ); ?></th>
-					<th scope="col"><?php esc_html_e( 'Aligned', 'pronamic_ideal' ); ?></th>
-					<th scope="col"><?php esc_html_e( 'Prorated', 'pronamic_ideal' ); ?></th>
+
+					<?php if ( $has_trial ) : ?>
+
+						<th scope="col"><?php esc_html_e( 'Trial', 'pronamic_ideal' ); ?></th>
+
+					<?php endif; ?>
+
+					<?php if ( $has_alignment ) : ?>
+
+						<th scope="col"><?php esc_html_e( 'Aligned', 'pronamic_ideal' ); ?></th>
+						<th scope="col"><?php esc_html_e( 'Prorated', 'pronamic_ideal' ); ?></th>
+
+					<?php endif; ?>
 				</tr>
 			</thead>
 
@@ -103,34 +129,37 @@
 
 							?>
 						</td>
-						<td>
-							<?php
 
-							echo esc_html( (string) $phase->get_periods_created() );
+						<?php if ( $has_trial ) : ?>
 
-							?>
-						</td>
-						<td>
-							<?php
+							<td>
+								<?php
 
-							echo esc_html( $phase->is_trial() ? __( 'Yes', 'pronamic_ideal' ) : __( 'No', 'pronamic_ideal' ) );
+								echo esc_html( $phase->is_trial() ? __( 'Yes', 'pronamic_ideal' ) : __( 'No', 'pronamic_ideal' ) );
 
-							?>
-						</td>
-						<td>
-							<?php
+								?>
+							</td>
 
-							echo esc_html( $phase->is_alignment() ? __( 'Yes', 'pronamic_ideal' ) : __( 'No', 'pronamic_ideal' ) );
+						<?php endif; ?>
 
-							?>
-						</td>
-						<td>
-							<?php
+						<?php if ( $has_alignment ) : ?>
 
-							echo esc_html( $phase->is_prorated() ? __( 'Yes', 'pronamic_ideal' ) : __( 'No', 'pronamic_ideal' ) );
+							<td>
+								<?php
 
-							?>
-						</td>
+								echo esc_html( $phase->is_alignment() ? __( 'Yes', 'pronamic_ideal' ) : __( 'No', 'pronamic_ideal' ) );
+
+								?>
+							</td>
+							<td>
+								<?php
+
+								echo esc_html( $phase->is_prorated() ? __( 'Yes', 'pronamic_ideal' ) : __( 'No', 'pronamic_ideal' ) );
+
+								?>
+							</td>
+
+						<?php endif; ?>
 					</tr>
 
 				<?php endforeach; ?>

From a96d2c9078a68a8c6900fb65e1736e5e5bd25466 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Mon, 28 Mar 2022 16:18:35 +0200
Subject: [PATCH 49/87] Update minified version of admin script (91ff3946).

---
 js/dist/admin.min.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/dist/admin.min.js b/js/dist/admin.min.js
index 987b3627..25a63869 100644
--- a/js/dist/admin.min.js
+++ b/js/dist/admin.min.js
@@ -1 +1 @@
-!function(t){var a=function(a){var i=this,e=t(a),n={};n.variantId=e.find("#pronamic_gateway_id"),n.extraSettings=e.find("div.extra-settings"),n.sectionHeaders=e.find(".gateway-config-section-header"),n.tabs=e.find(".pronamic-pay-tabs"),n.tabItems=e.find("ul.pronamic-pay-tabs-items"),this.updateFields=function(){i.selectedVariant=n.variantId.find("option:selected"),i.settings=i.selectedVariant.data("pronamic-pay-settings"),e.find(".extra-settings").hide(),i.settingElements=[],t.isArray(i.settings)&&t.each(i.settings,(function(t,a){e.find(".setting-"+a).show()})),e.find(".setting-"+i.selectedVariant.val()).show();var a=i.selectedVariant.text().split(" - ")[0].replace(/ \(.*\)/,"");n.tabItems.find(":visible").first().text(a).click(),t("#pronamic-pay-gateway-description").html(i.selectedVariant.attr("data-gateway-description"))},this.updateRowBackgroundColor=function(){var t=n.extraSettings.find(".form-table tr");t.removeClass("even"),t.filter(":visible:even").addClass("even")},this.initTabs=function(){t.each(n.sectionHeaders,(function(a,i){var e=t(i),s=e.find("h4").text(),o=e.parents("div")[0].className;n.tabItems.append(t("<li>"+s+"</li>").addClass(o).removeClass("pronamic-pay-tab"))})),n.tabItems.next().after(n.tabItems),n.tabItems.find("li").click(i.showTabSettings)},this.showTabSettings=function(){var a=t(this);n.extraSettings.hide().eq(a.index()).show()};var s=function(){t.ajax({url:pronamicPayGatewayAdmin.rest_url,method:"GET",beforeSend:function(t){t.setRequestHeader("X-WP-Nonce",pronamicPayGatewayAdmin.nonce)},data:{gateway_id:t("#pronamic_gateway_id").val(),gateway_mode:t("#pronamic_ideal_mode").val()}}).done((function(a){t("#pronamic-pay-gateway-settings").html(a.meta_boxes.settings),t("#pronamic-pay-gateway-settings .pronamic-pay-tabs").pronamicPayTabs(),t("#pronamic-pay-gateway-settings .pronamic-pay-tip").each((function(){tippy(this,{content:t(this).attr("title"),arrow:!0,theme:"pronamic-pay"})}))}))};t("#pronamic_gateway_id").change(s),t("#pronamic_ideal_mode").change(s),i.initTabs(),i.updateFields(),n.variantId.change(i.updateFields)};t.fn.pronamicPayGatewayConfigEditor=function(){return this.each((function(){var i=t(this);if(!i.data("pronamic-pay-gateway-config-editor")){var e=new a(this);i.data("pronamic-pay-gateway-config-editor",e)}}))};var i=function(a){var i=this,e=t(a),n={};n.tabItems=e.find("ul.pronamic-pay-tabs-items"),n.tabs=e.find(".pronamic-pay-tab"),n.tabItems=e.find("ul.pronamic-pay-tabs-items"),this.updateRowBackgroundColor=function(){var t=n.tabs.find(".form-table tr");t.removeClass("even"),t.filter(":visible:even").addClass("even")},this.showTab=function(){var a=t(this);n.tabItems.find("li").removeClass("active"),a.addClass("active"),n.tabs.hide().eq(a.index()).show(),i.updateRowBackgroundColor(),i.visibleTabItems=n.tabItems.find("li:visible"),i.activeTabItem=a},this.responsiveTabs=function(){if(t(window).width()>960)n.tabs.hide(),i.activeTabItem?i.activeTabItem.click():n.tabItems.find("li:visible").first().click();else{if(!i.visibleTabItems)return;n.tabs.hide(),t.each(i.visibleTabItems,(function(a,i){n.tabs.eq(t(i).index()).show()}))}},n.tabItems.find("li").click(i.showTab),n.tabItems.find("li:visible").first().click(),t(window).resize(i.responsiveTabs)};t.fn.pronamicPayTabs=function(){return this.each((function(){var a=t(this);if(!a.data("pronamic-pay-tabs")){var e=new i(this);a.data("pronamic-pay-tabs",e)}}))};var e=function(a){var i=t(a),e={};e.paymentMethods=i.find('select[name="pronamic_pay_test_payment_method"]'),this.updateInputVisibility=function(){var a=e.paymentMethods.val();""!==a&&i.find(".pronamic-pay-test-payment-method").hide().filter("."+a).show(),1===e.paymentMethods.find("option:selected").data("is-recurring")?t("#pronamic-pay-test-subscription").parents("tr").show():(t("#pronamic-pay-test-subscription").parents("tr").hide(),t("#pronamic-pay-test-subscription").prop("checked",!1).trigger("change"))},this.updateInputVisibility(),e.paymentMethods.change(this.updateInputVisibility),i.on("keydown","input, select",(function(t){13===t.keyCode&&(t.preventDefault(),i.find('input[name="test_pay_gateway"]').click())}))};t.fn.pronamicPayGatewayTest=function(){return this.each((function(){var a=t(this);if(!a.data("pronamic-pay-gateway-test")){var i=new e(this);a.data("pronamic-pay-gateway-test",i)}}))};var n=function(a){var i=this,e=t(a),n={};n.amountMethod=e.find('select[name="_pronamic_payment_form_amount_method"]'),this.updateAmountsVisibility=function(){var t=n.amountMethod.val();"choices_only"===t||"choices_and_input"===t?e.find('input[name="_pronamic_payment_form_amount_choices[]"]').closest("div").show():e.find('input[name="_pronamic_payment_form_amount_choices[]"]').closest("div").hide()},this.maybeAddAmountChoice=function(){if(n.amountChoices=e.find('input[name="_pronamic_payment_form_amount_choices[]"]'),0===n.amountChoices.filter((function(){return""===this.value})).length){var t=n.amountChoices.last().closest("div"),a=t.clone(),i="_pronamic_payment_form_amount_choice_"+n.amountChoices.length;a.find("input").attr("id",i).val(""),a.find("label").attr("for",i),t.after(a)}},i.updateAmountsVisibility(),n.amountMethod.change(i.updateAmountsVisibility),e.on("keyup",'input[name="_pronamic_payment_form_amount_choices[]"]',(function(){i.maybeAddAmountChoice()}))};t.fn.pronamicPayFormOptions=function(){return this.each((function(){var a=t(this);if(!a.data("pronamic-pay-forms-options")){var i=new n(this);a.data("pronamic-pay-form-options",i)}}))},t(document).ready((function(){t("#pronamic-pay-gateway-config-editor").pronamicPayGatewayConfigEditor(),t("#pronamic_payment_form_options").pronamicPayFormOptions(),t("#pronamic_gateway_test").pronamicPayGatewayTest(),t(".pronamic-pay-tabs").pronamicPayTabs(),t(".pronamic-pay-tip").each((function(){tippy(this,{content:t(this).attr("title"),arrow:!0,theme:"pronamic-pay"})}))}))}(jQuery);
\ No newline at end of file
+!function(t){var a=function(a){var i=this,e=t(a),n={};n.variantId=e.find("#pronamic_gateway_id"),n.extraSettings=e.find("div.extra-settings"),n.sectionHeaders=e.find(".gateway-config-section-header"),n.tabs=e.find(".pronamic-pay-tabs"),n.tabItems=e.find("ul.pronamic-pay-tabs-items"),this.updateFields=function(){i.selectedVariant=n.variantId.find("option:selected"),i.settings=i.selectedVariant.data("pronamic-pay-settings"),e.find(".extra-settings").hide(),i.settingElements=[],t.isArray(i.settings)&&t.each(i.settings,(function(t,a){e.find(".setting-"+a).show()})),e.find(".setting-"+i.selectedVariant.val()).show();var a=i.selectedVariant.text().split(" - ")[0].replace(/ \(.*\)/,"");n.tabItems.find(":visible").first().text(a).click(),t("#pronamic-pay-gateway-description").html(i.selectedVariant.attr("data-gateway-description"))},this.updateRowBackgroundColor=function(){var t=n.extraSettings.find(".form-table tr");t.removeClass("even"),t.filter(":visible:even").addClass("even")},this.initTabs=function(){t.each(n.sectionHeaders,(function(a,i){var e=t(i),s=e.find("h4").text(),o=e.parents("div")[0].className;n.tabItems.append(t("<li>"+s+"</li>").addClass(o).removeClass("pronamic-pay-tab"))})),n.tabItems.next().after(n.tabItems),n.tabItems.find("li").click(i.showTabSettings)},this.showTabSettings=function(){var a=t(this);n.extraSettings.hide().eq(a.index()).show()};var s=function(){t.ajax({url:pronamicPayGatewayAdmin.rest_url,method:"GET",beforeSend:function(t){t.setRequestHeader("X-WP-Nonce",pronamicPayGatewayAdmin.nonce)},data:{gateway_id:t("#pronamic_gateway_id").val(),gateway_mode:t("#pronamic_ideal_mode").val()}}).done((function(a){t("#pronamic-pay-gateway-settings").html(a.meta_boxes.settings),t("#pronamic-pay-gateway-settings .pronamic-pay-tabs").pronamicPayTabs(),t("#pronamic-pay-gateway-settings .pronamic-pay-tip").each((function(){tippy(this,{content:t(this).attr("title"),arrow:!0,theme:"pronamic-pay"})}))}))};t("#pronamic_gateway_id").change(s),t("#pronamic_ideal_mode").change(s),i.initTabs(),i.updateFields(),n.variantId.change(i.updateFields)};t.fn.pronamicPayGatewayConfigEditor=function(){return this.each((function(){var i=t(this);if(!i.data("pronamic-pay-gateway-config-editor")){var e=new a(this);i.data("pronamic-pay-gateway-config-editor",e)}}))};var i=function(a){var i=this,e=t(a),n={};n.tabItems=e.find("ul.pronamic-pay-tabs-items"),n.tabs=e.find(".pronamic-pay-tab"),n.tabItems=e.find("ul.pronamic-pay-tabs-items"),this.updateRowBackgroundColor=function(){var t=n.tabs.find(".form-table tr");t.removeClass("even"),t.filter(":visible:even").addClass("even")},this.showTab=function(){var a=t(this);n.tabItems.find("li").removeClass("active"),a.addClass("active"),n.tabs.hide().eq(a.index()).show(),i.updateRowBackgroundColor(),i.visibleTabItems=n.tabItems.find("li:visible"),i.activeTabItem=a},this.responsiveTabs=function(){if(t(window).width()>960)n.tabs.hide(),i.activeTabItem?i.activeTabItem.click():n.tabItems.find("li:visible").first().click();else{if(!i.visibleTabItems)return;n.tabs.hide(),t.each(i.visibleTabItems,(function(a,i){n.tabs.eq(t(i).index()).show()}))}},n.tabItems.find("li").click(i.showTab),n.tabItems.find("li:visible").first().click(),t(window).resize(i.responsiveTabs)};t.fn.pronamicPayTabs=function(){return this.each((function(){var a=t(this);if(!a.data("pronamic-pay-tabs")){var e=new i(this);a.data("pronamic-pay-tabs",e)}}))};var e=function(a){var i=t(a);i.siblings("a.edit-pronamic-pay-post-status").on("click",(function(a){i.is(":hidden")&&(i.slideDown("fast",(function(){i.find("select").trigger("focus")})),t(this).hide()),a.preventDefault()})),i.find(".save-pronamic-pay-post-status").on("click",(function(a){i.slideUp("fast").siblings("a.edit-pronamic-pay-post-status").show().trigger("focus"),t("#pronamic-pay-status-display").text(t("#pronamic-pay-post-status option:selected").text()),a.preventDefault()})),i.find(".cancel-pronamic-pay-post-status").on("click",(function(a){i.slideUp("fast").siblings("a.edit-pronamic-pay-post-status").show().trigger("focus"),t("#pronamic-pay-post-status").val(t("#hidden_pronamic_pay_post_status").val()),t("#pronamic-pay-status-display").text(t("#pronamic-pay-post-status option:selected").text()),a.preventDefault()}))};t.fn.pronamicPayPostStatus=function(){return this.each((function(){var a=t(this);if(!a.data("pronamic-pay-post-status")){var i=new e(this);a.data("pronamic-pay-post-status",i)}}))};var n=function(a){var i=t(a),e={};e.paymentMethods=i.find('select[name="pronamic_pay_test_payment_method"]'),this.updateInputVisibility=function(){var a=e.paymentMethods.val();""!==a&&i.find(".pronamic-pay-test-payment-method").hide().filter("."+a).show(),1===e.paymentMethods.find("option:selected").data("is-recurring")?t("#pronamic-pay-test-subscription").parents("tr").show():(t("#pronamic-pay-test-subscription").parents("tr").hide(),t("#pronamic-pay-test-subscription").prop("checked",!1).trigger("change"))},this.updateInputVisibility(),e.paymentMethods.change(this.updateInputVisibility),i.on("keydown","input, select",(function(t){13===t.keyCode&&(t.preventDefault(),i.find('input[name="test_pay_gateway"]').click())}))};t.fn.pronamicPayGatewayTest=function(){return this.each((function(){var a=t(this);if(!a.data("pronamic-pay-gateway-test")){var i=new n(this);a.data("pronamic-pay-gateway-test",i)}}))};var s=function(a){var i=this,e=t(a),n={};n.amountMethod=e.find('select[name="_pronamic_payment_form_amount_method"]'),this.updateAmountsVisibility=function(){var t=n.amountMethod.val();"choices_only"===t||"choices_and_input"===t?e.find('input[name="_pronamic_payment_form_amount_choices[]"]').closest("div").show():e.find('input[name="_pronamic_payment_form_amount_choices[]"]').closest("div").hide()},this.maybeAddAmountChoice=function(){if(n.amountChoices=e.find('input[name="_pronamic_payment_form_amount_choices[]"]'),0===n.amountChoices.filter((function(){return""===this.value})).length){var t=n.amountChoices.last().closest("div"),a=t.clone(),i="_pronamic_payment_form_amount_choice_"+n.amountChoices.length;a.find("input").attr("id",i).val(""),a.find("label").attr("for",i),t.after(a)}},i.updateAmountsVisibility(),n.amountMethod.change(i.updateAmountsVisibility),e.on("keyup",'input[name="_pronamic_payment_form_amount_choices[]"]',(function(){i.maybeAddAmountChoice()}))};t.fn.pronamicPayFormOptions=function(){return this.each((function(){var a=t(this);if(!a.data("pronamic-pay-forms-options")){var i=new s(this);a.data("pronamic-pay-form-options",i)}}))},t(document).ready((function(){t("#pronamic-pay-gateway-config-editor").pronamicPayGatewayConfigEditor(),t("#pronamic_payment_form_options").pronamicPayFormOptions(),t("#pronamic-pay-post-status-select").pronamicPayPostStatus(),t("#pronamic_gateway_test").pronamicPayGatewayTest(),t(".pronamic-pay-tabs").pronamicPayTabs(),t(".pronamic-pay-tip").each((function(){tippy(this,{content:t(this).attr("title"),arrow:!0,theme:"pronamic-pay"})}))}))}(jQuery);
\ No newline at end of file

From 661103d68518aa3e2e209a563dfcada512de8290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Wed, 30 Mar 2022 16:39:33 +0200
Subject: [PATCH 50/87] Allow manually updating subscription next payment date
 (pronamic/wp-pronamic-pay#315).

---
 css/admin.css                                 |   7 +-
 css/admin.css.map                             |   2 +-
 js/dist/admin.js                              | 163 ++++++++++++++++--
 js/dist/admin.min.js                          |   2 +-
 js/src/admin.js                               | 163 ++++++++++++++++--
 scss/admin/_meta-box-update.scss              |   7 +-
 .../SubscriptionsDataStoreCPT.php             |  32 +++-
 views/meta-box-payment-update.php             |  10 +-
 views/meta-box-subscription-update.php        |  99 ++++++++++-
 9 files changed, 430 insertions(+), 55 deletions(-)

diff --git a/css/admin.css b/css/admin.css
index 0ffee749..aa782709 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -268,7 +268,6 @@ body.post-type-pronamic_payment #post-body-content, body.post-type-pronamic_pay_
 
 .pronamic-pay-inner {
   margin: 6px 0 0;
-  padding: 0 12px 12px;
 }
 
 .pronamic-pay-major-actions {
@@ -282,11 +281,13 @@ body.post-type-pronamic_payment #post-body-content, body.post-type-pronamic_pay_
   text-align: right;
 }
 
-#pronamic-pay-status-display {
+#pronamic-pay-post-status-display,
+#pronamic-pay-next-payment-date-display {
   font-weight: 600;
 }
 
-#pronamic-pay-post-status-select {
+#pronamic-pay-post-status-input,
+#pronamic-pay-next-payment-date-input {
   margin-top: 3px;
 }
 
diff --git a/css/admin.css.map b/css/admin.css.map
index 44869103..f423d02e 100644
--- a/css/admin.css.map
+++ b/css/admin.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../fonts/src/_variables.scss","../scss/admin/_buttons.scss","../scss/admin/_chart.scss","../scss/admin/_variables.scss","../scss/admin/_dashboard-widget-payments.scss","../scss/admin/_edit-form-post.scss","../scss/admin/_forms.scss","../scss/admin/_icons.scss","../scss/admin/_lists.scss","../scss/admin/_meta-box-gateway-config.scss","../scss/admin/_meta-box-gateway-test.scss","../scss/admin/_meta-box-payment-log.scss","../scss/admin/_meta-box-subscription-info.scss","../scss/admin/_meta-box-update.scss","../scss/admin/_settings.scss","../scss/admin/_tables.scss","../scss/admin/_tabs.scss","../scss/admin/_text.scss","../scss/admin/_tip.scss","../scss/admin/_utilities.scss"],"names":[],"mappings":"AAAA;ACGA;EACC;EAEA;;;ACFA;EACC;;;AAIF;EACC;EAEA;EAEA;;;AAGD;EACC,YCfO;EDiBP;EACA;EACA;EAEA;EAEA;EACA;;AAEA;EACC;EAEA;EAEA,OCvBK;EDyBL;EAEA;EACA;EAEA;EACA;;AAEA;EACC,oBCyDkC;;ADtDnC;EACC,oBCsD8B;;ADnD/B;EACC,oBCmDgC;;ADhDjC;EACC,oBCgDgC;;AD7CjC;EACC,oBC6C8B;;AD1C/B;EACC,oBC0C6B;;ADvC9B;EACC,oBCuCwB;EDrCxB;EAEA;;AAIF;EACC,OChDc;EDkDd;EAEA;EACA;EAEA;;;AEjFA;EACC;;;AAKH;EACC;EAEA;;AAEA;EACC;EAEA;EAEA,ODTK;ECWL;EAEA;EACA;EAEA;;AAEA;EACC,ODnBI;ECqBJ;EAEA;EAEA;EAEA;EAEA;;AAEA;EACC,ODTS;ECWT;EAEA;EACA;EAEA;;AAGD;EACC,ODlBe;;ACoBf;AAAA;EAEC,ODtBc;;AC2BjB;EACC;EAEA;;AAGD;EACC;;;AClED;EACC;;;ACLH;EACC;;;AAID;EACC;;;AAMA;EACC;EAEA;EAEA;EACA;EAEA;EAEA;EAEA;EACA;;;ACzBF;EACC;EAEA;EAEA;EACA;;AAEA;EACC,SPEsB;EOAtB;EAEA;EAEA;EACA;EACA;EAEA;EAEA;EAEA;EACA;;;AAKD;EACC,OJmD2B;EIlD3B,SPrBmB;;;AO0BpB;EACC,OJXS;EIYT,SPhCqB;;;AOqCtB;EACC,OJ0C8B;EIzC9B,SPlCsB;;;AOuCvB;EACC,OJsC6B;EIrC7B,SP7CqB;;;AOkDtB;EACC,OJjBc;EIkBd,SP/CoB;;;AOoDrB;EACC,OJ6B0B;EI5B1B,SP1DkB;;;AO+DnB;EACC,OJ/Bc;EIgCd,SPhEmB;;;AOqEpB;EACC,OJtCc;EIuCd,SP3Ec;;;AOgFf;EACC,OJG6B;EIF7B,SPlFc;;;AOuFf;EACC,OJpDc;EIqDd,SP1FkB;;;AQFlB;EACC;EACA;EACA;EACA;EACA;;AAMA;EACC;;AAKH;EACC;;AAIA;EACC,OL6D6B;;AKxD9B;EACC,OLpBI;;;AKyBP;EAGG;IACC;;EAEA;IACC;;EAIF;IACC;;;AC7CH;EACC;;AAGD;EACC;;AAEA;EACC;;;ACRD;EACC;;;ACDD;EACC;EACA;;AAIF;EACC;;;ACPA;EACC;;;ACDF;AAAA;EACC;EACA;;;AAIF;EACC;EACA;;;AAGD;EACC,YViD8C;EU/C9C;EAEA;;;AAGD;EACC;EAEA;;;AAGD;EACC;;;AAGD;EACC;;;AC/BA;EAEC;;;ACJF;EACC;;;AAKC;EACC;;AAKD;AAAA;EAEC,OZHI;;AYQL;EACC;;AAEA;EACC;;;AAQH;EACC;;;AAQC;EACC,YZegC;;;AYPnC;EACC,YZMkC;;;AYCjC;EACC;EACA;EACA;EACA;EACA;;;AAOJ;EACC;;AAIE;EACC;;;AASH;AAAA;AAAA;EAGC;;AAGD;AAAA;EAEC;;;AAIF;EAUK;IAGC;;EAEA;IACC;;EAOD;IAGC;;;ACzHP;EACC;EAEA;EAEA;EAEA;EAEA;;AAEA;EACC,YbsCwB;EapCxB;EACA;EAEA;EAEA;EAEA;EAEA;EACA;;AAEA;EACC,YbzBK;Ea2BL;EAEA;;;AAqBC;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAwBlB;EACC;EACA;EAEA;;AAGA;EAEC;;AAEA;EAEC;;;AAKH;EACC;;;AAGD;EACC;IACC;;;EAGD;IACC;;EAEA;IACC;;;AAKH;EAGG;AAAA;IAEC;;;AClGJ;EACC;;;AAGD;EACC,OdFK;;;AcKN;EACC,OdJQ;;;AePP;EACC,OfkBS;EehBT;;;AAOD;EACC;;;ACXH;EACC","file":"admin.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../fonts/src/_variables.scss","../scss/admin/_buttons.scss","../scss/admin/_chart.scss","../scss/admin/_variables.scss","../scss/admin/_dashboard-widget-payments.scss","../scss/admin/_edit-form-post.scss","../scss/admin/_forms.scss","../scss/admin/_icons.scss","../scss/admin/_lists.scss","../scss/admin/_meta-box-gateway-config.scss","../scss/admin/_meta-box-gateway-test.scss","../scss/admin/_meta-box-payment-log.scss","../scss/admin/_meta-box-subscription-info.scss","../scss/admin/_meta-box-update.scss","../scss/admin/_settings.scss","../scss/admin/_tables.scss","../scss/admin/_tabs.scss","../scss/admin/_text.scss","../scss/admin/_tip.scss","../scss/admin/_utilities.scss"],"names":[],"mappings":"AAAA;ACGA;EACC;EAEA;;;ACFA;EACC;;;AAIF;EACC;EAEA;EAEA;;;AAGD;EACC,YCfO;EDiBP;EACA;EACA;EAEA;EAEA;EACA;;AAEA;EACC;EAEA;EAEA,OCvBK;EDyBL;EAEA;EACA;EAEA;EACA;;AAEA;EACC,oBCyDkC;;ADtDnC;EACC,oBCsD8B;;ADnD/B;EACC,oBCmDgC;;ADhDjC;EACC,oBCgDgC;;AD7CjC;EACC,oBC6C8B;;AD1C/B;EACC,oBC0C6B;;ADvC9B;EACC,oBCuCwB;EDrCxB;EAEA;;AAIF;EACC,OChDc;EDkDd;EAEA;EACA;EAEA;;;AEjFA;EACC;;;AAKH;EACC;EAEA;;AAEA;EACC;EAEA;EAEA,ODTK;ECWL;EAEA;EACA;EAEA;;AAEA;EACC,ODnBI;ECqBJ;EAEA;EAEA;EAEA;EAEA;;AAEA;EACC,ODTS;ECWT;EAEA;EACA;EAEA;;AAGD;EACC,ODlBe;;ACoBf;AAAA;EAEC,ODtBc;;AC2BjB;EACC;EAEA;;AAGD;EACC;;;AClED;EACC;;;ACLH;EACC;;;AAID;EACC;;;AAMA;EACC;EAEA;EAEA;EACA;EAEA;EAEA;EAEA;EACA;;;ACzBF;EACC;EAEA;EAEA;EACA;;AAEA;EACC,SPEsB;EOAtB;EAEA;EAEA;EACA;EACA;EAEA;EAEA;EAEA;EACA;;;AAKD;EACC,OJmD2B;EIlD3B,SPrBmB;;;AO0BpB;EACC,OJXS;EIYT,SPhCqB;;;AOqCtB;EACC,OJ0C8B;EIzC9B,SPlCsB;;;AOuCvB;EACC,OJsC6B;EIrC7B,SP7CqB;;;AOkDtB;EACC,OJjBc;EIkBd,SP/CoB;;;AOoDrB;EACC,OJ6B0B;EI5B1B,SP1DkB;;;AO+DnB;EACC,OJ/Bc;EIgCd,SPhEmB;;;AOqEpB;EACC,OJtCc;EIuCd,SP3Ec;;;AOgFf;EACC,OJG6B;EIF7B,SPlFc;;;AOuFf;EACC,OJpDc;EIqDd,SP1FkB;;;AQFlB;EACC;EACA;EACA;EACA;EACA;;AAMA;EACC;;AAKH;EACC;;AAIA;EACC,OL6D6B;;AKxD9B;EACC,OLpBI;;;AKyBP;EAGG;IACC;;EAEA;IACC;;EAIF;IACC;;;AC7CH;EACC;;AAGD;EACC;;AAEA;EACC;;;ACRD;EACC;;;ACDD;EACC;EACA;;AAIF;EACC;;;ACPA;EACC;;;ACDF;AAAA;EACC;EACA;;;AAIF;EACC;;;AAGD;EACC,YVkD8C;EUhD9C;EAEA;;;AAGD;EACC;EAEA;;;AAGD;AAAA;EAEC;;;AAGD;AAAA;EAEC;;;AChCA;EAEC;;;ACJF;EACC;;;AAKC;EACC;;AAKD;AAAA;EAEC,OZHI;;AYQL;EACC;;AAEA;EACC;;;AAQH;EACC;;;AAQC;EACC,YZegC;;;AYPnC;EACC,YZMkC;;;AYCjC;EACC;EACA;EACA;EACA;EACA;;;AAOJ;EACC;;AAIE;EACC;;;AASH;AAAA;AAAA;EAGC;;AAGD;AAAA;EAEC;;;AAIF;EAUK;IAGC;;EAEA;IACC;;EAOD;IAGC;;;ACzHP;EACC;EAEA;EAEA;EAEA;EAEA;;AAEA;EACC,YbsCwB;EapCxB;EACA;EAEA;EAEA;EAEA;EAEA;EACA;;AAEA;EACC,YbzBK;Ea2BL;EAEA;;;AAqBC;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAgBd;EACC,kBAjBa;;;AAwBlB;EACC;EACA;EAEA;;AAGA;EAEC;;AAEA;EAEC;;;AAKH;EACC;;;AAGD;EACC;IACC;;;EAGD;IACC;;EAEA;IACC;;;AAKH;EAGG;AAAA;IAEC;;;AClGJ;EACC;;;AAGD;EACC,OdFK;;;AcKN;EACC,OdJQ;;;AePP;EACC,OfkBS;EehBT;;;AAOD;EACC;;;ACXH;EACC","file":"admin.css"}
\ No newline at end of file
diff --git a/js/dist/admin.js b/js/dist/admin.js
index cde037e6..63d3150c 100644
--- a/js/dist/admin.js
+++ b/js/dist/admin.js
@@ -236,38 +236,145 @@
 	/**
 	 * Pronamic Pay post status.
 	 */
-	var PronamicPayPostStatus = function( element ) {
+	var PronamicPayPostEdit = function( element, elementId ) {
+		var obj = this;
 		var $element = $( element );
+		var $input = $element.find( 'select, input:not([type="hidden"])' );
 
-		// Post Status edit click.
-		$element.siblings( 'a.edit-pronamic-pay-post-status' ).on( 'click', function( event ) {
-			if ( $element.is( ':hidden' ) ) {
-				$element.slideDown( 'fast', function() { $element.find( 'select' ).trigger( 'focus' ); } );
+		this.hideOptions = function() {
+			$element.slideUp( 'fast' ).siblings( 'a.edit-' + elementId ).show().trigger( 'focus' );
+		};
 
-				$( this ).hide();
+		this.updateDisplayText = function() {
+			var text = $( '#' + elementId + '-display' )[0].innerHTML;
+
+			var tagName = $input.prop( 'tagName' ).toLowerCase();
+
+			var type = 'input' === tagName ? $input.prop( 'type' ) : tagName;
+
+			switch ( type ) {
+				case 'date' :
+					/**
+					 * Language-sensitive date formatting.
+					 *
+					 * @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat
+					 */
+					var intlDate = new Intl.DateTimeFormat(
+						[],
+						{
+							'weekday': 'short',
+							'day': 'numeric',
+							'month': 'short',
+							'year': 'numeric'
+						}
+					);
+
+					var inputValue = $input.val();
+
+					if ( '' !== inputValue ) {
+						text = intlDate.format( new Date( inputValue ) );
+					}
+
+					break;
+				case 'select' :
+					text = $input.find( 'option:selected' ).text();
+
+					break;
 			}
 
-			event.preventDefault();
-		} );
+			$( '#' + elementId + '-display' ).text( text );
+		};
+
+		this.validateDateInput = function() {
+			var minDate = $input.attr( 'min' );
+
+			var inputDate = $input.val();
+
+			if (  undefined === minDate ) {
+				return;
+			}
+
+			minDate = new Date( minDate );
+
+			inputDate = new Date( inputDate );
+
+			var $error = $( '#' + elementId + '-error' );
+
+			var isValidInput = inputDate >= minDate;
 
-		// Save post status changes and hide options.
-		$element.find( '.save-pronamic-pay-post-status' ).on( 'click', function( event ) {
-			$element.slideUp( 'fast' ).siblings( 'a.edit-pronamic-pay-post-status' ).show().trigger( 'focus' );
+			if ( isValidInput ) {
+				$error.hide();
+			} else {
+				$error.show();
+			}
 
-			$( '#pronamic-pay-status-display' ).text( $( '#pronamic-pay-post-status option:selected' ).text() );
+			$element.find( '.save-' + elementId ).attr( 'disabled', ! isValidInput );
+		};
 
+		// Edit click.
+		$element.siblings( 'a.edit-' + elementId ).on( 'click', function( event ) {
 			event.preventDefault();
+
+			if ( ! $element.is( ':hidden' ) ) {
+				return;
+			}
+
+			var $error = $( '#' + elementId + '-error' );
+
+			if ( $error.length > 0 && ! $error.is( ':hidden' ) ) {
+				$element.find( '.save-' + elementId ).attr( 'disabled', true );
+
+				$error.hide();
+			}
+
+			var dataMin = $input.data( 'min' );
+
+			if ( undefined !== dataMin && dataMin !== '' ) {
+				$input.attr( 'min', dataMin );
+			}
+
+			$element.slideDown( 'fast', function() {
+				$input.trigger( 'focus' );
+			} );
+
+			$( this ).hide();
+
+			obj.validateDateInput();
 		} );
 
-		// Cancel post status editing and hide options.
-		$element.find( '.cancel-pronamic-pay-post-status' ).on( 'click', function( event ) {
-			$element.slideUp( 'fast' ).siblings( 'a.edit-pronamic-pay-post-status' ).show().trigger( 'focus' );
+		// Validate date input on changes.
+		$element.find( 'input[type="date"][data-min!=""][data-min]' ).on( 'change', obj.validateDateInput );
+
+		// Save changes and hide options.
+		$element.find( '.save-' + elementId ).on( 'click', function( event ) {
+			event.preventDefault();
+
+			if ( $( this ).is( '[disabled]' ) ) {
+				return;
+			}
 
-			$( '#pronamic-pay-post-status' ).val( $( '#hidden_pronamic_pay_post_status' ).val() );
+			obj.hideOptions();
 
-			$( '#pronamic-pay-status-display' ).text( $( '#pronamic-pay-post-status option:selected' ).text() );
+			obj.updateDisplayText();
+		} );
 
+		// Cancel editing and hide options.
+		$element.find( '.cancel-' + elementId ).on( 'click', function( event ) {
 			event.preventDefault();
+
+			obj.hideOptions();
+
+			var originalValue = $( '#hidden_' + elementId.replace( /-/g, '_' ) ).val();
+
+			$( '#' + elementId ).val( originalValue );
+
+			var dataMin = $input.data( 'min' );
+
+			if ( undefined !== dataMin && dataMin !== '' ) {
+				$input.removeAttr( 'min' );
+			}
+
+			obj.updateDisplayText();
 		} );
 	};
 
@@ -282,12 +389,29 @@
 				return;
 			}
 
-			var postStatus = new PronamicPayPostStatus( this );
+			var postStatus = new PronamicPayPostEdit( this, 'pronamic-pay-post-status' );
 
 			$this.data( 'pronamic-pay-post-status', postStatus );
 		} );
 	};
 
+	/**
+	 * jQuery plugin - Pronamic Pay next payment date
+	 */
+	$.fn.pronamicPayNextPaymentDate = function() {
+		return this.each( function() {
+			var $this = $( this );
+
+			if ( $this.data( 'pronamic-pay-next-payment-date' ) ) {
+				return;
+			}
+
+			var nextPaymentDate = new PronamicPayPostEdit( this, 'pronamic-pay-next-payment-date' );
+
+			$this.data( 'pronamic-pay-next-payment-date', nextPaymentDate );
+		} );
+	};
+
 	/**
 	 * Pronamic pay gateway test
 	 */
@@ -425,7 +549,8 @@
 	$( document ).ready( function() {
 		$( '#pronamic-pay-gateway-config-editor' ).pronamicPayGatewayConfigEditor();
 		$( '#pronamic_payment_form_options').pronamicPayFormOptions();
-		$( '#pronamic-pay-post-status-select' ).pronamicPayPostStatus();
+		$( '#pronamic-pay-post-status-input' ).pronamicPayPostStatus();
+		$( '#pronamic-pay-next-payment-date-input' ).pronamicPayNextPaymentDate();
 		$( '#pronamic_gateway_test').pronamicPayGatewayTest();
 		$( '.pronamic-pay-tabs' ).pronamicPayTabs();
 
diff --git a/js/dist/admin.min.js b/js/dist/admin.min.js
index 25a63869..659a3e72 100644
--- a/js/dist/admin.min.js
+++ b/js/dist/admin.min.js
@@ -1 +1 @@
-!function(t){var a=function(a){var i=this,e=t(a),n={};n.variantId=e.find("#pronamic_gateway_id"),n.extraSettings=e.find("div.extra-settings"),n.sectionHeaders=e.find(".gateway-config-section-header"),n.tabs=e.find(".pronamic-pay-tabs"),n.tabItems=e.find("ul.pronamic-pay-tabs-items"),this.updateFields=function(){i.selectedVariant=n.variantId.find("option:selected"),i.settings=i.selectedVariant.data("pronamic-pay-settings"),e.find(".extra-settings").hide(),i.settingElements=[],t.isArray(i.settings)&&t.each(i.settings,(function(t,a){e.find(".setting-"+a).show()})),e.find(".setting-"+i.selectedVariant.val()).show();var a=i.selectedVariant.text().split(" - ")[0].replace(/ \(.*\)/,"");n.tabItems.find(":visible").first().text(a).click(),t("#pronamic-pay-gateway-description").html(i.selectedVariant.attr("data-gateway-description"))},this.updateRowBackgroundColor=function(){var t=n.extraSettings.find(".form-table tr");t.removeClass("even"),t.filter(":visible:even").addClass("even")},this.initTabs=function(){t.each(n.sectionHeaders,(function(a,i){var e=t(i),s=e.find("h4").text(),o=e.parents("div")[0].className;n.tabItems.append(t("<li>"+s+"</li>").addClass(o).removeClass("pronamic-pay-tab"))})),n.tabItems.next().after(n.tabItems),n.tabItems.find("li").click(i.showTabSettings)},this.showTabSettings=function(){var a=t(this);n.extraSettings.hide().eq(a.index()).show()};var s=function(){t.ajax({url:pronamicPayGatewayAdmin.rest_url,method:"GET",beforeSend:function(t){t.setRequestHeader("X-WP-Nonce",pronamicPayGatewayAdmin.nonce)},data:{gateway_id:t("#pronamic_gateway_id").val(),gateway_mode:t("#pronamic_ideal_mode").val()}}).done((function(a){t("#pronamic-pay-gateway-settings").html(a.meta_boxes.settings),t("#pronamic-pay-gateway-settings .pronamic-pay-tabs").pronamicPayTabs(),t("#pronamic-pay-gateway-settings .pronamic-pay-tip").each((function(){tippy(this,{content:t(this).attr("title"),arrow:!0,theme:"pronamic-pay"})}))}))};t("#pronamic_gateway_id").change(s),t("#pronamic_ideal_mode").change(s),i.initTabs(),i.updateFields(),n.variantId.change(i.updateFields)};t.fn.pronamicPayGatewayConfigEditor=function(){return this.each((function(){var i=t(this);if(!i.data("pronamic-pay-gateway-config-editor")){var e=new a(this);i.data("pronamic-pay-gateway-config-editor",e)}}))};var i=function(a){var i=this,e=t(a),n={};n.tabItems=e.find("ul.pronamic-pay-tabs-items"),n.tabs=e.find(".pronamic-pay-tab"),n.tabItems=e.find("ul.pronamic-pay-tabs-items"),this.updateRowBackgroundColor=function(){var t=n.tabs.find(".form-table tr");t.removeClass("even"),t.filter(":visible:even").addClass("even")},this.showTab=function(){var a=t(this);n.tabItems.find("li").removeClass("active"),a.addClass("active"),n.tabs.hide().eq(a.index()).show(),i.updateRowBackgroundColor(),i.visibleTabItems=n.tabItems.find("li:visible"),i.activeTabItem=a},this.responsiveTabs=function(){if(t(window).width()>960)n.tabs.hide(),i.activeTabItem?i.activeTabItem.click():n.tabItems.find("li:visible").first().click();else{if(!i.visibleTabItems)return;n.tabs.hide(),t.each(i.visibleTabItems,(function(a,i){n.tabs.eq(t(i).index()).show()}))}},n.tabItems.find("li").click(i.showTab),n.tabItems.find("li:visible").first().click(),t(window).resize(i.responsiveTabs)};t.fn.pronamicPayTabs=function(){return this.each((function(){var a=t(this);if(!a.data("pronamic-pay-tabs")){var e=new i(this);a.data("pronamic-pay-tabs",e)}}))};var e=function(a){var i=t(a);i.siblings("a.edit-pronamic-pay-post-status").on("click",(function(a){i.is(":hidden")&&(i.slideDown("fast",(function(){i.find("select").trigger("focus")})),t(this).hide()),a.preventDefault()})),i.find(".save-pronamic-pay-post-status").on("click",(function(a){i.slideUp("fast").siblings("a.edit-pronamic-pay-post-status").show().trigger("focus"),t("#pronamic-pay-status-display").text(t("#pronamic-pay-post-status option:selected").text()),a.preventDefault()})),i.find(".cancel-pronamic-pay-post-status").on("click",(function(a){i.slideUp("fast").siblings("a.edit-pronamic-pay-post-status").show().trigger("focus"),t("#pronamic-pay-post-status").val(t("#hidden_pronamic_pay_post_status").val()),t("#pronamic-pay-status-display").text(t("#pronamic-pay-post-status option:selected").text()),a.preventDefault()}))};t.fn.pronamicPayPostStatus=function(){return this.each((function(){var a=t(this);if(!a.data("pronamic-pay-post-status")){var i=new e(this);a.data("pronamic-pay-post-status",i)}}))};var n=function(a){var i=t(a),e={};e.paymentMethods=i.find('select[name="pronamic_pay_test_payment_method"]'),this.updateInputVisibility=function(){var a=e.paymentMethods.val();""!==a&&i.find(".pronamic-pay-test-payment-method").hide().filter("."+a).show(),1===e.paymentMethods.find("option:selected").data("is-recurring")?t("#pronamic-pay-test-subscription").parents("tr").show():(t("#pronamic-pay-test-subscription").parents("tr").hide(),t("#pronamic-pay-test-subscription").prop("checked",!1).trigger("change"))},this.updateInputVisibility(),e.paymentMethods.change(this.updateInputVisibility),i.on("keydown","input, select",(function(t){13===t.keyCode&&(t.preventDefault(),i.find('input[name="test_pay_gateway"]').click())}))};t.fn.pronamicPayGatewayTest=function(){return this.each((function(){var a=t(this);if(!a.data("pronamic-pay-gateway-test")){var i=new n(this);a.data("pronamic-pay-gateway-test",i)}}))};var s=function(a){var i=this,e=t(a),n={};n.amountMethod=e.find('select[name="_pronamic_payment_form_amount_method"]'),this.updateAmountsVisibility=function(){var t=n.amountMethod.val();"choices_only"===t||"choices_and_input"===t?e.find('input[name="_pronamic_payment_form_amount_choices[]"]').closest("div").show():e.find('input[name="_pronamic_payment_form_amount_choices[]"]').closest("div").hide()},this.maybeAddAmountChoice=function(){if(n.amountChoices=e.find('input[name="_pronamic_payment_form_amount_choices[]"]'),0===n.amountChoices.filter((function(){return""===this.value})).length){var t=n.amountChoices.last().closest("div"),a=t.clone(),i="_pronamic_payment_form_amount_choice_"+n.amountChoices.length;a.find("input").attr("id",i).val(""),a.find("label").attr("for",i),t.after(a)}},i.updateAmountsVisibility(),n.amountMethod.change(i.updateAmountsVisibility),e.on("keyup",'input[name="_pronamic_payment_form_amount_choices[]"]',(function(){i.maybeAddAmountChoice()}))};t.fn.pronamicPayFormOptions=function(){return this.each((function(){var a=t(this);if(!a.data("pronamic-pay-forms-options")){var i=new s(this);a.data("pronamic-pay-form-options",i)}}))},t(document).ready((function(){t("#pronamic-pay-gateway-config-editor").pronamicPayGatewayConfigEditor(),t("#pronamic_payment_form_options").pronamicPayFormOptions(),t("#pronamic-pay-post-status-select").pronamicPayPostStatus(),t("#pronamic_gateway_test").pronamicPayGatewayTest(),t(".pronamic-pay-tabs").pronamicPayTabs(),t(".pronamic-pay-tip").each((function(){tippy(this,{content:t(this).attr("title"),arrow:!0,theme:"pronamic-pay"})}))}))}(jQuery);
\ No newline at end of file
+!function(t){var a=function(a){var i=this,e=t(a),n={};n.variantId=e.find("#pronamic_gateway_id"),n.extraSettings=e.find("div.extra-settings"),n.sectionHeaders=e.find(".gateway-config-section-header"),n.tabs=e.find(".pronamic-pay-tabs"),n.tabItems=e.find("ul.pronamic-pay-tabs-items"),this.updateFields=function(){i.selectedVariant=n.variantId.find("option:selected"),i.settings=i.selectedVariant.data("pronamic-pay-settings"),e.find(".extra-settings").hide(),i.settingElements=[],t.isArray(i.settings)&&t.each(i.settings,(function(t,a){e.find(".setting-"+a).show()})),e.find(".setting-"+i.selectedVariant.val()).show();var a=i.selectedVariant.text().split(" - ")[0].replace(/ \(.*\)/,"");n.tabItems.find(":visible").first().text(a).click(),t("#pronamic-pay-gateway-description").html(i.selectedVariant.attr("data-gateway-description"))},this.updateRowBackgroundColor=function(){var t=n.extraSettings.find(".form-table tr");t.removeClass("even"),t.filter(":visible:even").addClass("even")},this.initTabs=function(){t.each(n.sectionHeaders,(function(a,i){var e=t(i),s=e.find("h4").text(),o=e.parents("div")[0].className;n.tabItems.append(t("<li>"+s+"</li>").addClass(o).removeClass("pronamic-pay-tab"))})),n.tabItems.next().after(n.tabItems),n.tabItems.find("li").click(i.showTabSettings)},this.showTabSettings=function(){var a=t(this);n.extraSettings.hide().eq(a.index()).show()};var s=function(){t.ajax({url:pronamicPayGatewayAdmin.rest_url,method:"GET",beforeSend:function(t){t.setRequestHeader("X-WP-Nonce",pronamicPayGatewayAdmin.nonce)},data:{gateway_id:t("#pronamic_gateway_id").val(),gateway_mode:t("#pronamic_ideal_mode").val()}}).done((function(a){t("#pronamic-pay-gateway-settings").html(a.meta_boxes.settings),t("#pronamic-pay-gateway-settings .pronamic-pay-tabs").pronamicPayTabs(),t("#pronamic-pay-gateway-settings .pronamic-pay-tip").each((function(){tippy(this,{content:t(this).attr("title"),arrow:!0,theme:"pronamic-pay"})}))}))};t("#pronamic_gateway_id").change(s),t("#pronamic_ideal_mode").change(s),i.initTabs(),i.updateFields(),n.variantId.change(i.updateFields)};t.fn.pronamicPayGatewayConfigEditor=function(){return this.each((function(){var i=t(this);if(!i.data("pronamic-pay-gateway-config-editor")){var e=new a(this);i.data("pronamic-pay-gateway-config-editor",e)}}))};var i=function(a){var i=this,e=t(a),n={};n.tabItems=e.find("ul.pronamic-pay-tabs-items"),n.tabs=e.find(".pronamic-pay-tab"),n.tabItems=e.find("ul.pronamic-pay-tabs-items"),this.updateRowBackgroundColor=function(){var t=n.tabs.find(".form-table tr");t.removeClass("even"),t.filter(":visible:even").addClass("even")},this.showTab=function(){var a=t(this);n.tabItems.find("li").removeClass("active"),a.addClass("active"),n.tabs.hide().eq(a.index()).show(),i.updateRowBackgroundColor(),i.visibleTabItems=n.tabItems.find("li:visible"),i.activeTabItem=a},this.responsiveTabs=function(){if(t(window).width()>960)n.tabs.hide(),i.activeTabItem?i.activeTabItem.click():n.tabItems.find("li:visible").first().click();else{if(!i.visibleTabItems)return;n.tabs.hide(),t.each(i.visibleTabItems,(function(a,i){n.tabs.eq(t(i).index()).show()}))}},n.tabItems.find("li").click(i.showTab),n.tabItems.find("li:visible").first().click(),t(window).resize(i.responsiveTabs)};t.fn.pronamicPayTabs=function(){return this.each((function(){var a=t(this);if(!a.data("pronamic-pay-tabs")){var e=new i(this);a.data("pronamic-pay-tabs",e)}}))};var e=function(a,i){var e=this,n=t(a),s=n.find('select, input:not([type="hidden"])');this.hideOptions=function(){n.slideUp("fast").siblings("a.edit-"+i).show().trigger("focus")},this.updateDisplayText=function(){var a=t("#"+i+"-display")[0].innerHTML,e=s.prop("tagName").toLowerCase();switch("input"===e?s.prop("type"):e){case"date":var n=new Intl.DateTimeFormat([],{weekday:"short",day:"numeric",month:"short",year:"numeric"}),o=s.val();""!==o&&(a=n.format(new Date(o)));break;case"select":a=s.find("option:selected").text()}t("#"+i+"-display").text(a)},this.validateDateInput=function(){var a=s.attr("min"),e=s.val();if(void 0!==a){a=new Date(a),e=new Date(e);var o=t("#"+i+"-error"),r=e>=a;r?o.hide():o.show(),n.find(".save-"+i).attr("disabled",!r)}},n.siblings("a.edit-"+i).on("click",(function(a){if(a.preventDefault(),n.is(":hidden")){var o=t("#"+i+"-error");o.length>0&&!o.is(":hidden")&&(n.find(".save-"+i).attr("disabled",!0),o.hide());var r=s.data("min");void 0!==r&&""!==r&&s.attr("min",r),n.slideDown("fast",(function(){s.trigger("focus")})),t(this).hide(),e.validateDateInput()}})),n.find('input[type="date"][data-min!=""][data-min]').on("change",e.validateDateInput),n.find(".save-"+i).on("click",(function(a){a.preventDefault(),t(this).is("[disabled]")||(e.hideOptions(),e.updateDisplayText())})),n.find(".cancel-"+i).on("click",(function(a){a.preventDefault(),e.hideOptions();var n=t("#hidden_"+i.replace(/-/g,"_")).val();t("#"+i).val(n);var o=s.data("min");void 0!==o&&""!==o&&s.removeAttr("min"),e.updateDisplayText()}))};t.fn.pronamicPayPostStatus=function(){return this.each((function(){var a=t(this);if(!a.data("pronamic-pay-post-status")){var i=new e(this,"pronamic-pay-post-status");a.data("pronamic-pay-post-status",i)}}))},t.fn.pronamicPayNextPaymentDate=function(){return this.each((function(){var a=t(this);if(!a.data("pronamic-pay-next-payment-date")){var i=new e(this,"pronamic-pay-next-payment-date");a.data("pronamic-pay-next-payment-date",i)}}))};var n=function(a){var i=t(a),e={};e.paymentMethods=i.find('select[name="pronamic_pay_test_payment_method"]'),this.updateInputVisibility=function(){var a=e.paymentMethods.val();""!==a&&i.find(".pronamic-pay-test-payment-method").hide().filter("."+a).show(),1===e.paymentMethods.find("option:selected").data("is-recurring")?t("#pronamic-pay-test-subscription").parents("tr").show():(t("#pronamic-pay-test-subscription").parents("tr").hide(),t("#pronamic-pay-test-subscription").prop("checked",!1).trigger("change"))},this.updateInputVisibility(),e.paymentMethods.change(this.updateInputVisibility),i.on("keydown","input, select",(function(t){13===t.keyCode&&(t.preventDefault(),i.find('input[name="test_pay_gateway"]').click())}))};t.fn.pronamicPayGatewayTest=function(){return this.each((function(){var a=t(this);if(!a.data("pronamic-pay-gateway-test")){var i=new n(this);a.data("pronamic-pay-gateway-test",i)}}))};var s=function(a){var i=this,e=t(a),n={};n.amountMethod=e.find('select[name="_pronamic_payment_form_amount_method"]'),this.updateAmountsVisibility=function(){var t=n.amountMethod.val();"choices_only"===t||"choices_and_input"===t?e.find('input[name="_pronamic_payment_form_amount_choices[]"]').closest("div").show():e.find('input[name="_pronamic_payment_form_amount_choices[]"]').closest("div").hide()},this.maybeAddAmountChoice=function(){if(n.amountChoices=e.find('input[name="_pronamic_payment_form_amount_choices[]"]'),0===n.amountChoices.filter((function(){return""===this.value})).length){var t=n.amountChoices.last().closest("div"),a=t.clone(),i="_pronamic_payment_form_amount_choice_"+n.amountChoices.length;a.find("input").attr("id",i).val(""),a.find("label").attr("for",i),t.after(a)}},i.updateAmountsVisibility(),n.amountMethod.change(i.updateAmountsVisibility),e.on("keyup",'input[name="_pronamic_payment_form_amount_choices[]"]',(function(){i.maybeAddAmountChoice()}))};t.fn.pronamicPayFormOptions=function(){return this.each((function(){var a=t(this);if(!a.data("pronamic-pay-forms-options")){var i=new s(this);a.data("pronamic-pay-form-options",i)}}))},t(document).ready((function(){t("#pronamic-pay-gateway-config-editor").pronamicPayGatewayConfigEditor(),t("#pronamic_payment_form_options").pronamicPayFormOptions(),t("#pronamic-pay-post-status-input").pronamicPayPostStatus(),t("#pronamic-pay-next-payment-date-input").pronamicPayNextPaymentDate(),t("#pronamic_gateway_test").pronamicPayGatewayTest(),t(".pronamic-pay-tabs").pronamicPayTabs(),t(".pronamic-pay-tip").each((function(){tippy(this,{content:t(this).attr("title"),arrow:!0,theme:"pronamic-pay"})}))}))}(jQuery);
\ No newline at end of file
diff --git a/js/src/admin.js b/js/src/admin.js
index cde037e6..63d3150c 100644
--- a/js/src/admin.js
+++ b/js/src/admin.js
@@ -236,38 +236,145 @@
 	/**
 	 * Pronamic Pay post status.
 	 */
-	var PronamicPayPostStatus = function( element ) {
+	var PronamicPayPostEdit = function( element, elementId ) {
+		var obj = this;
 		var $element = $( element );
+		var $input = $element.find( 'select, input:not([type="hidden"])' );
 
-		// Post Status edit click.
-		$element.siblings( 'a.edit-pronamic-pay-post-status' ).on( 'click', function( event ) {
-			if ( $element.is( ':hidden' ) ) {
-				$element.slideDown( 'fast', function() { $element.find( 'select' ).trigger( 'focus' ); } );
+		this.hideOptions = function() {
+			$element.slideUp( 'fast' ).siblings( 'a.edit-' + elementId ).show().trigger( 'focus' );
+		};
 
-				$( this ).hide();
+		this.updateDisplayText = function() {
+			var text = $( '#' + elementId + '-display' )[0].innerHTML;
+
+			var tagName = $input.prop( 'tagName' ).toLowerCase();
+
+			var type = 'input' === tagName ? $input.prop( 'type' ) : tagName;
+
+			switch ( type ) {
+				case 'date' :
+					/**
+					 * Language-sensitive date formatting.
+					 *
+					 * @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat
+					 */
+					var intlDate = new Intl.DateTimeFormat(
+						[],
+						{
+							'weekday': 'short',
+							'day': 'numeric',
+							'month': 'short',
+							'year': 'numeric'
+						}
+					);
+
+					var inputValue = $input.val();
+
+					if ( '' !== inputValue ) {
+						text = intlDate.format( new Date( inputValue ) );
+					}
+
+					break;
+				case 'select' :
+					text = $input.find( 'option:selected' ).text();
+
+					break;
 			}
 
-			event.preventDefault();
-		} );
+			$( '#' + elementId + '-display' ).text( text );
+		};
+
+		this.validateDateInput = function() {
+			var minDate = $input.attr( 'min' );
+
+			var inputDate = $input.val();
+
+			if (  undefined === minDate ) {
+				return;
+			}
+
+			minDate = new Date( minDate );
+
+			inputDate = new Date( inputDate );
+
+			var $error = $( '#' + elementId + '-error' );
+
+			var isValidInput = inputDate >= minDate;
 
-		// Save post status changes and hide options.
-		$element.find( '.save-pronamic-pay-post-status' ).on( 'click', function( event ) {
-			$element.slideUp( 'fast' ).siblings( 'a.edit-pronamic-pay-post-status' ).show().trigger( 'focus' );
+			if ( isValidInput ) {
+				$error.hide();
+			} else {
+				$error.show();
+			}
 
-			$( '#pronamic-pay-status-display' ).text( $( '#pronamic-pay-post-status option:selected' ).text() );
+			$element.find( '.save-' + elementId ).attr( 'disabled', ! isValidInput );
+		};
 
+		// Edit click.
+		$element.siblings( 'a.edit-' + elementId ).on( 'click', function( event ) {
 			event.preventDefault();
+
+			if ( ! $element.is( ':hidden' ) ) {
+				return;
+			}
+
+			var $error = $( '#' + elementId + '-error' );
+
+			if ( $error.length > 0 && ! $error.is( ':hidden' ) ) {
+				$element.find( '.save-' + elementId ).attr( 'disabled', true );
+
+				$error.hide();
+			}
+
+			var dataMin = $input.data( 'min' );
+
+			if ( undefined !== dataMin && dataMin !== '' ) {
+				$input.attr( 'min', dataMin );
+			}
+
+			$element.slideDown( 'fast', function() {
+				$input.trigger( 'focus' );
+			} );
+
+			$( this ).hide();
+
+			obj.validateDateInput();
 		} );
 
-		// Cancel post status editing and hide options.
-		$element.find( '.cancel-pronamic-pay-post-status' ).on( 'click', function( event ) {
-			$element.slideUp( 'fast' ).siblings( 'a.edit-pronamic-pay-post-status' ).show().trigger( 'focus' );
+		// Validate date input on changes.
+		$element.find( 'input[type="date"][data-min!=""][data-min]' ).on( 'change', obj.validateDateInput );
+
+		// Save changes and hide options.
+		$element.find( '.save-' + elementId ).on( 'click', function( event ) {
+			event.preventDefault();
+
+			if ( $( this ).is( '[disabled]' ) ) {
+				return;
+			}
 
-			$( '#pronamic-pay-post-status' ).val( $( '#hidden_pronamic_pay_post_status' ).val() );
+			obj.hideOptions();
 
-			$( '#pronamic-pay-status-display' ).text( $( '#pronamic-pay-post-status option:selected' ).text() );
+			obj.updateDisplayText();
+		} );
 
+		// Cancel editing and hide options.
+		$element.find( '.cancel-' + elementId ).on( 'click', function( event ) {
 			event.preventDefault();
+
+			obj.hideOptions();
+
+			var originalValue = $( '#hidden_' + elementId.replace( /-/g, '_' ) ).val();
+
+			$( '#' + elementId ).val( originalValue );
+
+			var dataMin = $input.data( 'min' );
+
+			if ( undefined !== dataMin && dataMin !== '' ) {
+				$input.removeAttr( 'min' );
+			}
+
+			obj.updateDisplayText();
 		} );
 	};
 
@@ -282,12 +389,29 @@
 				return;
 			}
 
-			var postStatus = new PronamicPayPostStatus( this );
+			var postStatus = new PronamicPayPostEdit( this, 'pronamic-pay-post-status' );
 
 			$this.data( 'pronamic-pay-post-status', postStatus );
 		} );
 	};
 
+	/**
+	 * jQuery plugin - Pronamic Pay next payment date
+	 */
+	$.fn.pronamicPayNextPaymentDate = function() {
+		return this.each( function() {
+			var $this = $( this );
+
+			if ( $this.data( 'pronamic-pay-next-payment-date' ) ) {
+				return;
+			}
+
+			var nextPaymentDate = new PronamicPayPostEdit( this, 'pronamic-pay-next-payment-date' );
+
+			$this.data( 'pronamic-pay-next-payment-date', nextPaymentDate );
+		} );
+	};
+
 	/**
 	 * Pronamic pay gateway test
 	 */
@@ -425,7 +549,8 @@
 	$( document ).ready( function() {
 		$( '#pronamic-pay-gateway-config-editor' ).pronamicPayGatewayConfigEditor();
 		$( '#pronamic_payment_form_options').pronamicPayFormOptions();
-		$( '#pronamic-pay-post-status-select' ).pronamicPayPostStatus();
+		$( '#pronamic-pay-post-status-input' ).pronamicPayPostStatus();
+		$( '#pronamic-pay-next-payment-date-input' ).pronamicPayNextPaymentDate();
 		$( '#pronamic_gateway_test').pronamicPayGatewayTest();
 		$( '.pronamic-pay-tabs' ).pronamicPayTabs();
 
diff --git a/scss/admin/_meta-box-update.scss b/scss/admin/_meta-box-update.scss
index 0b0bd41d..0e121a66 100644
--- a/scss/admin/_meta-box-update.scss
+++ b/scss/admin/_meta-box-update.scss
@@ -9,7 +9,6 @@
 
 .pronamic-pay-inner {
 	margin: 6px 0 0;
-	padding: 0 12px 12px;
 }
 
 .pronamic-pay-major-actions {
@@ -26,10 +25,12 @@
 	text-align: right;
 }
 
-#pronamic-pay-status-display {
+#pronamic-pay-post-status-display,
+#pronamic-pay-next-payment-date-display {
 	font-weight: 600;
 }
 
-#pronamic-pay-post-status-select {
+#pronamic-pay-post-status-input,
+#pronamic-pay-next-payment-date-input {
 	margin-top: 3px;
 }
diff --git a/src/Subscriptions/SubscriptionsDataStoreCPT.php b/src/Subscriptions/SubscriptionsDataStoreCPT.php
index 3117334f..96e0f6ba 100644
--- a/src/Subscriptions/SubscriptionsDataStoreCPT.php
+++ b/src/Subscriptions/SubscriptionsDataStoreCPT.php
@@ -10,8 +10,8 @@
 
 namespace Pronamic\WordPress\Pay\Subscriptions;
 
-use DatePeriod;
 use Pronamic\WordPress\DateTime\DateTime;
+use Pronamic\WordPress\DateTime\DateTimeImmutable;
 use Pronamic\WordPress\DateTime\DateTimeZone;
 use Pronamic\WordPress\Money\Money;
 use Pronamic\WordPress\Pay\Payments\LegacyPaymentsDataStoreCPT;
@@ -222,6 +222,36 @@ private function update_subscription_form_post_array( $subscription, $postarr )
 		if ( ! check_admin_referer( 'pronamic_subscription_update', 'pronamic_subscription_update_nonce' ) ) {
 			return;
 		}
+
+		// Next payment date.
+		if ( \array_key_exists( 'hidden_pronamic_pay_next_payment_date', $postarr ) && \array_key_exists( 'pronamic_subscription_next_payment_date', $postarr ) ) {
+			$old_value = $postarr['hidden_pronamic_pay_next_payment_date'];
+
+			$new_value = $postarr['pronamic_subscription_next_payment_date'];
+
+			$current_phase = $subscription->get_current_phase();
+
+			if ( null !== $current_phase && ! empty( $new_value ) && $old_value !== $new_value ) {
+				$new_date = new DateTimeImmutable( $new_value );
+
+				$next_date = $current_phase->get_next_date();
+
+				$updated_date = null === $next_date ? clone $new_date : clone $next_date;
+
+				$updated_date = $updated_date->setDate( (int) $new_date->format( 'Y' ), (int) $new_date->format( 'm' ), (int) $new_date->format( 'd' ) );
+
+				$current_phase->set_next_date( $updated_date );
+
+				$note = \sprintf(
+					/* translators: %1: old formatted date, %2: new formatted date */
+					\__( 'Next payment date updated from %1$s to %2$s.', 'pronamic_ideal' ),
+					null === $next_date ? '' : $next_date->format_i18n( \__( 'D j M Y', 'pronamic_ideal' ) ),
+					$updated_date->format_i18n( \__( 'D j M Y', 'pronamic_ideal' ) )
+				);
+
+				$subscription->add_note( $note );
+			}
+		}
 	}
 
 	/**
diff --git a/views/meta-box-payment-update.php b/views/meta-box-payment-update.php
index 4b122133..d8b836d8 100644
--- a/views/meta-box-payment-update.php
+++ b/views/meta-box-payment-update.php
@@ -39,7 +39,7 @@
 	</div>
 
 	<div class="pronamic-pay-minor-actions">
-		<div class="misc-pub-post-status">
+		<div class="misc-pub-section misc-pub-post-status">
 			<?php echo esc_html( __( 'Status:', 'pronamic_ideal' ) ); ?>
 
 			<?php
@@ -102,7 +102,7 @@
 			);
 
 			printf(
-				'<p><a class="button" href="%s">%s</a></p>',
+				'<div class="misc-pub-section"><a class="button" href="%s">%s</a></div>',
 				esc_url( $action_url ),
 				esc_html__( 'Check status', 'pronamic_ideal' )
 			);
@@ -132,7 +132,7 @@
 			);
 
 			printf(
-				'<p><a class="button" href="%s">%s</a></p>',
+				'<div class="misc-pub-section"><a class="button" href="%s">%s</a></div>',
 				esc_url( $action_url ),
 				esc_html( $link_text )
 			);
@@ -162,7 +162,7 @@
 			);
 
 			printf(
-				'<p><a class="button" href="%s">%s</a></p>',
+				'<div class="misc-pub-section"><a class="button" href="%s">%s</a></div>',
 				esc_url( $action_url ),
 				esc_html( $link_text )
 			);
@@ -188,7 +188,7 @@
 			);
 
 			printf(
-				'<p><a class="button" href="%s">%s</a></p>',
+				'<div class="misc-pub-section"><a class="button" href="%s">%s</a></div>',
 				esc_url( $action_url ),
 				esc_html__( 'Send to Google Analytics', 'pronamic_ideal' )
 			);
diff --git a/views/meta-box-subscription-update.php b/views/meta-box-subscription-update.php
index 101a0d20..70e958f2 100644
--- a/views/meta-box-subscription-update.php
+++ b/views/meta-box-subscription-update.php
@@ -8,8 +8,10 @@
  * @package   Pronamic\WordPress\Pay
  */
 
+use Pronamic\WordPress\Pay\Plugin;
 use Pronamic\WordPress\Pay\Subscriptions\SubscriptionPostType;
 use Pronamic\WordPress\Pay\Subscriptions\SubscriptionStatus;
+use Pronamic\WordPress\Pay\Util;
 
 if ( ! isset( $post ) ) {
 	return;
@@ -24,6 +26,8 @@
 $post_author = get_post_field( 'post_author' );
 $post_author = empty( $post_author ) ? '-' : $post_author;
 
+$subscription = \get_pronamic_subscription( (int) get_the_ID() );
+
 ?>
 <input type="hidden" name="post_author_override" value="<?php echo esc_attr( $post_author ); ?>" />
 
@@ -33,7 +37,7 @@
 	</div>
 
 	<div class="pronamic-pay-minor-actions">
-		<div class="misc-pub-post-status">
+		<div class="misc-pub-section misc-pub-post-status">
 			<?php echo esc_html( __( 'Status:', 'pronamic_ideal' ) ); ?>
 
 			<?php
@@ -44,7 +48,7 @@
 
 			?>
 
-			<span id="pronamic-pay-status-display"><?php echo esc_html( $status_label ); ?></span>
+			<span id="pronamic-pay-post-status-display"><?php echo esc_html( $status_label ); ?></span>
 
 			<?php if ( 'subscr_completed' !== $post->post_status ) : ?>
 
@@ -53,7 +57,7 @@
 					<span class="screen-reader-text"><?php _e( 'Edit status', 'pronamic_ideal' ); ?></span>
 				</a>
 
-				<div id="pronamic-pay-post-status-select" class="hide-if-js">
+				<div id="pronamic-pay-post-status-input" class="hide-if-js">
 					<input type="hidden" name="hidden_pronamic_pay_post_status" id="hidden_pronamic_pay_post_status" value="<?php echo esc_attr( ( 'auto-draft' === $post->post_status ) ? 'draft' : $post->post_status ); ?>" />
 					<label for="pronamic-pay-post-status" class="screen-reader-text"><?php _e( 'Set status' ); ?></label>
 					<select id="pronamic-pay-post-status" name="pronamic_subscription_post_status">
@@ -85,8 +89,97 @@
 					<a href="#pronamic-pay-post-status" class="cancel-pronamic-pay-post-status hide-if-no-js button-cancel"><?php _e( 'Cancel' ); ?></a>
 				</div>
 
+				<?php
+
+				$tomorrow = new DateTimeImmutable( 'tomorrow midnight', new DateTimeZone( Plugin::TIMEZONE ) );
+
+				$class = 'hidden';
+
+				if ( null !== $subscription && in_array( $subscription->get_status(), array( SubscriptionStatus::FAILURE, SubscriptionStatus::ON_HOLD ), true ) ) {
+					$class = '';
+				}
+
+				?>
+
+				<div id="pronamic-pay-post-status-notice" class="notice inline <?php echo esc_attr( $class ); ?>">
+					<p>
+						<?php
+
+						echo \wp_kses_post(
+							\sprintf(
+								'%s <a href="#pronamic_subscription_notes">%s</a>',
+								\__( 'Recurring payments will not be created until manual reactivation of this subscription.', 'pronamic_ideal' ),
+								\__( 'See subscription and payment notes for details about status changes.', 'pronamic_ideal' )
+							)
+						);
+
+						?>
+					</p>
+				</div>
+
 			<?php endif; ?>
 		</div>
+
+		<div class="misc-pub-section curtime">
+			<?php
+
+			$next_payment_date = null === $subscription ? null : $subscription->get_next_payment_date();
+
+			?>
+
+			<span id="timestamp">
+				<?php echo esc_html( __( 'Next payment:', 'pronamic_ideal' ) ); ?>
+			</span>
+
+			<span id="pronamic-pay-next-payment-date-display"><?php echo esc_html( null === $next_payment_date ? '—' : $next_payment_date->format_i18n( \__( 'D j M Y', 'pronamic_ideal' ) ) ); ?></span>
+
+			<a href="#pronamic-pay-next-payment-date" class="edit-pronamic-pay-next-payment-date hide-if-no-js" role="button">
+				<span aria-hidden="true"><?php _e( 'Edit', 'pronamic_ideal' ); ?></span>
+				<span class="screen-reader-text"><?php _e( 'Edit next payment date', 'pronamic_ideal' ); ?></span>
+			</a>
+
+			<div id="pronamic-pay-next-payment-date-input" class="hide-if-js">
+				<input type="hidden" name="hidden_pronamic_pay_next_payment_date" id="hidden_pronamic_pay_next_payment_date" value="<?php echo \esc_attr( null === $next_payment_date ? '' : $next_payment_date->format( 'Y-m-d' ) ); ?>" />
+				<label for="pronamic-pay-next-payment-date" class="screen-reader-text"><?php _e( 'Set date' ); ?></label>
+
+				<?php
+
+				$atts = array(
+					'id'       => 'pronamic-pay-next-payment-date',
+					'name'     => 'pronamic_subscription_next_payment_date',
+					'type'     => 'date',
+					'value'    => null === $next_payment_date ? '' : $next_payment_date->format( 'Y-m-d' ),
+					'data-min' => ( new DateTimeImmutable( 'tomorrow' ) )->format( 'Y-m-d' ),
+				);
+
+				\printf(
+					'<input %s>',
+					/* phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped */
+					Util::array_to_html_attributes( $atts )
+				);
+
+				?>
+
+				<a href="#pronamic-pay-next-payment-date" class="save-pronamic-pay-next-payment-date hide-if-no-js button"><?php _e( 'OK' ); ?></a>
+				<a href="#pronamic-pay-next-payment-date" class="cancel-pronamic-pay-next-payment-date hide-if-no-js button-cancel"><?php _e( 'Cancel' ); ?></a>
+			</div>
+
+			<?php
+
+			$tomorrow = new DateTimeImmutable( 'tomorrow midnight', new DateTimeZone( Plugin::TIMEZONE ) );
+
+			$class = 'hidden';
+
+			if ( null !== $subscription && SubscriptionStatus::ACTIVE === $subscription->get_status() ) {
+				$class = null !== $next_payment_date && $next_payment_date >= $tomorrow ? 'hidden' : '';
+			}
+
+			?>
+
+			<div id="pronamic-pay-next-payment-date-error" class="error inline <?php echo esc_attr( $class ); ?>">
+				<p><?php echo esc_html( __( 'Next payment date in the past. Please update the date to continue payments for this subscription.', 'pronamic_ideal' ) ); ?></p>
+			</div>
+		</div>
 	</div>
 </div>
 

From 59deeac4f639cf0efd07c5e1a0b7ff884d6af0a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Thu, 31 Mar 2022 16:26:59 +0200
Subject: [PATCH 51/87] Disable manually changing next payment date for
 subscriptions with WooCommerce (pronamic/wp-pronamic-pay#315).

---
 views/meta-box-subscription-update.php | 93 ++++++++++++++------------
 1 file changed, 51 insertions(+), 42 deletions(-)

diff --git a/views/meta-box-subscription-update.php b/views/meta-box-subscription-update.php
index 70e958f2..9d0219c9 100644
--- a/views/meta-box-subscription-update.php
+++ b/views/meta-box-subscription-update.php
@@ -120,66 +120,75 @@
 			<?php endif; ?>
 		</div>
 
-		<div class="misc-pub-section curtime">
-			<?php
+		<?php if ( null !== $subscription ) : ?>
 
-			$next_payment_date = null === $subscription ? null : $subscription->get_next_payment_date();
+			<div class="misc-pub-section curtime">
+				<?php
 
-			?>
+				$next_payment_date = $subscription->get_next_payment_date();
 
-			<span id="timestamp">
-				<?php echo esc_html( __( 'Next payment:', 'pronamic_ideal' ) ); ?>
-			</span>
+				?>
 
-			<span id="pronamic-pay-next-payment-date-display"><?php echo esc_html( null === $next_payment_date ? '—' : $next_payment_date->format_i18n( \__( 'D j M Y', 'pronamic_ideal' ) ) ); ?></span>
+				<span id="timestamp">
+					<?php echo esc_html( __( 'Next payment:', 'pronamic_ideal' ) ); ?>
+				</span>
 
-			<a href="#pronamic-pay-next-payment-date" class="edit-pronamic-pay-next-payment-date hide-if-no-js" role="button">
-				<span aria-hidden="true"><?php _e( 'Edit', 'pronamic_ideal' ); ?></span>
-				<span class="screen-reader-text"><?php _e( 'Edit next payment date', 'pronamic_ideal' ); ?></span>
-			</a>
+				<span id="pronamic-pay-next-payment-date-display"><?php echo esc_html( null === $next_payment_date ? '—' : $next_payment_date->format_i18n( \__( 'D j M Y', 'pronamic_ideal' ) ) ); ?></span>
 
-			<div id="pronamic-pay-next-payment-date-input" class="hide-if-js">
-				<input type="hidden" name="hidden_pronamic_pay_next_payment_date" id="hidden_pronamic_pay_next_payment_date" value="<?php echo \esc_attr( null === $next_payment_date ? '' : $next_payment_date->format( 'Y-m-d' ) ); ?>" />
-				<label for="pronamic-pay-next-payment-date" class="screen-reader-text"><?php _e( 'Set date' ); ?></label>
+				<?php if ( 'woocommerce' !== $subscription->get_source() ) : ?>
 
-				<?php
+					<a href="#pronamic-pay-next-payment-date" class="edit-pronamic-pay-next-payment-date hide-if-no-js" role="button">
+						<span aria-hidden="true"><?php _e( 'Edit', 'pronamic_ideal' ); ?></span>
+						<span class="screen-reader-text"><?php _e( 'Edit next payment date', 'pronamic_ideal' ); ?></span>
+					</a>
 
-				$atts = array(
-					'id'       => 'pronamic-pay-next-payment-date',
-					'name'     => 'pronamic_subscription_next_payment_date',
-					'type'     => 'date',
-					'value'    => null === $next_payment_date ? '' : $next_payment_date->format( 'Y-m-d' ),
-					'data-min' => ( new DateTimeImmutable( 'tomorrow' ) )->format( 'Y-m-d' ),
-				);
+				<?php endif; ?>
 
-				\printf(
-					'<input %s>',
-					/* phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped */
-					Util::array_to_html_attributes( $atts )
-				);
+				<div id="pronamic-pay-next-payment-date-input" class="hide-if-js">
+					<input type="hidden" name="hidden_pronamic_pay_next_payment_date" id="hidden_pronamic_pay_next_payment_date" value="<?php echo \esc_attr( null === $next_payment_date ? '' : $next_payment_date->format( 'Y-m-d' ) ); ?>" />
+					<label for="pronamic-pay-next-payment-date" class="screen-reader-text"><?php _e( 'Set date' ); ?></label>
 
-				?>
+					<?php
 
-				<a href="#pronamic-pay-next-payment-date" class="save-pronamic-pay-next-payment-date hide-if-no-js button"><?php _e( 'OK' ); ?></a>
-				<a href="#pronamic-pay-next-payment-date" class="cancel-pronamic-pay-next-payment-date hide-if-no-js button-cancel"><?php _e( 'Cancel' ); ?></a>
-			</div>
+					$atts = array(
+						'id'       => 'pronamic-pay-next-payment-date',
+						'name'     => 'pronamic_subscription_next_payment_date',
+						'type'     => 'date',
+						'value'    => null === $next_payment_date ? '' : $next_payment_date->format( 'Y-m-d' ),
+						'data-min' => ( new DateTimeImmutable( 'tomorrow' ) )->format( 'Y-m-d' ),
+					);
 
-			<?php
+					\printf(
+						'<input %s>',
+						/* phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped */
+						Util::array_to_html_attributes( $atts )
+					);
 
-			$tomorrow = new DateTimeImmutable( 'tomorrow midnight', new DateTimeZone( Plugin::TIMEZONE ) );
+					?>
 
-			$class = 'hidden';
+					<a href="#pronamic-pay-next-payment-date" class="save-pronamic-pay-next-payment-date hide-if-no-js button"><?php _e( 'OK' ); ?></a>
+					<a href="#pronamic-pay-next-payment-date" class="cancel-pronamic-pay-next-payment-date hide-if-no-js button-cancel"><?php _e( 'Cancel' ); ?></a>
+				</div>
 
-			if ( null !== $subscription && SubscriptionStatus::ACTIVE === $subscription->get_status() ) {
-				$class = null !== $next_payment_date && $next_payment_date >= $tomorrow ? 'hidden' : '';
-			}
+				<?php
 
-			?>
+				$tomorrow = new DateTimeImmutable( 'tomorrow midnight', new DateTimeZone( Plugin::TIMEZONE ) );
+
+				$class = 'hidden';
 
-			<div id="pronamic-pay-next-payment-date-error" class="error inline <?php echo esc_attr( $class ); ?>">
-				<p><?php echo esc_html( __( 'Next payment date in the past. Please update the date to continue payments for this subscription.', 'pronamic_ideal' ) ); ?></p>
+				if ( null !== $subscription && SubscriptionStatus::ACTIVE === $subscription->get_status() ) {
+					$class = null !== $next_payment_date && $next_payment_date >= $tomorrow ? 'hidden' : '';
+				}
+
+				?>
+
+				<div id="pronamic-pay-next-payment-date-error" class="error inline <?php echo esc_attr( $class ); ?>">
+					<p><?php echo esc_html( __( 'Next payment date in the past. Please update the date to continue payments for this subscription.', 'pronamic_ideal' ) ); ?></p>
+				</div>
 			</div>
-		</div>
+
+		<?php endif; ?>
+
 	</div>
 </div>
 

From 2c9a6bf800da9c14fd353663ef5d853916bcdf91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Thu, 31 Mar 2022 16:41:38 +0200
Subject: [PATCH 52/87] Fix possible fatal error on retrieval of issuers.

---
 src/Core/Gateway.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Core/Gateway.php b/src/Core/Gateway.php
index 2d7fc871..c3941fe6 100644
--- a/src/Core/Gateway.php
+++ b/src/Core/Gateway.php
@@ -184,7 +184,11 @@ public function get_transient_issuers() {
 		$result = get_transient( $transient );
 
 		if ( is_wp_error( $result ) || false === $result ) {
-			$issuers = $this->get_issuers();
+			try {
+				$issuers = $this->get_issuers();
+			} catch ( \Exception $e ) {
+				$issuers = null;
+			}
 
 			if ( ! empty( $issuers ) ) {
 				// 60 * 60 * 24 = 24 hours = 1 day

From a54901d73d6f7d4f312905ed7c95a7e941f72872 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Fri, 1 Apr 2022 11:44:17 +0200
Subject: [PATCH 53/87] Update minified admin style.

---
 css/admin.css     | 18 ++++++++++++------
 css/admin.min.css |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/css/admin.css b/css/admin.css
index aa782709..dbe529c7 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -25,13 +25,18 @@
 }
 .pronamic-pay-chart-legend li {
   border-right: 5px solid #aaa;
-  box-shadow: inset 0 -1px 0 0 #e5e5e5;
+  -webkit-box-shadow: inset 0 -1px 0 0 #e5e5e5;
+          box-shadow: inset 0 -1px 0 0 #e5e5e5;
   color: #aaa;
   display: block;
   margin: 0;
   padding: 1em;
-  transition-duration: 0.5s;
+  -webkit-transition-duration: 0.5s;
+          transition-duration: 0.5s;
+  -webkit-transition-property: border, padding, -webkit-box-shadow;
+  transition-property: border, padding, -webkit-box-shadow;
   transition-property: border, box-shadow, padding;
+  transition-property: border, box-shadow, padding, -webkit-box-shadow;
 }
 .pronamic-pay-chart-legend li.completed-count {
   border-right-color: #dbe1e3;
@@ -53,7 +58,8 @@
 }
 .pronamic-pay-chart-legend li:hover {
   border-right-color: #23282f;
-  box-shadow: inset 0 -1px 0 0 #e5e5e5, inset 300px 0 0 #f9f9f9;
+  -webkit-box-shadow: inset 0 -1px 0 0 #e5e5e5, inset 300px 0 0 #f9f9f9;
+          box-shadow: inset 0 -1px 0 0 #e5e5e5, inset 300px 0 0 #f9f9f9;
   padding-left: 1.5em;
 }
 .pronamic-pay-chart-legend strong {
@@ -74,7 +80,8 @@
 }
 .pronamic-pay-status-list li {
   border-top: 1px solid #eee;
-  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
   color: #aaa;
   float: left;
   margin: 0;
@@ -87,6 +94,7 @@
   font-size: 12px;
   padding: 9px 12px;
   position: relative;
+  -webkit-transition: color ease 0.5s;
   transition: color ease 0.5s;
 }
 .pronamic-pay-status-list li a strong {
@@ -478,5 +486,3 @@ body.post-type-pronamic_payment #post-body-content, body.post-type-pronamic_pay_
 .pronamic-pay-cloack {
   display: none;
 }
-
-/*# sourceMappingURL=admin.css.map */
diff --git a/css/admin.min.css b/css/admin.min.css
index d5379549..a157f8ac 100644
--- a/css/admin.min.css
+++ b/css/admin.min.css
@@ -1 +1 @@
-.pronamic-pay-btn-link{line-height:26px;padding:0 10px 1px}.postbox .pronamic-pay-chart-with-sidebar{padding:12px 12px 12px 249px}.pronamic-pay-chart-sidebar{float:left;margin-left:-237px;width:225px}.pronamic-pay-chart-legend{background:#fff;border-color:#e5e5e5;border-style:solid;border-width:1px 0 0 1px;list-style:none;margin:0 0 1em;padding:0}.pronamic-pay-chart-legend li{border-right:5px solid #aaa;-webkit-box-shadow:inset 0 -1px 0 0 #e5e5e5;box-shadow:inset 0 -1px 0 0 #e5e5e5;color:#aaa;display:block;margin:0;padding:1em;-webkit-transition-duration:.5s;transition-duration:.5s;-webkit-transition-property:border,padding,-webkit-box-shadow;transition-property:border,padding,-webkit-box-shadow;transition-property:border,box-shadow,padding;transition-property:border,box-shadow,padding,-webkit-box-shadow}.pronamic-pay-chart-legend li.completed-count{border-right-color:#dbe1e3}.pronamic-pay-chart-legend li.pending-sum{border-right-color:#b1d4ea}.pronamic-pay-chart-legend li.completed-sum{border-right-color:#3498db}.pronamic-pay-chart-legend li.cancelled-sum{border-right-color:#f1c40f}.pronamic-pay-chart-legend li.expired-sum{border-right-color:#dbe1e3}.pronamic-pay-chart-legend li.failed-sum{border-right-color:#e74c3c}.pronamic-pay-chart-legend li:hover{border-right-color:#23282f;-webkit-box-shadow:inset 0 -1px 0 0 #e5e5e5,inset 300px 0 0 #f9f9f9;box-shadow:inset 0 -1px 0 0 #e5e5e5,inset 300px 0 0 #f9f9f9;padding-left:1.5em}.pronamic-pay-chart-legend strong{color:#444;display:block;font-size:1.618em;font-weight:400;line-height:1.2em}.postbox .inside .pronamic-pay-status-widget{margin:-12px}.pronamic-pay-status-list{margin-bottom:0;overflow:hidden}.pronamic-pay-status-list li{border-top:1px solid #eee;-webkit-box-sizing:border-box;box-sizing:border-box;color:#aaa;float:left;margin:0;padding:0;width:50%}.pronamic-pay-status-list li a{color:#aaa;display:block;font-size:12px;padding:9px 12px;position:relative;-webkit-transition:color .5s ease;transition:color .5s ease}.pronamic-pay-status-list li a strong{color:#0073aa;display:block;font-size:18px;font-weight:400;line-height:1.2em}.pronamic-pay-status-list li a:hover,.pronamic-pay-status-list li a:hover:before,.pronamic-pay-status-list li a:hover strong{color:#00a0d2}.pronamic-pay-status-list li:first-child{border-top:0;width:100%}.pronamic-pay-status-list li:nth-child(2n){border-right:1px solid #eee}body.post-type-pronamic_pay_subscr #post-body-content,body.post-type-pronamic_payment #post-body-content{margin-bottom:0}.pronamic-pay-form-control-lg,.pronamic-pay-shortcode-input{width:100%}.pronamic-pay-form-control-file-button [type=file]{border:0;clip:rect(0,0,0,0);margin:-1px;padding:0;overflow:hidden;position:absolute;width:1px;height:1px}.pronamic-pay-icon{position:relative;text-indent:-9999px;width:1em;height:1em}.pronamic-pay-icon:after{content:"\f10b";display:block;font-family:Pronamic Pay Icons;position:absolute;top:0;left:0;speak:none;text-indent:0;width:100%;height:100%}.pronamic-pay-icon-pending:after{color:#ffba00;content:"\f10a"}.pronamic-pay-icon-cancelled:after{color:#a00;content:"\f106"}.pronamic-pay-icon-processing:after{color:#73a724;content:"\f10b"}.pronamic-pay-icon-completed:after{color:#2ea2cc;content:"\f107"}.pronamic-pay-icon-refunded:after{color:#999;content:"\f10c"}.pronamic-pay-icon-failed:after{color:#d0c21f;content:"\f108"}.pronamic-pay-icon-on-hold:after{color:#999;content:"\f109"}.pronamic-pay-icon-recurring:after{color:#999;content:"\f105"}.pronamic-pay-icon-recurring-first:after{color:#2ea2cc;content:"\f105"}.pronamic-pay-icon-question-mark:after{color:#999;content:"\f104"}.pronamic-pay-payment-methods.form-table.widefat{border-right:0;border-bottom:0;border-left:0;margin:-15px -10px;width:calc(100% + 20px)}.pronamic-pay-payment-methods thead th:first-of-type{width:60%}.pronamic-pay-payment-methods .pronamic-pay-icon{line-height:inherit}.pronamic-pay-payment-methods .pronamic-pay-icon-completed:after{color:#73a724}.pronamic-pay-payment-methods .pronamic-pay-icon-cancelled:after{color:#aaa}@media screen and (max-width:782px){.pronamic-pay-payment-methods.form-table th{display:table-cell}.pronamic-pay-payment-methods.form-table th:first-of-type{width:50%}.pronamic-pay-payment-methods.form-table td{display:table-cell}}.gateway-config-section-header h4{margin:0}.gateway-config-section-header p{margin:0 0 1em}.gateway-config-section-header p:last-child{margin-bottom:0}.pronamic-pay-test-payment-method td label{display:none}#pronamic_payment_log.postbox .inside{margin:0;padding:0}#pronamic_payment_log .comments-box{border:0}#pronamic_subscription.postbox input[name=pronamic_subscription_amount]{vertical-align:initial}#pronamic_payment_update .inside,#pronamic_subscription_update .inside{margin:0;padding:0}.pronamic-pay-inner{margin:6px 0 0;padding:0 12px 12px}.pronamic-pay-major-actions{background:#f5f5f5;border-top:1px solid #ddd;padding:10px}.pronamic-pay-action{float:right;text-align:right}.pronamic-pay-settings select{width:25em}.pronamic-pay-table-responsive{overflow-x:auto}.pronamic-pay-table thead th{font-weight:700}.pronamic-pay-table .deprecated a,.pronamic-pay-table .deprecated td{color:#aaa}.pronamic-pay-table td p{margin:0 0 1em}.pronamic-pay-table td p:last-child{margin-bottom:0}.postbox .pronamic-pay-table{border:0}.form-table .even,.pronamic-pay-table-striped tbody tr:nth-of-type(odd){background:#f9f9f9}#pronamic_payment .form-table td a{display:inline-block;overflow:hidden;width:350px;text-overflow:ellipsis;white-space:nowrap}.pronamic-pay-status-table{margin-top:2em}.pronamic-pay-status-table tbody th:first-child{width:20%}.widefat .column-pronamic_payment_status,.widefat .column-pronamic_payment_subscription,.widefat .column-pronamic_subscription_status{width:1em}.widefat .column-pronamic_payment_method,.widefat .column-pronamic_subscription_method{width:2.5em}@media only screen and (max-width:782px){.wp-list-table tr.type-pronamic_pay_subscr:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_payment_status,.wp-list-table tr.type-pronamic_pay_subscr:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_payment_subscription,.wp-list-table tr.type-pronamic_pay_subscr:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_subscription_status,.wp-list-table tr.type-pronamic_payment:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_payment_status,.wp-list-table tr.type-pronamic_payment:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_payment_subscription,.wp-list-table tr.type-pronamic_payment:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_subscription_status{display:table-cell}.wp-list-table tr.type-pronamic_pay_subscr:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_payment_status:before,.wp-list-table tr.type-pronamic_pay_subscr:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_payment_subscription:before,.wp-list-table tr.type-pronamic_pay_subscr:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_subscription_status:before,.wp-list-table tr.type-pronamic_payment:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_payment_status:before,.wp-list-table tr.type-pronamic_payment:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_payment_subscription:before,.wp-list-table tr.type-pronamic_payment:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_subscription_status:before{display:none}.wp-list-table tr.type-pronamic_pay_subscr:not(.inline-edit-row):not(.no-items).is-expanded td:not(.hidden).column-pronamic_payment_status,.wp-list-table tr.type-pronamic_pay_subscr:not(.inline-edit-row):not(.no-items).is-expanded td:not(.hidden).column-pronamic_payment_subscription,.wp-list-table tr.type-pronamic_pay_subscr:not(.inline-edit-row):not(.no-items).is-expanded td:not(.hidden).column-pronamic_subscription_status,.wp-list-table tr.type-pronamic_payment:not(.inline-edit-row):not(.no-items).is-expanded td:not(.hidden).column-pronamic_payment_status,.wp-list-table tr.type-pronamic_payment:not(.inline-edit-row):not(.no-items).is-expanded td:not(.hidden).column-pronamic_payment_subscription,.wp-list-table tr.type-pronamic_payment:not(.inline-edit-row):not(.no-items).is-expanded td:not(.hidden).column-pronamic_subscription_status{display:table-cell!important}}.pronamic-pay-tabs-items{border-bottom:1px solid #e5e5e5;display:block;float:left;margin:3px 0 0;width:100%}.pronamic-pay-tabs-items li{background:#e5e5e5;border-right:1px solid #e5e5e5;border-left:1px solid #e5e5e5;cursor:pointer;display:block;float:left;margin:0 5px -1px 0;padding:8px 15px}.pronamic-pay-tabs-items li.active{background:#fff;border-top:3px solid #008ec2;margin-top:-3px}.admin-color-fresh .pronamic-pay-tabs-items li.active{border-top-color:#2271b1}.admin-color-light .pronamic-pay-tabs-items li.active{border-top-color:#888}.admin-color-modern .pronamic-pay-tabs-items li.active{border-top-color:#3858e9}.admin-color-blue .pronamic-pay-tabs-items li.active{border-top-color:#096484}.admin-color-coffee .pronamic-pay-tabs-items li.active{border-top-color:#c7a589}.admin-color-ectoplasm .pronamic-pay-tabs-items li.active{border-top-color:#a3b745}.admin-color-midnight .pronamic-pay-tabs-items li.active{border-top-color:#e14d43}.admin-color-ocean .pronamic-pay-tabs-items li.active{border-top-color:#9ebaa0}.admin-color-sunrise .pronamic-pay-tabs-items li.active{border-top-color:#dd823b}.pronamic-pay-tab{border:1px solid #e5e5e5;border-top:0;clear:both}.pronamic-pay-tab .form-table{margin-top:0}.pronamic-pay-tab .form-table th{padding-left:10px}.pronamic-pay-tab-block{padding:15px 10px}@media only screen and (max-width:960px){.pronamic-pay-tabs-items{display:none}.pronamic-pay-tab,.pronamic-pay-tab .form-table{border:0}}@media only screen and (max-width:782px){.pronamic-pay-tab .form-table td,.pronamic-pay-tab .form-table th{padding:11px}}.pronamic-pay-text-success{color:green}.pronamic-pay-text-danger{color:red}.pronamic-pay-text-warning{color:orange}:not(a).pronamic-pay-tip{color:#777;cursor:help}.form-table th .pronamic-pay-tip{float:right}.pronamic-pay-cloack{display:none}
+.pronamic-pay-btn-link{line-height:26px;padding:0 10px 1px}.postbox .pronamic-pay-chart-with-sidebar{padding:12px 12px 12px 249px}.pronamic-pay-chart-sidebar{float:left;margin-left:-237px;width:225px}.pronamic-pay-chart-legend{background:#fff;border-color:#e5e5e5;border-style:solid;border-width:1px 0 0 1px;list-style:none;margin:0 0 1em;padding:0}.pronamic-pay-chart-legend li{border-right:5px solid #aaa;-webkit-box-shadow:inset 0 -1px 0 0 #e5e5e5;box-shadow:inset 0 -1px 0 0 #e5e5e5;color:#aaa;display:block;margin:0;padding:1em;-webkit-transition-duration:.5s;transition-duration:.5s;-webkit-transition-property:border,padding,-webkit-box-shadow;transition-property:border,padding,-webkit-box-shadow;transition-property:border,box-shadow,padding;transition-property:border,box-shadow,padding,-webkit-box-shadow}.pronamic-pay-chart-legend li.completed-count{border-right-color:#dbe1e3}.pronamic-pay-chart-legend li.pending-sum{border-right-color:#b1d4ea}.pronamic-pay-chart-legend li.completed-sum{border-right-color:#3498db}.pronamic-pay-chart-legend li.cancelled-sum{border-right-color:#f1c40f}.pronamic-pay-chart-legend li.expired-sum{border-right-color:#dbe1e3}.pronamic-pay-chart-legend li.failed-sum{border-right-color:#e74c3c}.pronamic-pay-chart-legend li:hover{border-right-color:#23282f;-webkit-box-shadow:inset 0 -1px 0 0 #e5e5e5,inset 300px 0 0 #f9f9f9;box-shadow:inset 0 -1px 0 0 #e5e5e5,inset 300px 0 0 #f9f9f9;padding-left:1.5em}.pronamic-pay-chart-legend strong{color:#444;display:block;font-size:1.618em;font-weight:400;line-height:1.2em}.postbox .inside .pronamic-pay-status-widget{margin:-12px}.pronamic-pay-status-list{margin-bottom:0;overflow:hidden}.pronamic-pay-status-list li{border-top:1px solid #eee;-webkit-box-sizing:border-box;box-sizing:border-box;color:#aaa;float:left;margin:0;padding:0;width:50%}.pronamic-pay-status-list li a{color:#aaa;display:block;font-size:12px;padding:9px 12px;position:relative;-webkit-transition:color .5s ease;transition:color .5s ease}.pronamic-pay-status-list li a strong{color:#0073aa;display:block;font-size:18px;font-weight:400;line-height:1.2em}.pronamic-pay-status-list li a:hover,.pronamic-pay-status-list li a:hover:before,.pronamic-pay-status-list li a:hover strong{color:#00a0d2}.pronamic-pay-status-list li:first-child{border-top:0;width:100%}.pronamic-pay-status-list li:nth-child(2n){border-right:1px solid #eee}body.post-type-pronamic_pay_subscr #post-body-content,body.post-type-pronamic_payment #post-body-content{margin-bottom:0}.pronamic-pay-form-control-lg,.pronamic-pay-shortcode-input{width:100%}.pronamic-pay-form-control-file-button [type=file]{border:0;clip:rect(0,0,0,0);margin:-1px;padding:0;overflow:hidden;position:absolute;width:1px;height:1px}.pronamic-pay-icon{position:relative;text-indent:-9999px;width:1em;height:1em}.pronamic-pay-icon:after{content:"\f10b";display:block;font-family:Pronamic Pay Icons;position:absolute;top:0;left:0;speak:none;text-indent:0;width:100%;height:100%}.pronamic-pay-icon-pending:after{color:#ffba00;content:"\f10a"}.pronamic-pay-icon-cancelled:after{color:#a00;content:"\f106"}.pronamic-pay-icon-processing:after{color:#73a724;content:"\f10b"}.pronamic-pay-icon-completed:after{color:#2ea2cc;content:"\f107"}.pronamic-pay-icon-refunded:after{color:#999;content:"\f10c"}.pronamic-pay-icon-failed:after{color:#d0c21f;content:"\f108"}.pronamic-pay-icon-on-hold:after{color:#999;content:"\f109"}.pronamic-pay-icon-recurring:after{color:#999;content:"\f105"}.pronamic-pay-icon-recurring-first:after{color:#2ea2cc;content:"\f105"}.pronamic-pay-icon-question-mark:after{color:#999;content:"\f104"}.pronamic-pay-payment-methods.form-table.widefat{border-right:0;border-bottom:0;border-left:0;margin:-15px -10px;width:calc(100% + 20px)}.pronamic-pay-payment-methods thead th:first-of-type{width:60%}.pronamic-pay-payment-methods .pronamic-pay-icon{line-height:inherit}.pronamic-pay-payment-methods .pronamic-pay-icon-completed:after{color:#73a724}.pronamic-pay-payment-methods .pronamic-pay-icon-cancelled:after{color:#aaa}@media screen and (max-width:782px){.pronamic-pay-payment-methods.form-table th{display:table-cell}.pronamic-pay-payment-methods.form-table th:first-of-type{width:50%}.pronamic-pay-payment-methods.form-table td{display:table-cell}}.gateway-config-section-header h4{margin:0}.gateway-config-section-header p{margin:0 0 1em}.gateway-config-section-header p:last-child{margin-bottom:0}.pronamic-pay-test-payment-method td label{display:none}#pronamic_payment_log.postbox .inside{margin:0;padding:0}#pronamic_payment_log .comments-box{border:0}#pronamic_subscription.postbox input[name=pronamic_subscription_amount]{vertical-align:initial}#pronamic_payment_update .inside,#pronamic_subscription_update .inside{margin:0;padding:0}.pronamic-pay-inner{margin:6px 0 0}.pronamic-pay-major-actions{background:#f5f5f5;border-top:1px solid #ddd;padding:10px}.pronamic-pay-action{float:right;text-align:right}#pronamic-pay-next-payment-date-display,#pronamic-pay-post-status-display{font-weight:600}#pronamic-pay-next-payment-date-input,#pronamic-pay-post-status-input{margin-top:3px}.pronamic-pay-settings select{width:25em}.pronamic-pay-table-responsive{overflow-x:auto}.pronamic-pay-table thead th{font-weight:700}.pronamic-pay-table .deprecated a,.pronamic-pay-table .deprecated td{color:#aaa}.pronamic-pay-table td p{margin:0 0 1em}.pronamic-pay-table td p:last-child{margin-bottom:0}.postbox .pronamic-pay-table{border:0}.form-table .even,.pronamic-pay-table-striped tbody tr:nth-of-type(odd){background:#f9f9f9}#pronamic_payment .form-table td a{display:inline-block;overflow:hidden;width:350px;text-overflow:ellipsis;white-space:nowrap}.pronamic-pay-status-table{margin-top:2em}.pronamic-pay-status-table tbody th:first-child{width:20%}.widefat .column-pronamic_payment_status,.widefat .column-pronamic_payment_subscription,.widefat .column-pronamic_subscription_status{width:1em}.widefat .column-pronamic_payment_method,.widefat .column-pronamic_subscription_method{width:2.5em}@media only screen and (max-width:782px){.wp-list-table tr.type-pronamic_pay_subscr:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_payment_status,.wp-list-table tr.type-pronamic_pay_subscr:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_payment_subscription,.wp-list-table tr.type-pronamic_pay_subscr:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_subscription_status,.wp-list-table tr.type-pronamic_payment:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_payment_status,.wp-list-table tr.type-pronamic_payment:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_payment_subscription,.wp-list-table tr.type-pronamic_payment:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_subscription_status{display:table-cell}.wp-list-table tr.type-pronamic_pay_subscr:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_payment_status:before,.wp-list-table tr.type-pronamic_pay_subscr:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_payment_subscription:before,.wp-list-table tr.type-pronamic_pay_subscr:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_subscription_status:before,.wp-list-table tr.type-pronamic_payment:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_payment_status:before,.wp-list-table tr.type-pronamic_payment:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_payment_subscription:before,.wp-list-table tr.type-pronamic_payment:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_subscription_status:before{display:none}.wp-list-table tr.type-pronamic_pay_subscr:not(.inline-edit-row):not(.no-items).is-expanded td:not(.hidden).column-pronamic_payment_status,.wp-list-table tr.type-pronamic_pay_subscr:not(.inline-edit-row):not(.no-items).is-expanded td:not(.hidden).column-pronamic_payment_subscription,.wp-list-table tr.type-pronamic_pay_subscr:not(.inline-edit-row):not(.no-items).is-expanded td:not(.hidden).column-pronamic_subscription_status,.wp-list-table tr.type-pronamic_payment:not(.inline-edit-row):not(.no-items).is-expanded td:not(.hidden).column-pronamic_payment_status,.wp-list-table tr.type-pronamic_payment:not(.inline-edit-row):not(.no-items).is-expanded td:not(.hidden).column-pronamic_payment_subscription,.wp-list-table tr.type-pronamic_payment:not(.inline-edit-row):not(.no-items).is-expanded td:not(.hidden).column-pronamic_subscription_status{display:table-cell!important}}.pronamic-pay-tabs-items{border-bottom:1px solid #e5e5e5;display:block;float:left;margin:3px 0 0;width:100%}.pronamic-pay-tabs-items li{background:#e5e5e5;border-right:1px solid #e5e5e5;border-left:1px solid #e5e5e5;cursor:pointer;display:block;float:left;margin:0 5px -1px 0;padding:8px 15px}.pronamic-pay-tabs-items li.active{background:#fff;border-top:3px solid #008ec2;margin-top:-3px}.admin-color-fresh .pronamic-pay-tabs-items li.active{border-top-color:#2271b1}.admin-color-light .pronamic-pay-tabs-items li.active{border-top-color:#888}.admin-color-modern .pronamic-pay-tabs-items li.active{border-top-color:#3858e9}.admin-color-blue .pronamic-pay-tabs-items li.active{border-top-color:#096484}.admin-color-coffee .pronamic-pay-tabs-items li.active{border-top-color:#c7a589}.admin-color-ectoplasm .pronamic-pay-tabs-items li.active{border-top-color:#a3b745}.admin-color-midnight .pronamic-pay-tabs-items li.active{border-top-color:#e14d43}.admin-color-ocean .pronamic-pay-tabs-items li.active{border-top-color:#9ebaa0}.admin-color-sunrise .pronamic-pay-tabs-items li.active{border-top-color:#dd823b}.pronamic-pay-tab{border:1px solid #e5e5e5;border-top:0;clear:both}.pronamic-pay-tab .form-table{margin-top:0}.pronamic-pay-tab .form-table th{padding-left:10px}.pronamic-pay-tab-block{padding:15px 10px}@media only screen and (max-width:960px){.pronamic-pay-tabs-items{display:none}.pronamic-pay-tab,.pronamic-pay-tab .form-table{border:0}}@media only screen and (max-width:782px){.pronamic-pay-tab .form-table td,.pronamic-pay-tab .form-table th{padding:11px}}.pronamic-pay-text-success{color:green}.pronamic-pay-text-danger{color:red}.pronamic-pay-text-warning{color:orange}:not(a).pronamic-pay-tip{color:#777;cursor:help}.form-table th .pronamic-pay-tip{float:right}.pronamic-pay-cloack{display:none}

From cd9e2facdb0645f2eef5d614f559dfcb65fc2a3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Fri, 1 Apr 2022 11:51:52 +0200
Subject: [PATCH 54/87] Also remove time from next payment date of WooCommerce
 subscriptions.

---
 views/meta-box-subscription-payments.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/meta-box-subscription-payments.php b/views/meta-box-subscription-payments.php
index 458543d8..33449c1f 100644
--- a/views/meta-box-subscription-payments.php
+++ b/views/meta-box-subscription-payments.php
@@ -88,7 +88,7 @@
 								sprintf(
 									/* translators: %s: next payment date */
 									__( 'Will be created on %s', 'pronamic_ideal' ),
-									\esc_html( $next_payment_date->format_i18n() )
+									\esc_html( $next_payment_date->format_i18n( __( 'D j M Y', 'pronamic_ideal' ) ) )
 								)
 							);
 

From 3c8d911c9f856e8c918340a8db4127cc1d4aa43c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Fri, 1 Apr 2022 12:06:12 +0200
Subject: [PATCH 55/87] Update status class names in payment update meta box.

---
 views/meta-box-payment-update.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/meta-box-payment-update.php b/views/meta-box-payment-update.php
index d8b836d8..b3f5dfd8 100644
--- a/views/meta-box-payment-update.php
+++ b/views/meta-box-payment-update.php
@@ -50,14 +50,14 @@
 
 			?>
 
-			<span id="pronamic-pay-status-display"><?php echo esc_html( $status_label ); ?></span>
+			<span id="pronamic-pay-post-status-display"><?php echo esc_html( $status_label ); ?></span>
 
 			<a href="#pronamic-pay-post-status" class="edit-pronamic-pay-post-status hide-if-no-js" role="button">
 				<span aria-hidden="true"><?php _e( 'Edit', 'pronamic_ideal' ); ?></span>
 				<span class="screen-reader-text"><?php _e( 'Edit status', 'pronamic_ideal' ); ?></span>
 			</a>
 
-			<div id="pronamic-pay-post-status-select" class="hide-if-js">
+			<div id="pronamic-pay-post-status-input" class="hide-if-js">
 				<input type="hidden" name="hidden_pronamic_pay_post_status" id="hidden_pronamic_pay_post_status" value="<?php echo esc_attr( ( 'auto-draft' === $post->post_status ) ? 'draft' : $post->post_status ); ?>" />
 				<label for="pronamic-pay-post-status" class="screen-reader-text"><?php _e( 'Set status' ); ?></label>
 				<select id="pronamic-pay-post-status" name="pronamic_payment_post_status">

From f9dbc3416302da2680c37ad94c4cef023033f699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Fri, 1 Apr 2022 14:57:10 +0200
Subject: [PATCH 56/87] Add subscription post updated messages.

---
 src/Admin/AdminSubscriptionPostType.php | 47 +++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/src/Admin/AdminSubscriptionPostType.php b/src/Admin/AdminSubscriptionPostType.php
index 3b3babac..75f62658 100644
--- a/src/Admin/AdminSubscriptionPostType.php
+++ b/src/Admin/AdminSubscriptionPostType.php
@@ -69,6 +69,8 @@ public function __construct( $plugin ) {
 		add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ) );
 
 		add_filter( 'removable_query_args', array( $this, 'removable_query_args' ) );
+
+		add_filter( 'post_updated_messages', array( $this, 'post_updated_messages' ) );
 	}
 
 	/**
@@ -708,4 +710,49 @@ public function post_row_actions( $actions, $post ) {
 
 		return $actions;
 	}
+
+	/**
+	 * Post updated messages.
+	 *
+	 * @link https://codex.wordpress.org/Function_Reference/register_post_type
+	 * @link https://github.com/WordPress/WordPress/blob/4.4.2/wp-admin/edit-form-advanced.php#L134-L173
+	 * @link https://github.com/woothemes/woocommerce/blob/2.5.5/includes/admin/class-wc-admin-post-types.php#L111-L168
+	 * @param array $messages Message.
+	 * @return array
+	 */
+	public function post_updated_messages( $messages ) {
+		global $post;
+
+		// @link https://translate.wordpress.org/projects/wp/4.4.x/admin/nl/default?filters[status]=either&filters[original_id]=2352797&filters[translation_id]=37948900
+		$scheduled_date = date_i18n( __( 'M j, Y @ H:i', 'pronamic_ideal' ), strtotime( $post->post_date ) );
+
+		$messages[ self::POST_TYPE ] = array(
+			0  => '', // Unused. Messages start at index 1.
+			1  => __( 'Subscription updated.', 'pronamic_ideal' ),
+			// @link https://translate.wordpress.org/projects/wp/4.4.x/admin/nl/default?filters[status]=either&filters[original_id]=2352799&filters[translation_id]=37947229.
+			2  => $messages['post'][2],
+			// @link https://translate.wordpress.org/projects/wp/4.4.x/admin/nl/default?filters[status]=either&filters[original_id]=2352800&filters[translation_id]=37947870.
+			3  => $messages['post'][3],
+			// @link https://translate.wordpress.org/projects/wp/4.4.x/admin/nl/default?filters[status]=either&filters[original_id]=2352798&filters[translation_id]=37947230.
+			4  => __( 'Subscription updated.', 'pronamic_ideal' ),
+			// @link https://translate.wordpress.org/projects/wp/4.4.x/admin/nl/default?filters[status]=either&filters[original_id]=2352801&filters[translation_id]=37947231.
+			/* phpcs:disable WordPress.Security.NonceVerification.Recommended */
+			/* translators: %s: date and time of the revision */
+			5  => isset( $_GET['revision'] ) ? sprintf( __( 'Subscription restored to revision from %s.', 'pronamic_ideal' ), strval( wp_post_revision_title( (int) $_GET['revision'], false ) ) ) : false,
+			/* phpcs:enable WordPress.Security.NonceVerification.Recommended */
+			// @link https://translate.wordpress.org/projects/wp/4.4.x/admin/nl/default?filters[status]=either&filters[original_id]=2352802&filters[translation_id]=37949178.
+			6  => __( 'Subscription published.', 'pronamic_ideal' ),
+			// @link https://translate.wordpress.org/projects/wp/4.4.x/admin/nl/default?filters[status]=either&filters[original_id]=2352803&filters[translation_id]=37947232.
+			7  => __( 'Subscription saved.', 'pronamic_ideal' ),
+			// @link https://translate.wordpress.org/projects/wp/4.4.x/admin/nl/default?filters[status]=either&filters[original_id]=2352804&filters[translation_id]=37949303.
+			8  => __( 'Subscription submitted.', 'pronamic_ideal' ),
+			// @link https://translate.wordpress.org/projects/wp/4.4.x/admin/nl/default?filters[status]=either&filters[original_id]=2352805&filters[translation_id]=37949302.
+			/* translators: %s: scheduled date */
+			9  => sprintf( __( 'Subscription scheduled for: %s.', 'pronamic_ideal' ), '<strong>' . $scheduled_date . '</strong>' ),
+			// @link https://translate.wordpress.org/projects/wp/4.4.x/admin/nl/default?filters[status]=either&filters[original_id]=2352806&filters[translation_id]=37949301.
+			10 => __( 'Subscription draft updated.', 'pronamic_ideal' ),
+		);
+
+		return $messages;
+	}
 }

From 3bdd4bf31911102c2df6a970aa647db9ab6e83b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Fri, 1 Apr 2022 15:25:58 +0200
Subject: [PATCH 57/87] Make it clear that changing the next payment date does
 not affect subscription source status or validity
 (pronamic/wp-pronamic-pay#315).

---
 js/dist/admin.js                       | 39 ++++++++++---
 js/dist/admin.min.js                   |  2 +-
 js/src/admin.js                        | 39 ++++++++++---
 views/meta-box-subscription-update.php | 78 +++++++++++++++-----------
 4 files changed, 110 insertions(+), 48 deletions(-)

diff --git a/js/dist/admin.js b/js/dist/admin.js
index 63d3150c..81c3b662 100644
--- a/js/dist/admin.js
+++ b/js/dist/admin.js
@@ -243,6 +243,22 @@
 
 		this.hideOptions = function() {
 			$element.slideUp( 'fast' ).siblings( 'a.edit-' + elementId ).show().trigger( 'focus' );
+
+			var $minError = $( '#' + elementId + '-min-error' );
+
+			// Show original field error.
+			if ( $minError.is( ':visible' ) ) {
+				$( '#' + elementId + '-error' ).show();
+			}
+
+			// Hide editing notice and error.
+			var hiddenNotices = $( '#' + elementId + '-notice:hidden' );
+
+			$( '#' + elementId + '-notice' ).hide();
+
+			hiddenNotices.show();
+
+			$minError.hide();
 		};
 
 		this.updateDisplayText = function() {
@@ -298,14 +314,14 @@
 
 			inputDate = new Date( inputDate );
 
-			var $error = $( '#' + elementId + '-error' );
+			var $minError = $( '#' + elementId + '-min-error' );
 
 			var isValidInput = inputDate >= minDate;
 
 			if ( isValidInput ) {
-				$error.hide();
+				$minError.hide();
 			} else {
-				$error.show();
+				$minError.show();
 			}
 
 			$element.find( '.save-' + elementId ).attr( 'disabled', ! isValidInput );
@@ -315,13 +331,13 @@
 		$element.siblings( 'a.edit-' + elementId ).on( 'click', function( event ) {
 			event.preventDefault();
 
-			if ( ! $element.is( ':hidden' ) ) {
+			if ( $element.is( ':visible' ) ) {
 				return;
 			}
 
 			var $error = $( '#' + elementId + '-error' );
 
-			if ( $error.length > 0 && ! $error.is( ':hidden' ) ) {
+			if ( $error.length > 0 ) {
 				$element.find( '.save-' + elementId ).attr( 'disabled', true );
 
 				$error.hide();
@@ -333,6 +349,13 @@
 				$input.attr( 'min', dataMin );
 			}
 
+			// Field notice.
+			var hiddenNotice = $( '#' + elementId + '-notice:hidden' );
+
+			$( '#' + elementId + '-notice:visible' ).hide();
+
+			hiddenNotice.show();
+
 			$element.slideDown( 'fast', function() {
 				$input.trigger( 'focus' );
 			} );
@@ -362,18 +385,20 @@
 		$element.find( '.cancel-' + elementId ).on( 'click', function( event ) {
 			event.preventDefault();
 
-			obj.hideOptions();
-
 			var originalValue = $( '#hidden_' + elementId.replace( /-/g, '_' ) ).val();
 
 			$( '#' + elementId ).val( originalValue );
 
+			obj.validateDateInput();
+
 			var dataMin = $input.data( 'min' );
 
 			if ( undefined !== dataMin && dataMin !== '' ) {
 				$input.removeAttr( 'min' );
 			}
 
+			obj.hideOptions();
+
 			obj.updateDisplayText();
 		} );
 	};
diff --git a/js/dist/admin.min.js b/js/dist/admin.min.js
index 659a3e72..0a2072bd 100644
--- a/js/dist/admin.min.js
+++ b/js/dist/admin.min.js
@@ -1 +1 @@
-!function(t){var a=function(a){var i=this,e=t(a),n={};n.variantId=e.find("#pronamic_gateway_id"),n.extraSettings=e.find("div.extra-settings"),n.sectionHeaders=e.find(".gateway-config-section-header"),n.tabs=e.find(".pronamic-pay-tabs"),n.tabItems=e.find("ul.pronamic-pay-tabs-items"),this.updateFields=function(){i.selectedVariant=n.variantId.find("option:selected"),i.settings=i.selectedVariant.data("pronamic-pay-settings"),e.find(".extra-settings").hide(),i.settingElements=[],t.isArray(i.settings)&&t.each(i.settings,(function(t,a){e.find(".setting-"+a).show()})),e.find(".setting-"+i.selectedVariant.val()).show();var a=i.selectedVariant.text().split(" - ")[0].replace(/ \(.*\)/,"");n.tabItems.find(":visible").first().text(a).click(),t("#pronamic-pay-gateway-description").html(i.selectedVariant.attr("data-gateway-description"))},this.updateRowBackgroundColor=function(){var t=n.extraSettings.find(".form-table tr");t.removeClass("even"),t.filter(":visible:even").addClass("even")},this.initTabs=function(){t.each(n.sectionHeaders,(function(a,i){var e=t(i),s=e.find("h4").text(),o=e.parents("div")[0].className;n.tabItems.append(t("<li>"+s+"</li>").addClass(o).removeClass("pronamic-pay-tab"))})),n.tabItems.next().after(n.tabItems),n.tabItems.find("li").click(i.showTabSettings)},this.showTabSettings=function(){var a=t(this);n.extraSettings.hide().eq(a.index()).show()};var s=function(){t.ajax({url:pronamicPayGatewayAdmin.rest_url,method:"GET",beforeSend:function(t){t.setRequestHeader("X-WP-Nonce",pronamicPayGatewayAdmin.nonce)},data:{gateway_id:t("#pronamic_gateway_id").val(),gateway_mode:t("#pronamic_ideal_mode").val()}}).done((function(a){t("#pronamic-pay-gateway-settings").html(a.meta_boxes.settings),t("#pronamic-pay-gateway-settings .pronamic-pay-tabs").pronamicPayTabs(),t("#pronamic-pay-gateway-settings .pronamic-pay-tip").each((function(){tippy(this,{content:t(this).attr("title"),arrow:!0,theme:"pronamic-pay"})}))}))};t("#pronamic_gateway_id").change(s),t("#pronamic_ideal_mode").change(s),i.initTabs(),i.updateFields(),n.variantId.change(i.updateFields)};t.fn.pronamicPayGatewayConfigEditor=function(){return this.each((function(){var i=t(this);if(!i.data("pronamic-pay-gateway-config-editor")){var e=new a(this);i.data("pronamic-pay-gateway-config-editor",e)}}))};var i=function(a){var i=this,e=t(a),n={};n.tabItems=e.find("ul.pronamic-pay-tabs-items"),n.tabs=e.find(".pronamic-pay-tab"),n.tabItems=e.find("ul.pronamic-pay-tabs-items"),this.updateRowBackgroundColor=function(){var t=n.tabs.find(".form-table tr");t.removeClass("even"),t.filter(":visible:even").addClass("even")},this.showTab=function(){var a=t(this);n.tabItems.find("li").removeClass("active"),a.addClass("active"),n.tabs.hide().eq(a.index()).show(),i.updateRowBackgroundColor(),i.visibleTabItems=n.tabItems.find("li:visible"),i.activeTabItem=a},this.responsiveTabs=function(){if(t(window).width()>960)n.tabs.hide(),i.activeTabItem?i.activeTabItem.click():n.tabItems.find("li:visible").first().click();else{if(!i.visibleTabItems)return;n.tabs.hide(),t.each(i.visibleTabItems,(function(a,i){n.tabs.eq(t(i).index()).show()}))}},n.tabItems.find("li").click(i.showTab),n.tabItems.find("li:visible").first().click(),t(window).resize(i.responsiveTabs)};t.fn.pronamicPayTabs=function(){return this.each((function(){var a=t(this);if(!a.data("pronamic-pay-tabs")){var e=new i(this);a.data("pronamic-pay-tabs",e)}}))};var e=function(a,i){var e=this,n=t(a),s=n.find('select, input:not([type="hidden"])');this.hideOptions=function(){n.slideUp("fast").siblings("a.edit-"+i).show().trigger("focus")},this.updateDisplayText=function(){var a=t("#"+i+"-display")[0].innerHTML,e=s.prop("tagName").toLowerCase();switch("input"===e?s.prop("type"):e){case"date":var n=new Intl.DateTimeFormat([],{weekday:"short",day:"numeric",month:"short",year:"numeric"}),o=s.val();""!==o&&(a=n.format(new Date(o)));break;case"select":a=s.find("option:selected").text()}t("#"+i+"-display").text(a)},this.validateDateInput=function(){var a=s.attr("min"),e=s.val();if(void 0!==a){a=new Date(a),e=new Date(e);var o=t("#"+i+"-error"),r=e>=a;r?o.hide():o.show(),n.find(".save-"+i).attr("disabled",!r)}},n.siblings("a.edit-"+i).on("click",(function(a){if(a.preventDefault(),n.is(":hidden")){var o=t("#"+i+"-error");o.length>0&&!o.is(":hidden")&&(n.find(".save-"+i).attr("disabled",!0),o.hide());var r=s.data("min");void 0!==r&&""!==r&&s.attr("min",r),n.slideDown("fast",(function(){s.trigger("focus")})),t(this).hide(),e.validateDateInput()}})),n.find('input[type="date"][data-min!=""][data-min]').on("change",e.validateDateInput),n.find(".save-"+i).on("click",(function(a){a.preventDefault(),t(this).is("[disabled]")||(e.hideOptions(),e.updateDisplayText())})),n.find(".cancel-"+i).on("click",(function(a){a.preventDefault(),e.hideOptions();var n=t("#hidden_"+i.replace(/-/g,"_")).val();t("#"+i).val(n);var o=s.data("min");void 0!==o&&""!==o&&s.removeAttr("min"),e.updateDisplayText()}))};t.fn.pronamicPayPostStatus=function(){return this.each((function(){var a=t(this);if(!a.data("pronamic-pay-post-status")){var i=new e(this,"pronamic-pay-post-status");a.data("pronamic-pay-post-status",i)}}))},t.fn.pronamicPayNextPaymentDate=function(){return this.each((function(){var a=t(this);if(!a.data("pronamic-pay-next-payment-date")){var i=new e(this,"pronamic-pay-next-payment-date");a.data("pronamic-pay-next-payment-date",i)}}))};var n=function(a){var i=t(a),e={};e.paymentMethods=i.find('select[name="pronamic_pay_test_payment_method"]'),this.updateInputVisibility=function(){var a=e.paymentMethods.val();""!==a&&i.find(".pronamic-pay-test-payment-method").hide().filter("."+a).show(),1===e.paymentMethods.find("option:selected").data("is-recurring")?t("#pronamic-pay-test-subscription").parents("tr").show():(t("#pronamic-pay-test-subscription").parents("tr").hide(),t("#pronamic-pay-test-subscription").prop("checked",!1).trigger("change"))},this.updateInputVisibility(),e.paymentMethods.change(this.updateInputVisibility),i.on("keydown","input, select",(function(t){13===t.keyCode&&(t.preventDefault(),i.find('input[name="test_pay_gateway"]').click())}))};t.fn.pronamicPayGatewayTest=function(){return this.each((function(){var a=t(this);if(!a.data("pronamic-pay-gateway-test")){var i=new n(this);a.data("pronamic-pay-gateway-test",i)}}))};var s=function(a){var i=this,e=t(a),n={};n.amountMethod=e.find('select[name="_pronamic_payment_form_amount_method"]'),this.updateAmountsVisibility=function(){var t=n.amountMethod.val();"choices_only"===t||"choices_and_input"===t?e.find('input[name="_pronamic_payment_form_amount_choices[]"]').closest("div").show():e.find('input[name="_pronamic_payment_form_amount_choices[]"]').closest("div").hide()},this.maybeAddAmountChoice=function(){if(n.amountChoices=e.find('input[name="_pronamic_payment_form_amount_choices[]"]'),0===n.amountChoices.filter((function(){return""===this.value})).length){var t=n.amountChoices.last().closest("div"),a=t.clone(),i="_pronamic_payment_form_amount_choice_"+n.amountChoices.length;a.find("input").attr("id",i).val(""),a.find("label").attr("for",i),t.after(a)}},i.updateAmountsVisibility(),n.amountMethod.change(i.updateAmountsVisibility),e.on("keyup",'input[name="_pronamic_payment_form_amount_choices[]"]',(function(){i.maybeAddAmountChoice()}))};t.fn.pronamicPayFormOptions=function(){return this.each((function(){var a=t(this);if(!a.data("pronamic-pay-forms-options")){var i=new s(this);a.data("pronamic-pay-form-options",i)}}))},t(document).ready((function(){t("#pronamic-pay-gateway-config-editor").pronamicPayGatewayConfigEditor(),t("#pronamic_payment_form_options").pronamicPayFormOptions(),t("#pronamic-pay-post-status-input").pronamicPayPostStatus(),t("#pronamic-pay-next-payment-date-input").pronamicPayNextPaymentDate(),t("#pronamic_gateway_test").pronamicPayGatewayTest(),t(".pronamic-pay-tabs").pronamicPayTabs(),t(".pronamic-pay-tip").each((function(){tippy(this,{content:t(this).attr("title"),arrow:!0,theme:"pronamic-pay"})}))}))}(jQuery);
\ No newline at end of file
+!function(t){var a=function(a){var i=this,e=t(a),n={};n.variantId=e.find("#pronamic_gateway_id"),n.extraSettings=e.find("div.extra-settings"),n.sectionHeaders=e.find(".gateway-config-section-header"),n.tabs=e.find(".pronamic-pay-tabs"),n.tabItems=e.find("ul.pronamic-pay-tabs-items"),this.updateFields=function(){i.selectedVariant=n.variantId.find("option:selected"),i.settings=i.selectedVariant.data("pronamic-pay-settings"),e.find(".extra-settings").hide(),i.settingElements=[],t.isArray(i.settings)&&t.each(i.settings,(function(t,a){e.find(".setting-"+a).show()})),e.find(".setting-"+i.selectedVariant.val()).show();var a=i.selectedVariant.text().split(" - ")[0].replace(/ \(.*\)/,"");n.tabItems.find(":visible").first().text(a).click(),t("#pronamic-pay-gateway-description").html(i.selectedVariant.attr("data-gateway-description"))},this.updateRowBackgroundColor=function(){var t=n.extraSettings.find(".form-table tr");t.removeClass("even"),t.filter(":visible:even").addClass("even")},this.initTabs=function(){t.each(n.sectionHeaders,(function(a,i){var e=t(i),s=e.find("h4").text(),o=e.parents("div")[0].className;n.tabItems.append(t("<li>"+s+"</li>").addClass(o).removeClass("pronamic-pay-tab"))})),n.tabItems.next().after(n.tabItems),n.tabItems.find("li").click(i.showTabSettings)},this.showTabSettings=function(){var a=t(this);n.extraSettings.hide().eq(a.index()).show()};var s=function(){t.ajax({url:pronamicPayGatewayAdmin.rest_url,method:"GET",beforeSend:function(t){t.setRequestHeader("X-WP-Nonce",pronamicPayGatewayAdmin.nonce)},data:{gateway_id:t("#pronamic_gateway_id").val(),gateway_mode:t("#pronamic_ideal_mode").val()}}).done((function(a){t("#pronamic-pay-gateway-settings").html(a.meta_boxes.settings),t("#pronamic-pay-gateway-settings .pronamic-pay-tabs").pronamicPayTabs(),t("#pronamic-pay-gateway-settings .pronamic-pay-tip").each((function(){tippy(this,{content:t(this).attr("title"),arrow:!0,theme:"pronamic-pay"})}))}))};t("#pronamic_gateway_id").change(s),t("#pronamic_ideal_mode").change(s),i.initTabs(),i.updateFields(),n.variantId.change(i.updateFields)};t.fn.pronamicPayGatewayConfigEditor=function(){return this.each((function(){var i=t(this);if(!i.data("pronamic-pay-gateway-config-editor")){var e=new a(this);i.data("pronamic-pay-gateway-config-editor",e)}}))};var i=function(a){var i=this,e=t(a),n={};n.tabItems=e.find("ul.pronamic-pay-tabs-items"),n.tabs=e.find(".pronamic-pay-tab"),n.tabItems=e.find("ul.pronamic-pay-tabs-items"),this.updateRowBackgroundColor=function(){var t=n.tabs.find(".form-table tr");t.removeClass("even"),t.filter(":visible:even").addClass("even")},this.showTab=function(){var a=t(this);n.tabItems.find("li").removeClass("active"),a.addClass("active"),n.tabs.hide().eq(a.index()).show(),i.updateRowBackgroundColor(),i.visibleTabItems=n.tabItems.find("li:visible"),i.activeTabItem=a},this.responsiveTabs=function(){if(t(window).width()>960)n.tabs.hide(),i.activeTabItem?i.activeTabItem.click():n.tabItems.find("li:visible").first().click();else{if(!i.visibleTabItems)return;n.tabs.hide(),t.each(i.visibleTabItems,(function(a,i){n.tabs.eq(t(i).index()).show()}))}},n.tabItems.find("li").click(i.showTab),n.tabItems.find("li:visible").first().click(),t(window).resize(i.responsiveTabs)};t.fn.pronamicPayTabs=function(){return this.each((function(){var a=t(this);if(!a.data("pronamic-pay-tabs")){var e=new i(this);a.data("pronamic-pay-tabs",e)}}))};var e=function(a,i){var e=this,n=t(a),s=n.find('select, input:not([type="hidden"])');this.hideOptions=function(){n.slideUp("fast").siblings("a.edit-"+i).show().trigger("focus");var a=t("#"+i+"-min-error");a.is(":visible")&&t("#"+i+"-error").show();var e=t("#"+i+"-notice:hidden");t("#"+i+"-notice").hide(),e.show(),a.hide()},this.updateDisplayText=function(){var a=t("#"+i+"-display")[0].innerHTML,e=s.prop("tagName").toLowerCase();switch("input"===e?s.prop("type"):e){case"date":var n=new Intl.DateTimeFormat([],{weekday:"short",day:"numeric",month:"short",year:"numeric"}),o=s.val();""!==o&&(a=n.format(new Date(o)));break;case"select":a=s.find("option:selected").text()}t("#"+i+"-display").text(a)},this.validateDateInput=function(){var a=s.attr("min"),e=s.val();if(void 0!==a){a=new Date(a),e=new Date(e);var o=t("#"+i+"-min-error"),r=e>=a;r?o.hide():o.show(),n.find(".save-"+i).attr("disabled",!r)}},n.siblings("a.edit-"+i).on("click",(function(a){if(a.preventDefault(),!n.is(":visible")){var o=t("#"+i+"-error");o.length>0&&(n.find(".save-"+i).attr("disabled",!0),o.hide());var r=s.data("min");void 0!==r&&""!==r&&s.attr("min",r);var c=t("#"+i+"-notice:hidden");t("#"+i+"-notice:visible").hide(),c.show(),n.slideDown("fast",(function(){s.trigger("focus")})),t(this).hide(),e.validateDateInput()}})),n.find('input[type="date"][data-min!=""][data-min]').on("change",e.validateDateInput),n.find(".save-"+i).on("click",(function(a){a.preventDefault(),t(this).is("[disabled]")||(e.hideOptions(),e.updateDisplayText())})),n.find(".cancel-"+i).on("click",(function(a){a.preventDefault();var n=t("#hidden_"+i.replace(/-/g,"_")).val();t("#"+i).val(n),e.validateDateInput();var o=s.data("min");void 0!==o&&""!==o&&s.removeAttr("min"),e.hideOptions(),e.updateDisplayText()}))};t.fn.pronamicPayPostStatus=function(){return this.each((function(){var a=t(this);if(!a.data("pronamic-pay-post-status")){var i=new e(this,"pronamic-pay-post-status");a.data("pronamic-pay-post-status",i)}}))},t.fn.pronamicPayNextPaymentDate=function(){return this.each((function(){var a=t(this);if(!a.data("pronamic-pay-next-payment-date")){var i=new e(this,"pronamic-pay-next-payment-date");a.data("pronamic-pay-next-payment-date",i)}}))};var n=function(a){var i=t(a),e={};e.paymentMethods=i.find('select[name="pronamic_pay_test_payment_method"]'),this.updateInputVisibility=function(){var a=e.paymentMethods.val();""!==a&&i.find(".pronamic-pay-test-payment-method").hide().filter("."+a).show(),1===e.paymentMethods.find("option:selected").data("is-recurring")?t("#pronamic-pay-test-subscription").parents("tr").show():(t("#pronamic-pay-test-subscription").parents("tr").hide(),t("#pronamic-pay-test-subscription").prop("checked",!1).trigger("change"))},this.updateInputVisibility(),e.paymentMethods.change(this.updateInputVisibility),i.on("keydown","input, select",(function(t){13===t.keyCode&&(t.preventDefault(),i.find('input[name="test_pay_gateway"]').click())}))};t.fn.pronamicPayGatewayTest=function(){return this.each((function(){var a=t(this);if(!a.data("pronamic-pay-gateway-test")){var i=new n(this);a.data("pronamic-pay-gateway-test",i)}}))};var s=function(a){var i=this,e=t(a),n={};n.amountMethod=e.find('select[name="_pronamic_payment_form_amount_method"]'),this.updateAmountsVisibility=function(){var t=n.amountMethod.val();"choices_only"===t||"choices_and_input"===t?e.find('input[name="_pronamic_payment_form_amount_choices[]"]').closest("div").show():e.find('input[name="_pronamic_payment_form_amount_choices[]"]').closest("div").hide()},this.maybeAddAmountChoice=function(){if(n.amountChoices=e.find('input[name="_pronamic_payment_form_amount_choices[]"]'),0===n.amountChoices.filter((function(){return""===this.value})).length){var t=n.amountChoices.last().closest("div"),a=t.clone(),i="_pronamic_payment_form_amount_choice_"+n.amountChoices.length;a.find("input").attr("id",i).val(""),a.find("label").attr("for",i),t.after(a)}},i.updateAmountsVisibility(),n.amountMethod.change(i.updateAmountsVisibility),e.on("keyup",'input[name="_pronamic_payment_form_amount_choices[]"]',(function(){i.maybeAddAmountChoice()}))};t.fn.pronamicPayFormOptions=function(){return this.each((function(){var a=t(this);if(!a.data("pronamic-pay-forms-options")){var i=new s(this);a.data("pronamic-pay-form-options",i)}}))},t(document).ready((function(){t("#pronamic-pay-gateway-config-editor").pronamicPayGatewayConfigEditor(),t("#pronamic_payment_form_options").pronamicPayFormOptions(),t("#pronamic-pay-post-status-input").pronamicPayPostStatus(),t("#pronamic-pay-next-payment-date-input").pronamicPayNextPaymentDate(),t("#pronamic_gateway_test").pronamicPayGatewayTest(),t(".pronamic-pay-tabs").pronamicPayTabs(),t(".pronamic-pay-tip").each((function(){tippy(this,{content:t(this).attr("title"),arrow:!0,theme:"pronamic-pay"})}))}))}(jQuery);
\ No newline at end of file
diff --git a/js/src/admin.js b/js/src/admin.js
index 63d3150c..81c3b662 100644
--- a/js/src/admin.js
+++ b/js/src/admin.js
@@ -243,6 +243,22 @@
 
 		this.hideOptions = function() {
 			$element.slideUp( 'fast' ).siblings( 'a.edit-' + elementId ).show().trigger( 'focus' );
+
+			var $minError = $( '#' + elementId + '-min-error' );
+
+			// Show original field error.
+			if ( $minError.is( ':visible' ) ) {
+				$( '#' + elementId + '-error' ).show();
+			}
+
+			// Hide editing notice and error.
+			var hiddenNotices = $( '#' + elementId + '-notice:hidden' );
+
+			$( '#' + elementId + '-notice' ).hide();
+
+			hiddenNotices.show();
+
+			$minError.hide();
 		};
 
 		this.updateDisplayText = function() {
@@ -298,14 +314,14 @@
 
 			inputDate = new Date( inputDate );
 
-			var $error = $( '#' + elementId + '-error' );
+			var $minError = $( '#' + elementId + '-min-error' );
 
 			var isValidInput = inputDate >= minDate;
 
 			if ( isValidInput ) {
-				$error.hide();
+				$minError.hide();
 			} else {
-				$error.show();
+				$minError.show();
 			}
 
 			$element.find( '.save-' + elementId ).attr( 'disabled', ! isValidInput );
@@ -315,13 +331,13 @@
 		$element.siblings( 'a.edit-' + elementId ).on( 'click', function( event ) {
 			event.preventDefault();
 
-			if ( ! $element.is( ':hidden' ) ) {
+			if ( $element.is( ':visible' ) ) {
 				return;
 			}
 
 			var $error = $( '#' + elementId + '-error' );
 
-			if ( $error.length > 0 && ! $error.is( ':hidden' ) ) {
+			if ( $error.length > 0 ) {
 				$element.find( '.save-' + elementId ).attr( 'disabled', true );
 
 				$error.hide();
@@ -333,6 +349,13 @@
 				$input.attr( 'min', dataMin );
 			}
 
+			// Field notice.
+			var hiddenNotice = $( '#' + elementId + '-notice:hidden' );
+
+			$( '#' + elementId + '-notice:visible' ).hide();
+
+			hiddenNotice.show();
+
 			$element.slideDown( 'fast', function() {
 				$input.trigger( 'focus' );
 			} );
@@ -362,18 +385,20 @@
 		$element.find( '.cancel-' + elementId ).on( 'click', function( event ) {
 			event.preventDefault();
 
-			obj.hideOptions();
-
 			var originalValue = $( '#hidden_' + elementId.replace( /-/g, '_' ) ).val();
 
 			$( '#' + elementId ).val( originalValue );
 
+			obj.validateDateInput();
+
 			var dataMin = $input.data( 'min' );
 
 			if ( undefined !== dataMin && dataMin !== '' ) {
 				$input.removeAttr( 'min' );
 			}
 
+			obj.hideOptions();
+
 			obj.updateDisplayText();
 		} );
 	};
diff --git a/views/meta-box-subscription-update.php b/views/meta-box-subscription-update.php
index 9d0219c9..b99f41c3 100644
--- a/views/meta-box-subscription-update.php
+++ b/views/meta-box-subscription-update.php
@@ -89,33 +89,25 @@
 					<a href="#pronamic-pay-post-status" class="cancel-pronamic-pay-post-status hide-if-no-js button-cancel"><?php _e( 'Cancel' ); ?></a>
 				</div>
 
-				<?php
-
-				$tomorrow = new DateTimeImmutable( 'tomorrow midnight', new DateTimeZone( Plugin::TIMEZONE ) );
-
-				$class = 'hidden';
-
-				if ( null !== $subscription && in_array( $subscription->get_status(), array( SubscriptionStatus::FAILURE, SubscriptionStatus::ON_HOLD ), true ) ) {
-					$class = '';
-				}
-
-				?>
-
-				<div id="pronamic-pay-post-status-notice" class="notice inline <?php echo esc_attr( $class ); ?>">
-					<p>
-						<?php
+				<?php if ( null !== $subscription && in_array( $subscription->get_status(), array( SubscriptionStatus::FAILURE, SubscriptionStatus::ON_HOLD ), true ) ) : ?>
+
+					<div id="pronamic-pay-post-status-notice" class="notice inline">
+						<p>
+							<?php
+
+							echo \wp_kses_post(
+								\sprintf(
+									'%s <a href="#pronamic_subscription_notes">%s</a>',
+									\__( 'Recurring payments will not be created until manual reactivation of this subscription.', 'pronamic_ideal' ),
+									\__( 'See subscription and payment notes for details about status changes.', 'pronamic_ideal' )
+								)
+							);
 
-						echo \wp_kses_post(
-							\sprintf(
-								'%s <a href="#pronamic_subscription_notes">%s</a>',
-								\__( 'Recurring payments will not be created until manual reactivation of this subscription.', 'pronamic_ideal' ),
-								\__( 'See subscription and payment notes for details about status changes.', 'pronamic_ideal' )
-							)
-						);
+							?>
+						</p>
+					</div>
 
-						?>
-					</p>
-				</div>
+				<?php endif; ?>
 
 			<?php endif; ?>
 		</div>
@@ -172,18 +164,38 @@
 
 				<?php
 
-				$tomorrow = new DateTimeImmutable( 'tomorrow midnight', new DateTimeZone( Plugin::TIMEZONE ) );
+				$today = new DateTimeImmutable( 'today midnight', new DateTimeZone( Plugin::TIMEZONE ) );
 
-				$class = 'hidden';
+				if ( SubscriptionStatus::ACTIVE === $subscription->get_status() && null !== $next_payment_date && $next_payment_date < $today ) :
+					?>
 
-				if ( null !== $subscription && SubscriptionStatus::ACTIVE === $subscription->get_status() ) {
-					$class = null !== $next_payment_date && $next_payment_date >= $tomorrow ? 'hidden' : '';
-				}
+					<div id="pronamic-pay-next-payment-date-error" class="error inline">
+						<p><?php echo esc_html( __( 'Set the next payment date to a future date to continue payments for this subscription.', 'pronamic_ideal' ) ); ?></p>
+					</div>
 
-				?>
+				<?php endif; ?>
+
+				<div id="pronamic-pay-next-payment-date-min-error" class="hidden error inline">
+					<p><?php echo esc_html( __( 'Please select a future date.', 'pronamic_ideal' ) ); ?></p>
+				</div>
+
+				<div id="pronamic-pay-next-payment-date-notice" class="hidden notice inline">
+					<p>
+						<?php
 
-				<div id="pronamic-pay-next-payment-date-error" class="error inline <?php echo esc_attr( $class ); ?>">
-					<p><?php echo esc_html( __( 'Next payment date in the past. Please update the date to continue payments for this subscription.', 'pronamic_ideal' ) ); ?></p>
+						\printf(
+							/* translators: %s subscription source description */
+							\esc_html( \__( 'Editing the next payment date does not affect the current status or validity of %s.', 'pronamic_ideal' ) ),
+							// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+							\str_replace(
+								array( '<br>', '<br/>', '<br />' ),
+								' ',
+								$subscription->get_source_text()
+							)
+						);
+
+						?>
+					</p>
 				</div>
 			</div>
 

From 0dfe17c40d7f6d76ac349ba3e4d9b8236c323a0b Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Fri, 8 Apr 2022 13:44:38 +0200
Subject: [PATCH 58/87] New CI actions.

---
 .github/workflows/ci.yaml   |  22 +++
 .github/workflows/main.yaml | 336 ------------------------------------
 2 files changed, 22 insertions(+), 336 deletions(-)
 create mode 100644 .github/workflows/ci.yaml
 delete mode 100644 .github/workflows/main.yaml

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
new file mode 100644
index 00000000..483af854
--- /dev/null
+++ b/.github/workflows/ci.yaml
@@ -0,0 +1,22 @@
+name: CI
+
+on: [ push, pull_request ]
+
+jobs:
+  phplint:
+    uses: pronamic/actions/.github/workflows/phplint.yml@main
+
+  phpcs:
+    uses: pronamic/actions/.github/workflows/phpcs.yml@main
+
+  phpstan:
+    uses: pronamic/actions/.github/workflows/phpstan.yml@main
+
+  psalm:
+    uses: pronamic/actions/.github/workflows/psalm.yml@main
+
+  phpunit:
+    uses: pronamic/actions/.github/workflows/phpunit.yml@main
+
+  coverage:
+    uses: pronamic/actions/.github/workflows/coverage.yml@main
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
deleted file mode 100644
index 31b705fb..00000000
--- a/.github/workflows/main.yaml
+++ /dev/null
@@ -1,336 +0,0 @@
-name: QA
-
-on: [ push, pull_request ]
-
-env:
-  COMPOSER_NO_INTERACTION: 1
-  WP_TESTS_DB_PASS: password
-  php-version: '7.4'
-  wp-version: '*'
-
-jobs:
-  phpcs:
-    name: PHP Coding Standards
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ env.php-version }}
-          extensions: bcmath, intl, mbstring, mysql
-          ini-values: memory_limit=2048M
-          tools: composer, phpcs
-          coverage: none
-
-      - name: Composer validation
-        run: composer validate --strict
-
-      # https://github.com/actions/cache/blob/master/examples.md#php---composer
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-
-
-      - name: Require WordPress
-        run: composer require --dev --no-update --no-progress --no-suggest roots/wordpress:${{ env.wp-version }} wp-phpunit/wp-phpunit:${{ env.wp-version }}
-
-      - name: Install Composer dependencies
-        run: composer update --no-progress --no-suggest
-
-      - name: List Composer packages
-        run: composer show
-
-      - name: PHP Code Sniffer
-        run: composer run-script phpcs
-
-  phpmd:
-    name: PHP Mess Detector
-  
-    runs-on: ubuntu-latest
-  
-    steps:
-      - uses: actions/checkout@v2
-  
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ env.php-version }}
-          extensions: bcmath, intl, mbstring, mysql
-          ini-values: memory_limit=2048M
-          tools: composer
-          coverage: none
-  
-      - name: Composer validation
-        run: composer validate --strict
-  
-      # https://github.com/actions/cache/blob/master/examples.md#php---composer
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: |
-            echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-
-  
-      - name: Require WordPress
-        run: composer require --dev --no-update --no-progress --no-suggest roots/wordpress:${{ env.wp-version }} wp-phpunit/wp-phpunit:${{ env.wp-version }}
-  
-      - name: Install Composer dependencies
-        run: composer update --no-progress --no-suggest
-  
-      - name: List Composer packages
-        run: composer show
-  
-      - name: PHP Mess Detector
-        continue-on-error: true
-        run: composer run-script phpmd
-
-  phpstan:
-    name: PHPStan
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ env.php-version }}
-          extensions: bcmath, intl, mbstring, mysql
-          ini-values: memory_limit=2048M
-          tools: composer
-          coverage: none
-
-      # https://github.com/actions/cache/blob/master/examples.md#php---composer
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-
-
-      - name: Install Composer dependencies
-        run: composer update --no-progress --no-suggest
-
-      - name: Install PHPStan
-        run: composer bin phpstan install
-
-      - name: PHPStan
-        run: composer run-script phpstan
-
-  tests:
-    name: Tests — PHP ${{ matrix.php-version }} ${{ matrix.name }}
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          # PHP Compatibility and WordPress Versions: https://make.wordpress.org/core/handbook/references/php-compatibility-and-wordpress-versions/
-          - name: WP 5.6
-            php-version: 7.4
-            wp-version: 5.6.*
-          - name: WP 5.5
-            php-version: 7.4
-            wp-version: 5.5.*
-          # WordPress and PHP 7.4: https://make.wordpress.org/core/2019/10/11/wordpress-and-php-7-4/.
-          - name: WP 5.4
-            php-version: 7.4
-            wp-version: 5.4.*
-          - name: WP 5.3
-            php-version: 7.4
-            wp-version: 5.3.*
-          - name: Multisite
-            php-version: 7.4
-            WP_MULTISITE: 1
-          - php-version: 7.4
-
-    services:
-      mysql:
-        image: mysql:5.7
-        env:
-          MYSQL_ALLOW_EMPTY_PASSWORD: false
-          MYSQL_ROOT_PASSWORD: password
-          MYSQL_DATABASE: wp_phpunit_tests
-        ports:
-          - 3306/tcp
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          extensions: bcmath, intl, mbstring, mysql
-          ini-values: memory_limit=2048M
-          tools: composer
-          coverage: none
-
-      # https://github.com/actions/cache/blob/master/examples.md#php---composer
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-
-
-      - name: Start MySQL service
-        run: sudo service mysql start
-
-      - name: Require WordPress
-        run: composer require --dev --no-update --no-progress --no-suggest roots/wordpress:${{ matrix.wp-version || env.wp-version }} wp-phpunit/wp-phpunit:${{ matrix.wp-version || env.wp-version }}
-
-      - name: Install Composer dependencies
-        run: composer update --no-progress --no-suggest
-
-      - name: List Composer packages
-        run: composer show
-
-      - name: PHPLint
-        run: composer run-script phplint
-
-      - name: PHPUnit test suite
-        env:
-          WP_TESTS_DB_HOST: 127.0.0.1:${{ job.services.mysql.ports['3306'] }}
-        run: composer run-script phpunit
-
-  code-coverage:
-    name: Code Coverage
-
-    runs-on: ubuntu-latest
-
-    services:
-      mysql:
-        image: mysql:5.7
-        env:
-          MYSQL_ALLOW_EMPTY_PASSWORD: false
-          MYSQL_ROOT_PASSWORD: password
-          MYSQL_DATABASE: wp_phpunit_tests
-        ports:
-          - 3306/tcp
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ env.php-version }}
-          extensions: bcmath, intl, mbstring, mysql
-          ini-values: memory_limit=2048M
-          tools: composer
-          coverage: xdebug
-
-      # https://github.com/actions/cache/blob/master/examples.md#php---composer
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-
-
-      - name: Start MySQL service
-        run: sudo service mysql start
-
-      - name: Require WordPress
-        run: composer require --dev --no-update --no-progress --no-suggest roots/wordpress:${{ env.wp-version }} wp-phpunit/wp-phpunit:${{ env.wp-version }}
-
-      - name: Install Composer dependencies
-        run: composer update --no-progress --no-suggest
-
-      - name: List Composer packages
-        run: composer show
-
-      - name: PHPLint
-        run: composer run-script phplint
-
-      - name: PHPUnit test suite
-        env:
-          WP_TESTS_DB_HOST: 127.0.0.1:${{ job.services.mysql.ports['3306'] }}
-        run: composer run-script coverage
-
-      - name: Publish coverage
-        env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-
-        run: |
-          composer run-script coveralls
-          bash <(curl -s https://codecov.io/bash)
-
-  es-lint:
-    name: Scripts
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      # https://github.com/actions/cache/blob/master/examples.md#macos-and-ubuntu
-      - uses: actions/cache@v2
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
-
-      - uses: actions/setup-node@v1
-        with:
-          node-version: '12'
-
-      - name: Install Node packages
-        run: npm install
-
-      - name: ESLint
-        run: npm run-script eslint
-
-  sass-lint:
-    name: Styles
-  
-    runs-on: ubuntu-latest
-  
-    steps:
-        - uses: actions/checkout@v2
-  
-        # https://github.com/actions/cache/blob/master/examples.md#macos-and-ubuntu
-        - uses: actions/cache@v2
-          with:
-              path: ~/.npm
-              key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-              restore-keys: |
-                  ${{ runner.os }}-node-
-  
-        - uses: actions/setup-node@v1
-          with:
-              node-version: '12'
-  
-        - name: Install Node packages
-          run: npm install
-  
-        - name: Sass Lint
-          run: npm run-script sass-lint

From 14f0dbe3643e28ca358b0d3e8ab9184d664823e8 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Fri, 8 Apr 2022 13:47:29 +0200
Subject: [PATCH 59/87] wip

---
 composer.json                          |   3 +-
 vendor-bin/phpdocumentor/composer.lock |   2 +-
 vendor-bin/phpstan/composer.lock       |  31 +--
 vendor-bin/psalm/composer.lock         | 266 ++++++++++++-------------
 vendor-bin/wp-documentor/composer.lock | 183 ++++++++---------
 5 files changed, 244 insertions(+), 241 deletions(-)

diff --git a/composer.json b/composer.json
index 631b8d4d..fc9fc72f 100644
--- a/composer.json
+++ b/composer.json
@@ -69,10 +69,9 @@
 		"php-stubs/wordpress-globals": "^0.2.0",
 		"php-stubs/wp-cli-stubs": "^2.4",
 		"phpmd/phpmd": "^2.9",
-		"phpunit/phpunit": "^5.7 || ^6.0",
 		"pronamic/wp-coding-standards": "^1.0",
 		"wp-cli/wp-cli": "^2.3",
-		"wp-phpunit/wp-phpunit": ">=5.2",
+		"wp-phpunit/wp-phpunit": "^5.8",
 		"yoast/phpunit-polyfills": "^1.0"
 	},
 	"scripts": {
diff --git a/vendor-bin/phpdocumentor/composer.lock b/vendor-bin/phpdocumentor/composer.lock
index fd0bcbcb..a964422f 100644
--- a/vendor-bin/phpdocumentor/composer.lock
+++ b/vendor-bin/phpdocumentor/composer.lock
@@ -14,5 +14,5 @@
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": [],
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.2.0"
 }
diff --git a/vendor-bin/phpstan/composer.lock b/vendor-bin/phpstan/composer.lock
index c151b94b..0852f5f5 100644
--- a/vendor-bin/phpstan/composer.lock
+++ b/vendor-bin/phpstan/composer.lock
@@ -9,24 +9,27 @@
     "packages-dev": [
         {
             "name": "php-stubs/wordpress-stubs",
-            "version": "v5.8.2",
+            "version": "v5.9.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-stubs/wordpress-stubs.git",
-                "reference": "67fd773742b7be5b4463f40318b0b4890a07033b"
+                "reference": "18d56875e5078a50b8ea4bc4b20b735ca61edeee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-stubs/wordpress-stubs/zipball/67fd773742b7be5b4463f40318b0b4890a07033b",
-                "reference": "67fd773742b7be5b4463f40318b0b4890a07033b",
+                "url": "https://api.github.com/repos/php-stubs/wordpress-stubs/zipball/18d56875e5078a50b8ea4bc4b20b735ca61edeee",
+                "reference": "18d56875e5078a50b8ea4bc4b20b735ca61edeee",
                 "shasum": ""
             },
             "replace": {
                 "giacocorsiglia/wordpress-stubs": "*"
             },
             "require-dev": {
-                "giacocorsiglia/stubs-generator": "^0.5.0",
-                "php": "~7.1"
+                "nikic/php-parser": "< 4.12.0",
+                "php": "~7.3 || ~8.0",
+                "php-stubs/generator": "^0.8.1",
+                "phpdocumentor/reflection-docblock": "^5.3",
+                "phpstan/phpstan": "^1.2"
             },
             "suggest": {
                 "paragonie/sodium_compat": "Pure PHP implementation of libsodium",
@@ -47,9 +50,9 @@
             ],
             "support": {
                 "issues": "https://github.com/php-stubs/wordpress-stubs/issues",
-                "source": "https://github.com/php-stubs/wordpress-stubs/tree/v5.8.2"
+                "source": "https://github.com/php-stubs/wordpress-stubs/tree/v5.9.3"
             },
-            "time": "2021-11-11T13:57:00+00:00"
+            "time": "2022-04-06T15:33:59+00:00"
         },
         {
             "name": "phpstan/phpstan",
@@ -117,7 +120,7 @@
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
@@ -143,12 +146,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php73\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php73\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -176,7 +179,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php73/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-php73/tree/v1.25.0"
             },
             "funding": [
                 {
@@ -266,5 +269,5 @@
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": [],
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.2.0"
 }
diff --git a/vendor-bin/psalm/composer.lock b/vendor-bin/psalm/composer.lock
index cc9e5ae3..4d0ed7a7 100644
--- a/vendor-bin/psalm/composer.lock
+++ b/vendor-bin/psalm/composer.lock
@@ -9,16 +9,16 @@
     "packages-dev": [
         {
             "name": "amphp/amp",
-            "version": "v2.6.1",
+            "version": "v2.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/amphp/amp.git",
-                "reference": "c5fc66a78ee38d7ac9195a37bacaf940eb3f65ae"
+                "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/amphp/amp/zipball/c5fc66a78ee38d7ac9195a37bacaf940eb3f65ae",
-                "reference": "c5fc66a78ee38d7ac9195a37bacaf940eb3f65ae",
+                "url": "https://api.github.com/repos/amphp/amp/zipball/9d5100cebffa729aaffecd3ad25dc5aeea4f13bb",
+                "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb",
                 "shasum": ""
             },
             "require": {
@@ -40,13 +40,13 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Amp\\": "lib"
-                },
                 "files": [
                     "lib/functions.php",
                     "lib/Internal/functions.php"
-                ]
+                ],
+                "psr-4": {
+                    "Amp\\": "lib"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -71,7 +71,7 @@
                 }
             ],
             "description": "A non-blocking concurrency framework for PHP applications.",
-            "homepage": "http://amphp.org/amp",
+            "homepage": "https://amphp.org/amp",
             "keywords": [
                 "async",
                 "asynchronous",
@@ -86,7 +86,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/amphp",
                 "issues": "https://github.com/amphp/amp/issues",
-                "source": "https://github.com/amphp/amp/tree/v2.6.1"
+                "source": "https://github.com/amphp/amp/tree/v2.6.2"
             },
             "funding": [
                 {
@@ -94,7 +94,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-09-23T18:43:08+00:00"
+            "time": "2022-02-20T17:52:18+00:00"
         },
         {
             "name": "amphp/byte-stream",
@@ -129,12 +129,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Amp\\ByteStream\\": "lib"
-                },
                 "files": [
                     "lib/functions.php"
-                ]
+                ],
+                "psr-4": {
+                    "Amp\\ByteStream\\": "lib"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -175,16 +175,16 @@
         },
         {
             "name": "composer/package-versions-deprecated",
-            "version": "1.11.99.4",
+            "version": "1.11.99.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/package-versions-deprecated.git",
-                "reference": "b174585d1fe49ceed21928a945138948cb394600"
+                "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b174585d1fe49ceed21928a945138948cb394600",
-                "reference": "b174585d1fe49ceed21928a945138948cb394600",
+                "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b4f54f74ef3453349c24a845d22392cd31e65f1d",
+                "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d",
                 "shasum": ""
             },
             "require": {
@@ -228,7 +228,7 @@
             "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)",
             "support": {
                 "issues": "https://github.com/composer/package-versions-deprecated/issues",
-                "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.4"
+                "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.5"
             },
             "funding": [
                 {
@@ -244,34 +244,34 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-13T08:41:34+00:00"
+            "time": "2022-01-17T14:14:24+00:00"
         },
         {
             "name": "composer/pcre",
-            "version": "1.0.0",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/pcre.git",
-                "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2"
+                "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/3d322d715c43a1ac36c7fe215fa59336265500f2",
-                "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/e300eb6c535192decd27a85bc72a9290f0d6b3bd",
+                "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.2 || ^7.0 || ^8.0"
+                "php": "^7.4 || ^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1",
+                "phpstan/phpstan": "^1.3",
                 "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^4.2 || ^5"
+                "symfony/phpunit-bridge": "^5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.x-dev"
+                    "dev-main": "3.x-dev"
                 }
             },
             "autoload": {
@@ -299,7 +299,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/1.0.0"
+                "source": "https://github.com/composer/pcre/tree/3.0.0"
             },
             "funding": [
                 {
@@ -315,27 +315,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-06T15:17:27+00:00"
+            "time": "2022-02-25T20:21:48+00:00"
         },
         {
             "name": "composer/semver",
-            "version": "3.2.7",
+            "version": "3.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "deac27056b57e46faf136fae7b449eeaa71661ee"
+                "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/deac27056b57e46faf136fae7b449eeaa71661ee",
-                "reference": "deac27056b57e46faf136fae7b449eeaa71661ee",
+                "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9",
+                "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3.2 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^0.12.54",
+                "phpstan/phpstan": "^1.4",
                 "symfony/phpunit-bridge": "^4.2 || ^5"
             },
             "type": "library",
@@ -380,7 +380,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/semver/issues",
-                "source": "https://github.com/composer/semver/tree/3.2.7"
+                "source": "https://github.com/composer/semver/tree/3.3.2"
             },
             "funding": [
                 {
@@ -396,24 +396,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-04T09:57:54+00:00"
+            "time": "2022-04-01T19:23:25+00:00"
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "3.0.1",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "12f1b79476638a5615ed00ea6adbb269cec96fd8"
+                "reference": "ced299686f41dce890debac69273b47ffe98a40c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/12f1b79476638a5615ed00ea6adbb269cec96fd8",
-                "reference": "12f1b79476638a5615ed00ea6adbb269cec96fd8",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c",
+                "reference": "ced299686f41dce890debac69273b47ffe98a40c",
                 "shasum": ""
             },
             "require": {
-                "composer/pcre": "^1",
+                "composer/pcre": "^1 || ^2 || ^3",
                 "php": "^7.2.5 || ^8.0",
                 "psr/log": "^1 || ^2 || ^3"
             },
@@ -446,7 +446,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/3.0.1"
+                "source": "https://github.com/composer/xdebug-handler/tree/3.0.3"
             },
             "funding": [
                 {
@@ -462,7 +462,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-04T18:29:42+00:00"
+            "time": "2022-02-25T21:32:43+00:00"
         },
         {
             "name": "dnoegel/php-xdg-base-dir",
@@ -548,16 +548,16 @@
         },
         {
             "name": "felixfbecker/language-server-protocol",
-            "version": "1.5.1",
+            "version": "v1.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/felixfbecker/php-language-server-protocol.git",
-                "reference": "9d846d1f5cf101deee7a61c8ba7caa0a975cd730"
+                "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/9d846d1f5cf101deee7a61c8ba7caa0a975cd730",
-                "reference": "9d846d1f5cf101deee7a61c8ba7caa0a975cd730",
+                "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/6e82196ffd7c62f7794d778ca52b69feec9f2842",
+                "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842",
                 "shasum": ""
             },
             "require": {
@@ -598,9 +598,9 @@
             ],
             "support": {
                 "issues": "https://github.com/felixfbecker/php-language-server-protocol/issues",
-                "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/1.5.1"
+                "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/v1.5.2"
             },
-            "time": "2021-02-22T14:02:09+00:00"
+            "time": "2022-03-02T22:36:06+00:00"
         },
         {
             "name": "netresearch/jsonmapper",
@@ -874,16 +874,16 @@
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.6.0",
+            "version": "1.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706"
+                "reference": "77a32518733312af16a44300404e945338981de3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706",
-                "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3",
+                "reference": "77a32518733312af16a44300404e945338981de3",
                 "shasum": ""
             },
             "require": {
@@ -918,9 +918,9 @@
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
             "support": {
                 "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.0"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1"
             },
-            "time": "2022-01-04T19:58:01+00:00"
+            "time": "2022-03-15T21:29:03+00:00"
         },
         {
             "name": "psr/container",
@@ -1088,16 +1088,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.4.2",
+            "version": "v5.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "a2c6b7ced2eb7799a35375fb9022519282b5405e"
+                "reference": "900275254f0a1a2afff1ab0e11abd5587a10e1d6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/a2c6b7ced2eb7799a35375fb9022519282b5405e",
-                "reference": "a2c6b7ced2eb7799a35375fb9022519282b5405e",
+                "url": "https://api.github.com/repos/symfony/console/zipball/900275254f0a1a2afff1ab0e11abd5587a10e1d6",
+                "reference": "900275254f0a1a2afff1ab0e11abd5587a10e1d6",
                 "shasum": ""
             },
             "require": {
@@ -1167,7 +1167,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.2"
+                "source": "https://github.com/symfony/console/tree/v5.4.7"
             },
             "funding": [
                 {
@@ -1183,20 +1183,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-20T16:11:12+00:00"
+            "time": "2022-03-31T17:09:19+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v2.5.0",
+            "version": "v2.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8"
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8",
-                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
                 "shasum": ""
             },
             "require": {
@@ -1234,7 +1234,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.1"
             },
             "funding": [
                 {
@@ -1250,11 +1250,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-12T14:48:14+00:00"
+            "time": "2022-01-02T09:53:40+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
@@ -1286,12 +1286,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1316,7 +1316,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0"
             },
             "funding": [
                 {
@@ -1336,7 +1336,7 @@
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
@@ -1365,12 +1365,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1397,7 +1397,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.25.0"
             },
             "funding": [
                 {
@@ -1417,7 +1417,7 @@
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
@@ -1446,12 +1446,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -1481,7 +1481,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.25.0"
             },
             "funding": [
                 {
@@ -1501,7 +1501,7 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
@@ -1533,12 +1533,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1564,7 +1564,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0"
             },
             "funding": [
                 {
@@ -1584,7 +1584,7 @@
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
@@ -1610,12 +1610,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php73\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php73\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -1643,7 +1643,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php73/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-php73/tree/v1.25.0"
             },
             "funding": [
                 {
@@ -1663,16 +1663,16 @@
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9"
+                "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9",
-                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c",
+                "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c",
                 "shasum": ""
             },
             "require": {
@@ -1689,12 +1689,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -1726,7 +1726,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.25.0"
             },
             "funding": [
                 {
@@ -1742,26 +1742,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-13T13:58:33+00:00"
+            "time": "2022-03-04T08:16:47+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.5.0",
+            "version": "v2.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc"
+                "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc",
-                "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c",
+                "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
                 "psr/container": "^1.1",
-                "symfony/deprecation-contracts": "^2.1"
+                "symfony/deprecation-contracts": "^2.1|^3"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2"
@@ -1809,7 +1809,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v2.5.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v2.5.1"
             },
             "funding": [
                 {
@@ -1825,20 +1825,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-04T16:48:04+00:00"
+            "time": "2022-03-13T20:07:29+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v5.4.2",
+            "version": "v5.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d"
+                "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d",
-                "reference": "e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d",
+                "url": "https://api.github.com/repos/symfony/string/zipball/92043b7d8383e48104e411bc9434b260dbeb5a10",
+                "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10",
                 "shasum": ""
             },
             "require": {
@@ -1860,12 +1860,12 @@
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\String\\": ""
-                },
                 "files": [
                     "Resources/functions.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Component\\String\\": ""
+                },
                 "exclude-from-classmap": [
                     "/Tests/"
                 ]
@@ -1895,7 +1895,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v5.4.2"
+                "source": "https://github.com/symfony/string/tree/v5.4.3"
             },
             "funding": [
                 {
@@ -1911,20 +1911,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-16T21:52:00+00:00"
+            "time": "2022-01-02T09:53:40+00:00"
         },
         {
             "name": "vimeo/psalm",
-            "version": "4.18.1",
+            "version": "4.22.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vimeo/psalm.git",
-                "reference": "dda05fa913f4dc6eb3386f2f7ce5a45d37a71bcb"
+                "reference": "fc2c6ab4d5fa5d644d8617089f012f3bb84b8703"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vimeo/psalm/zipball/dda05fa913f4dc6eb3386f2f7ce5a45d37a71bcb",
-                "reference": "dda05fa913f4dc6eb3386f2f7ce5a45d37a71bcb",
+                "url": "https://api.github.com/repos/vimeo/psalm/zipball/fc2c6ab4d5fa5d644d8617089f012f3bb84b8703",
+                "reference": "fc2c6ab4d5fa5d644d8617089f012f3bb84b8703",
                 "shasum": ""
             },
             "require": {
@@ -1990,13 +1990,13 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Psalm\\": "src/Psalm/"
-                },
                 "files": [
                     "src/functions.php",
                     "src/spl_object_id.php"
-                ]
+                ],
+                "psr-4": {
+                    "Psalm\\": "src/Psalm/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -2015,9 +2015,9 @@
             ],
             "support": {
                 "issues": "https://github.com/vimeo/psalm/issues",
-                "source": "https://github.com/vimeo/psalm/tree/4.18.1"
+                "source": "https://github.com/vimeo/psalm/tree/4.22.0"
             },
-            "time": "2022-01-08T21:21:26+00:00"
+            "time": "2022-02-24T20:34:05+00:00"
         },
         {
             "name": "webmozart/assert",
@@ -2136,5 +2136,5 @@
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": [],
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.2.0"
 }
diff --git a/vendor-bin/wp-documentor/composer.lock b/vendor-bin/wp-documentor/composer.lock
index 70816ecd..063b969c 100644
--- a/vendor-bin/wp-documentor/composer.lock
+++ b/vendor-bin/wp-documentor/composer.lock
@@ -230,16 +230,16 @@
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.6.0",
+            "version": "1.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706"
+                "reference": "77a32518733312af16a44300404e945338981de3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706",
-                "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3",
+                "reference": "77a32518733312af16a44300404e945338981de3",
                 "shasum": ""
             },
             "require": {
@@ -274,22 +274,22 @@
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
             "support": {
                 "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.0"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1"
             },
-            "time": "2022-01-04T19:58:01+00:00"
+            "time": "2022-03-15T21:29:03+00:00"
         },
         {
             "name": "pronamic/wp-documentor",
-            "version": "1.1.1",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pronamic/wp-documentor.git",
-                "reference": "886d98c3bf3ca7eba8dc84061e98a25cc98d6d0c"
+                "reference": "44b4d32e83dc478d2090168fcf5972f6954986f5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pronamic/wp-documentor/zipball/886d98c3bf3ca7eba8dc84061e98a25cc98d6d0c",
-                "reference": "886d98c3bf3ca7eba8dc84061e98a25cc98d6d0c",
+                "url": "https://api.github.com/repos/pronamic/wp-documentor/zipball/44b4d32e83dc478d2090168fcf5972f6954986f5",
+                "reference": "44b4d32e83dc478d2090168fcf5972f6954986f5",
                 "shasum": ""
             },
             "require": {
@@ -297,7 +297,8 @@
                 "phpdocumentor/reflection-docblock": "^5.2",
                 "symfony/console": "^5.2",
                 "symfony/filesystem": "^5.2",
-                "symfony/finder": "^5.2"
+                "symfony/finder": "^5.2",
+                "symfony/polyfill-php80": "^1.24"
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.4",
@@ -346,9 +347,9 @@
             ],
             "support": {
                 "issues": "https://github.com/pronamic/wp-documentor/issues",
-                "source": "https://github.com/pronamic/wp-documentor/tree/1.1.1"
+                "source": "https://github.com/pronamic/wp-documentor/tree/1.2.0"
             },
-            "time": "2021-06-10T11:09:50+00:00"
+            "time": "2022-01-27T10:08:26+00:00"
         },
         {
             "name": "psr/container",
@@ -450,16 +451,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.4.2",
+            "version": "v5.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "a2c6b7ced2eb7799a35375fb9022519282b5405e"
+                "reference": "900275254f0a1a2afff1ab0e11abd5587a10e1d6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/a2c6b7ced2eb7799a35375fb9022519282b5405e",
-                "reference": "a2c6b7ced2eb7799a35375fb9022519282b5405e",
+                "url": "https://api.github.com/repos/symfony/console/zipball/900275254f0a1a2afff1ab0e11abd5587a10e1d6",
+                "reference": "900275254f0a1a2afff1ab0e11abd5587a10e1d6",
                 "shasum": ""
             },
             "require": {
@@ -529,7 +530,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.2"
+                "source": "https://github.com/symfony/console/tree/v5.4.7"
             },
             "funding": [
                 {
@@ -545,20 +546,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-20T16:11:12+00:00"
+            "time": "2022-03-31T17:09:19+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v2.5.0",
+            "version": "v2.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8"
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8",
-                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
                 "shasum": ""
             },
             "require": {
@@ -596,7 +597,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.1"
             },
             "funding": [
                 {
@@ -612,20 +613,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-12T14:48:14+00:00"
+            "time": "2022-01-02T09:53:40+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.4.0",
+            "version": "v5.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "731f917dc31edcffec2c6a777f3698c33bea8f01"
+                "reference": "3a4442138d80c9f7b600fb297534ac718b61d37f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/731f917dc31edcffec2c6a777f3698c33bea8f01",
-                "reference": "731f917dc31edcffec2c6a777f3698c33bea8f01",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/3a4442138d80c9f7b600fb297534ac718b61d37f",
+                "reference": "3a4442138d80c9f7b600fb297534ac718b61d37f",
                 "shasum": ""
             },
             "require": {
@@ -660,7 +661,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v5.4.0"
+                "source": "https://github.com/symfony/filesystem/tree/v5.4.7"
             },
             "funding": [
                 {
@@ -676,20 +677,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-28T13:39:27+00:00"
+            "time": "2022-04-01T12:33:59+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v5.4.2",
+            "version": "v5.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "e77046c252be48c48a40816187ed527703c8f76c"
+                "reference": "231313534dded84c7ecaa79d14bc5da4ccb69b7d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/e77046c252be48c48a40816187ed527703c8f76c",
-                "reference": "e77046c252be48c48a40816187ed527703c8f76c",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/231313534dded84c7ecaa79d14bc5da4ccb69b7d",
+                "reference": "231313534dded84c7ecaa79d14bc5da4ccb69b7d",
                 "shasum": ""
             },
             "require": {
@@ -723,7 +724,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v5.4.2"
+                "source": "https://github.com/symfony/finder/tree/v5.4.3"
             },
             "funding": [
                 {
@@ -739,11 +740,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-15T11:06:13+00:00"
+            "time": "2022-01-26T16:34:36+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
@@ -775,12 +776,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -805,7 +806,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0"
             },
             "funding": [
                 {
@@ -825,7 +826,7 @@
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
@@ -854,12 +855,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -886,7 +887,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.25.0"
             },
             "funding": [
                 {
@@ -906,7 +907,7 @@
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
@@ -935,12 +936,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -970,7 +971,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.25.0"
             },
             "funding": [
                 {
@@ -990,7 +991,7 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
@@ -1022,12 +1023,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1053,7 +1054,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0"
             },
             "funding": [
                 {
@@ -1073,7 +1074,7 @@
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
@@ -1099,12 +1100,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php73\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php73\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -1132,7 +1133,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php73/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-php73/tree/v1.25.0"
             },
             "funding": [
                 {
@@ -1152,16 +1153,16 @@
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9"
+                "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9",
-                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c",
+                "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c",
                 "shasum": ""
             },
             "require": {
@@ -1178,12 +1179,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -1215,7 +1216,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.25.0"
             },
             "funding": [
                 {
@@ -1231,26 +1232,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-13T13:58:33+00:00"
+            "time": "2022-03-04T08:16:47+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.5.0",
+            "version": "v2.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc"
+                "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc",
-                "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c",
+                "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
                 "psr/container": "^1.1",
-                "symfony/deprecation-contracts": "^2.1"
+                "symfony/deprecation-contracts": "^2.1|^3"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2"
@@ -1298,7 +1299,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v2.5.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v2.5.1"
             },
             "funding": [
                 {
@@ -1314,20 +1315,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-04T16:48:04+00:00"
+            "time": "2022-03-13T20:07:29+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v5.4.2",
+            "version": "v5.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d"
+                "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d",
-                "reference": "e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d",
+                "url": "https://api.github.com/repos/symfony/string/zipball/92043b7d8383e48104e411bc9434b260dbeb5a10",
+                "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10",
                 "shasum": ""
             },
             "require": {
@@ -1349,12 +1350,12 @@
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\String\\": ""
-                },
                 "files": [
                     "Resources/functions.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Component\\String\\": ""
+                },
                 "exclude-from-classmap": [
                     "/Tests/"
                 ]
@@ -1384,7 +1385,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v5.4.2"
+                "source": "https://github.com/symfony/string/tree/v5.4.3"
             },
             "funding": [
                 {
@@ -1400,7 +1401,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-16T21:52:00+00:00"
+            "time": "2022-01-02T09:53:40+00:00"
         },
         {
             "name": "webmozart/assert",
@@ -1469,5 +1470,5 @@
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": [],
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.2.0"
 }

From c6cda45cdea9452888afd6ff9c69679695d09c01 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Fri, 8 Apr 2022 13:49:58 +0200
Subject: [PATCH 60/87] wip

---
 vendor-bin/phpstan/composer.json |  4 ++--
 vendor-bin/phpstan/composer.lock | 40 ++++++++++++++------------------
 vendor-bin/psalm/composer.json   |  2 +-
 vendor-bin/psalm/composer.lock   |  2 +-
 4 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/vendor-bin/phpstan/composer.json b/vendor-bin/phpstan/composer.json
index ec6f3e59..aa8c32c8 100644
--- a/vendor-bin/phpstan/composer.json
+++ b/vendor-bin/phpstan/composer.json
@@ -1,6 +1,6 @@
 {
 	"require-dev": {
-		"phpstan/phpstan": "^0.12",
-		"szepeviktor/phpstan-wordpress": "^0.7"
+		"phpstan/phpstan": "^1.5",
+		"szepeviktor/phpstan-wordpress": "^1.0"
 	}
 }
diff --git a/vendor-bin/phpstan/composer.lock b/vendor-bin/phpstan/composer.lock
index 0852f5f5..3b2ebeb6 100644
--- a/vendor-bin/phpstan/composer.lock
+++ b/vendor-bin/phpstan/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f2975d5a40e0b75bbe13237236457f2a",
+    "content-hash": "a8c094fd3b61fe8d2943568d809a7654",
     "packages": [],
     "packages-dev": [
         {
@@ -56,20 +56,20 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "0.12.99",
+            "version": "1.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "b4d40f1d759942f523be267a1bab6884f46ca3f7"
+                "reference": "bbf68cae24f6dc023c607ea0f87da55dd9d55c2b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b4d40f1d759942f523be267a1bab6884f46ca3f7",
-                "reference": "b4d40f1d759942f523be267a1bab6884f46ca3f7",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/bbf68cae24f6dc023c607ea0f87da55dd9d55c2b",
+                "reference": "bbf68cae24f6dc023c607ea0f87da55dd9d55c2b",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1|^8.0"
+                "php": "^7.2|^8.0"
             },
             "conflict": {
                 "phpstan/phpstan-shim": "*"
@@ -79,11 +79,6 @@
                 "phpstan.phar"
             ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.12-dev"
-                }
-            },
             "autoload": {
                 "files": [
                     "bootstrap.php"
@@ -96,7 +91,7 @@
             "description": "PHPStan - PHP Static Analysis Tool",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/0.12.99"
+                "source": "https://github.com/phpstan/phpstan/tree/1.5.4"
             },
             "funding": [
                 {
@@ -116,7 +111,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-12T20:09:55+00:00"
+            "time": "2022-04-03T12:39:00+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
@@ -199,29 +194,30 @@
         },
         {
             "name": "szepeviktor/phpstan-wordpress",
-            "version": "v0.7.7",
+            "version": "v1.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/szepeviktor/phpstan-wordpress.git",
-                "reference": "bdbea69b2ba4a69998c3b6fe2b7106d78a23bd72"
+                "reference": "d4dbd21fc057702be14d221e9ecb6e5697e39fed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/szepeviktor/phpstan-wordpress/zipball/bdbea69b2ba4a69998c3b6fe2b7106d78a23bd72",
-                "reference": "bdbea69b2ba4a69998c3b6fe2b7106d78a23bd72",
+                "url": "https://api.github.com/repos/szepeviktor/phpstan-wordpress/zipball/d4dbd21fc057702be14d221e9ecb6e5697e39fed",
+                "reference": "d4dbd21fc057702be14d221e9ecb6e5697e39fed",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0",
                 "php-stubs/wordpress-stubs": "^4.7 || ^5.0",
-                "phpstan/phpstan": "^0.12.26",
+                "phpstan/phpstan": "^1.0",
                 "symfony/polyfill-php73": "^1.12.0"
             },
             "require-dev": {
-                "composer/composer": "^1.10.22",
+                "composer/composer": "^2.1.12",
                 "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
                 "php-parallel-lint/php-parallel-lint": "^1.1",
-                "phpstan/phpstan-strict-rules": "^0.12",
+                "phpstan/phpstan-strict-rules": "^1.0",
+                "phpunit/phpunit": "^7 || ^9",
                 "szepeviktor/phpcs-psr-12-neutron-hybrid-ruleset": "^0.6"
             },
             "type": "phpstan-extension",
@@ -251,7 +247,7 @@
             ],
             "support": {
                 "issues": "https://github.com/szepeviktor/phpstan-wordpress/issues",
-                "source": "https://github.com/szepeviktor/phpstan-wordpress/tree/v0.7.7"
+                "source": "https://github.com/szepeviktor/phpstan-wordpress/tree/v1.0.5"
             },
             "funding": [
                 {
@@ -259,7 +255,7 @@
                     "type": "custom"
                 }
             ],
-            "time": "2021-07-14T09:19:15+00:00"
+            "time": "2022-04-05T03:13:59+00:00"
         }
     ],
     "aliases": [],
diff --git a/vendor-bin/psalm/composer.json b/vendor-bin/psalm/composer.json
index 15ae5f9c..4d819d66 100644
--- a/vendor-bin/psalm/composer.json
+++ b/vendor-bin/psalm/composer.json
@@ -1,5 +1,5 @@
 {
     "require-dev": {
-        "vimeo/psalm": "^4.4"
+        "vimeo/psalm": "^4.22"
     }
 }
diff --git a/vendor-bin/psalm/composer.lock b/vendor-bin/psalm/composer.lock
index 4d0ed7a7..d7075015 100644
--- a/vendor-bin/psalm/composer.lock
+++ b/vendor-bin/psalm/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "aaf74fed29daecaaea5f94735f2c60ab",
+    "content-hash": "97cb95f5755b850e2a32046981aa04e5",
     "packages": [],
     "packages-dev": [
         {

From f7282db77420c66d36d510c2cb6c392ca6bb558e Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Fri, 8 Apr 2022 13:56:04 +0200
Subject: [PATCH 61/87] Fix tests?

---
 .gitignore                              | 3 +++
 tests/src/AddressTest.php               | 8 +++++---
 tests/src/CustomerTest.php              | 8 +++++---
 tests/src/Payments/PaymentLinesTest.php | 8 +++++---
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index bbf61175..ab0e284a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,6 @@
 # WordPress
 /wordpress/
 /wp-content/
+
+# PHPUnit
+/.phpunit.result.cache
diff --git a/tests/src/AddressTest.php b/tests/src/AddressTest.php
index ba28da5b..771e5287 100644
--- a/tests/src/AddressTest.php
+++ b/tests/src/AddressTest.php
@@ -10,7 +10,7 @@
 
 namespace Pronamic\WordPress\Pay;
 
-use WP_UnitTestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 /**
  * Address test
@@ -19,7 +19,7 @@
  * @version 2.1.0
  * @since   2.1.0
  */
-class AddressTest extends WP_UnitTestCase {
+class AddressTest extends TestCase {
 	/**
 	 * Address.
 	 *
@@ -37,7 +37,9 @@ class AddressTest extends WP_UnitTestCase {
 	/**
 	 * Setup.
 	 */
-	public function setUp() {
+	public function set_up() {
+		parent::set_up();
+
 		$this->address = new Address();
 
 		$this->name = new ContactName();
diff --git a/tests/src/CustomerTest.php b/tests/src/CustomerTest.php
index 10f4f3b2..d9510c4a 100644
--- a/tests/src/CustomerTest.php
+++ b/tests/src/CustomerTest.php
@@ -14,7 +14,7 @@
 use Pronamic\WordPress\Pay\VatNumbers\VatNumber;
 use Pronamic\WordPress\Pay\VatNumbers\VatNumberValidity;
 use Pronamic\WordPress\Pay\VatNumbers\VatNumberValidationService;
-use WP_UnitTestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 /**
  * Customer test
@@ -22,7 +22,7 @@
  * @author Remco Tolsma
  * @version 2.4.0
  */
-class CustomerTest extends WP_UnitTestCase {
+class CustomerTest extends TestCase {
 	/**
 	 * Customer.
 	 *
@@ -40,7 +40,9 @@ class CustomerTest extends WP_UnitTestCase {
 	/**
 	 * Setup.
 	 */
-	public function setUp() {
+	public function set_up() {
+		parent::set_up();
+
 		$this->customer = new Customer();
 
 		$this->name = new ContactName();
diff --git a/tests/src/Payments/PaymentLinesTest.php b/tests/src/Payments/PaymentLinesTest.php
index 25a4fd9a..cbff6159 100644
--- a/tests/src/Payments/PaymentLinesTest.php
+++ b/tests/src/Payments/PaymentLinesTest.php
@@ -11,7 +11,7 @@
 namespace Pronamic\WordPress\Pay\Payments;
 
 use Pronamic\WordPress\Money\TaxedMoney;
-use WP_UnitTestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 /**
  * Payment lines test
@@ -20,7 +20,7 @@
  * @version 2.1.0
  * @since   1.0.0
  */
-class PaymentLinesTest extends WP_UnitTestCase {
+class PaymentLinesTest extends TestCase {
 	/**
 	 * Lines.
 	 *
@@ -31,7 +31,9 @@ class PaymentLinesTest extends WP_UnitTestCase {
 	/**
 	 * Setup.
 	 */
-	public function setUp() {
+	public function set_up() {
+		parent::set_up();
+
 		$this->lines = new PaymentLines();
 
 		$line_a = new PaymentLine();

From 8f6176a7cc6e6e7549fbe02bd386666a059add9c Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Fri, 8 Apr 2022 14:05:37 +0200
Subject: [PATCH 62/87] Update composer.json

---
 composer.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/composer.json b/composer.json
index fc9fc72f..72934ecf 100644
--- a/composer.json
+++ b/composer.json
@@ -101,6 +101,11 @@
 		],
 		"build-docs": [
 			"XDEBUG_MODE=off vendor/bin/wp-documentor parse src --format=markdown --relative=docs > docs/hooks.md"
+		],
+		"post-install-cmd": "echo 'Optionally run: composer bin all install'",
+		"post-update-cmd": [
+			"echo 'Optionally run: composer bin all update'",
+			"php -r \"copy('vendor/automattic/wordbless/src/dbless-wpdb.php', 'wordpress/wp-content/db.php');\""
 		]
 	}
 }

From 95d971226be7cae3824e69b6fa0a5afdda84599d Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Fri, 8 Apr 2022 14:19:39 +0200
Subject: [PATCH 63/87] Update composer.json

---
 composer.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/composer.json b/composer.json
index 72934ecf..ee6a0f4f 100644
--- a/composer.json
+++ b/composer.json
@@ -92,8 +92,6 @@
 		"phpmd": "vendor/bin/phpmd src,tests text phpmd.ruleset.xml --suffixes php",
 		"phpstan": "vendor/bin/phpstan analyse --memory-limit=-1",
 		"phpunit": "vendor/bin/phpunit --colors=always",
-		"post-install-cmd": "echo 'Optionally run: composer bin all install'",
-		"post-update-cmd": "echo 'Optionally run: composer bin all update'",
 		"psalm": "vendor/bin/psalm",
 		"xmllint-phpcs": "xmllint --noout --schema vendor/squizlabs/php_codesniffer/phpcs.xsd phpcs.xml.dist",
 		"xmllint": [

From bb9034763eddef5a663408062cfa428439863d43 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Fri, 8 Apr 2022 15:19:16 +0200
Subject: [PATCH 64/87] Fixing tests.

---
 composer.json                                 |  2 +-
 tests/bootstrap.php                           | 41 +++----------
 tests/json/subscription.json                  |  1 +
 tests/src/AbstractGatewayIntegrationTest.php  |  4 +-
 tests/src/AbstractPluginIntegrationTest.php   |  4 +-
 tests/src/AddressHelperTest.php               |  4 +-
 tests/src/Banks/BankAccountDetailsTest.php    |  2 +-
 tests/src/Banks/BankTransferDetailsTest.php   |  2 +-
 tests/src/ContactNameHelperTest.php           |  4 +-
 tests/src/ContactNameTest.php                 |  4 +-
 tests/src/Core/ServerTest.php                 |  4 +-
 tests/src/Core/UtilTest.php                   |  4 +-
 tests/src/CountryTest.php                     |  4 +-
 tests/src/CreditCardTest.php                  |  4 +-
 tests/src/CustomerHelperTest.php              |  4 +-
 tests/src/Dependencies/DependenciesTest.php   |  4 +-
 tests/src/Dependencies/DependencyTest.php     |  4 +-
 tests/src/Dependencies/PhpDependencyTest.php  |  4 +-
 .../PhpExtensionDependencyTest.php            |  4 +-
 .../Dependencies/WordPressDependencyTest.php  |  4 +-
 tests/src/HouseNumberTest.php                 |  4 +-
 tests/src/JavaScriptFilesTest.php             |  4 +-
 tests/src/MoneyJsonTransformerTest.php        |  2 +-
 tests/src/Payments/FailureReasonTest.php      |  4 +-
 tests/src/Payments/PaymentLineTest.php        |  4 +-
 tests/src/Payments/PaymentTest.php            |  4 +-
 tests/src/RegionTest.php                      |  4 +-
 tests/src/Subscriptions/AlignmentRuleTest.php |  4 +-
 .../Subscriptions/SubscriptionHelperTest.php  |  3 +-
 .../SubscriptionIntervalTest.php              |  4 +-
 .../Subscriptions/SubscriptionPhaseTest.php   |  3 +-
 .../SubscriptionPhasesTraitTest.php           |  3 +-
 tests/src/Subscriptions/SubscriptionTest.php  |  4 +-
 .../SubscriptionsCompletionControllerTest.php |  3 +-
 ...riptionsFollowUpPaymentsControllerTest.php |  5 +-
 ...bscriptionsNotificationsControllerTest.php |  3 +-
 tests/src/TrackingModuleTest.php              |  4 +-
 tests/src/VatNumbers/VatNumberTest.php        |  4 +-
 .../src/VatNumbers/VatNumberValidityTest.php  |  4 +-
 tests/wp-config.php                           | 61 -------------------
 40 files changed, 99 insertions(+), 140 deletions(-)
 delete mode 100644 tests/wp-config.php

diff --git a/composer.json b/composer.json
index ee6a0f4f..6cd106a1 100644
--- a/composer.json
+++ b/composer.json
@@ -57,7 +57,7 @@
 		"pronamic/wp-http": "^1.0",
 		"pronamic/wp-money": "^2.0",
 		"pronamic/wp-number": "^1.1",
-		"roots/wordpress": "^5.2",
+		"roots/wordpress": "^5.9",
 		"viison/address-splitter": "^0.3.4",
 		"woocommerce/action-scheduler": "^3.0"
 	},
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index af8c6be0..b6cf3484 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -8,46 +8,23 @@
  * @package   Pronamic\WordPress\Pay\Core
  */
 
-putenv( 'WP_PHPUNIT__TESTS_CONFIG=tests/wp-config.php' );
-
 /**
  * Composer.
  */
 require_once __DIR__ . '/../vendor/autoload.php';
 
 /**
- * WP CLI.
- *
- * @link https://polevaultweb.com/2016/11/unit-testing-custom-wp-cli-commands/
- * @link https://github.com/polevaultweb/phpunit-wp-cli-runner
+ * WorDBless.
  */
-if ( ! defined( 'WP_CLI_ROOT' ) ) {
-	define( 'WP_CLI_ROOT', __DIR__ . '/../vendor/wp-cli/wp-cli' );
-}
-
-include WP_CLI_ROOT . '/php/class-wp-cli.php';
+\WorDBless\Load::load();
 
 /**
- * WP PHPUnit.
- *
- * @link https://github.com/wp-phpunit/wp-phpunit
+ * Plugin.
  */
-require_once getenv( 'WP_PHPUNIT__DIR' ) . '/includes/functions.php';
-
-/**
- * Manually load plugin.
- */
-function _manually_load_plugin() {
-	global $pronamic_ideal;
-
-	$pronamic_ideal = \Pronamic\WordPress\Pay\Plugin::instance(
-		array(
-			'action_scheduler' => __DIR__ . '/../wp-content/plugins/action-scheduler/action-scheduler.php',
-		)
-	);
-}
-
-tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' );
+$plugin = \Pronamic\WordPress\Pay\Plugin::instance(
+    array(
+        'action_scheduler' => __DIR__ . '/../wp-content/plugins/action-scheduler/action-scheduler.php',
+    )
+);
 
-// Bootstrap.
-require getenv( 'WP_PHPUNIT__DIR' ) . '/includes/bootstrap.php';
+$plugin->plugins_loaded();
diff --git a/tests/json/subscription.json b/tests/json/subscription.json
index 6ee3c75b..0a6ea04a 100644
--- a/tests/json/subscription.json
+++ b/tests/json/subscription.json
@@ -1,5 +1,6 @@
 {
   "id": 1,
+  "mode": "live",
   "phases": [],
   "activated_at": "2005-05-05T00:00:00+00:00"
 }
diff --git a/tests/src/AbstractGatewayIntegrationTest.php b/tests/src/AbstractGatewayIntegrationTest.php
index a335ee93..8406ef49 100644
--- a/tests/src/AbstractGatewayIntegrationTest.php
+++ b/tests/src/AbstractGatewayIntegrationTest.php
@@ -10,6 +10,8 @@
 
 namespace Pronamic\WordPress\Pay;
 
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
+
 /**
  * Abstract gateway integration test
  *
@@ -17,7 +19,7 @@
  * @version 2.2.8
  * @since   2.2.8
  */
-class AbstractGatewayIntegrationTest extends \PHPUnit\Framework\TestCase {
+class AbstractGatewayIntegrationTest extends TestCase {
 	/**
 	 * Test gateway integration.
 	 */
diff --git a/tests/src/AbstractPluginIntegrationTest.php b/tests/src/AbstractPluginIntegrationTest.php
index 862abd03..688674cf 100644
--- a/tests/src/AbstractPluginIntegrationTest.php
+++ b/tests/src/AbstractPluginIntegrationTest.php
@@ -10,6 +10,8 @@
 
 namespace Pronamic\WordPress\Pay;
 
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
+
 /**
  * Abstract plugin integration test
  *
@@ -17,7 +19,7 @@
  * @version 2.2.6
  * @since   1.0.0
  */
-class AbstractPluginIntegrationTest extends \WP_UnitTestCase {
+class AbstractPluginIntegrationTest extends TestCase {
 	/**
 	 * Test plugin integration.
 	 */
diff --git a/tests/src/AddressHelperTest.php b/tests/src/AddressHelperTest.php
index c09ef03c..ff19e46a 100644
--- a/tests/src/AddressHelperTest.php
+++ b/tests/src/AddressHelperTest.php
@@ -10,7 +10,7 @@
 
 namespace Pronamic\WordPress\Pay;
 
-use WP_UnitTestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 /**
  * Address helper test
@@ -19,7 +19,7 @@
  * @version 2.1.0
  * @since   1.0.0
  */
-class AddressHelperTest extends WP_UnitTestCase {
+class AddressHelperTest extends TestCase {
 	/**
 	 * Test address setters and getters.
 	 */
diff --git a/tests/src/Banks/BankAccountDetailsTest.php b/tests/src/Banks/BankAccountDetailsTest.php
index 2b75dff9..b99c0b03 100644
--- a/tests/src/Banks/BankAccountDetailsTest.php
+++ b/tests/src/Banks/BankAccountDetailsTest.php
@@ -10,7 +10,7 @@
 
 namespace Pronamic\WordPress\Pay\Banks;
 
-use PHPUnit\Framework\TestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 /**
  * Bank account details test
diff --git a/tests/src/Banks/BankTransferDetailsTest.php b/tests/src/Banks/BankTransferDetailsTest.php
index 4b98e90e..ff705390 100644
--- a/tests/src/Banks/BankTransferDetailsTest.php
+++ b/tests/src/Banks/BankTransferDetailsTest.php
@@ -10,7 +10,7 @@
 
 namespace Pronamic\WordPress\Pay\Banks;
 
-use PHPUnit\Framework\TestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 /**
  * Bank transfer details test
diff --git a/tests/src/ContactNameHelperTest.php b/tests/src/ContactNameHelperTest.php
index 21efb514..faf85212 100644
--- a/tests/src/ContactNameHelperTest.php
+++ b/tests/src/ContactNameHelperTest.php
@@ -10,6 +10,8 @@
 
 namespace Pronamic\WordPress\Pay;
 
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
+
 /**
  * Contact name helper test
  *
@@ -17,7 +19,7 @@
  * @version 2.2.8
  * @since   2.2.8
  */
-class ContactNameHelperTest extends \PHPUnit\Framework\TestCase {
+class ContactNameHelperTest extends TestCase {
 	/**
 	 * Test empty name.
 	 */
diff --git a/tests/src/ContactNameTest.php b/tests/src/ContactNameTest.php
index d7022170..c16629fb 100644
--- a/tests/src/ContactNameTest.php
+++ b/tests/src/ContactNameTest.php
@@ -10,7 +10,7 @@
 
 namespace Pronamic\WordPress\Pay;
 
-use WP_UnitTestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 /**
  * Personal Name test
@@ -18,7 +18,7 @@
  * @author  Remco Tolsma
  * @version 1.0
  */
-class ContactNameTest extends WP_UnitTestCase {
+class ContactNameTest extends TestCase {
 	/**
 	 * Test personal name.
 	 */
diff --git a/tests/src/Core/ServerTest.php b/tests/src/Core/ServerTest.php
index 93684285..1ace1cc7 100644
--- a/tests/src/Core/ServerTest.php
+++ b/tests/src/Core/ServerTest.php
@@ -10,6 +10,8 @@
 
 namespace Pronamic\WordPress\Pay\Core;
 
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
+
 /**
  * Title: WordPress pay server test
  * Description:
@@ -20,7 +22,7 @@
  * @version 2.0.0
  * @since 1.1.0
  */
-class ServerTest extends \WP_UnitTestCase {
+class ServerTest extends TestCase {
 	/**
 	 * Test server get.
 	 */
diff --git a/tests/src/Core/UtilTest.php b/tests/src/Core/UtilTest.php
index 9c20decf..3853bcb5 100644
--- a/tests/src/Core/UtilTest.php
+++ b/tests/src/Core/UtilTest.php
@@ -10,6 +10,8 @@
 
 namespace Pronamic\WordPress\Pay\Core;
 
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
+
 /**
  * Title: WordPress pay util test
  * Description:
@@ -20,7 +22,7 @@
  * @version 2.0.0
  * @since 1.1.0
  */
-class UtilTest extends \WP_UnitTestCase {
+class UtilTest extends TestCase {
 	/**
 	 * Test method exists.
 	 *
diff --git a/tests/src/CountryTest.php b/tests/src/CountryTest.php
index 6c9e0a53..d3f057d6 100644
--- a/tests/src/CountryTest.php
+++ b/tests/src/CountryTest.php
@@ -10,7 +10,7 @@
 
 namespace Pronamic\WordPress\Pay;
 
-use WP_UnitTestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 /**
  * Country test
@@ -19,7 +19,7 @@
  * @version 2.1.6
  * @since   2.1.6
  */
-class CountryTest extends WP_UnitTestCase {
+class CountryTest extends TestCase {
 	/**
 	 * Test country.
 	 */
diff --git a/tests/src/CreditCardTest.php b/tests/src/CreditCardTest.php
index 212f34e3..69dd21cc 100644
--- a/tests/src/CreditCardTest.php
+++ b/tests/src/CreditCardTest.php
@@ -10,7 +10,7 @@
 
 namespace Pronamic\WordPress\Pay;
 
-use WP_UnitTestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 /**
  * Payment test
@@ -18,7 +18,7 @@
  * @author Remco Tolsma
  * @version 2.2.6
  */
-class CreditCardTest extends WP_UnitTestCase {
+class CreditCardTest extends TestCase {
 	/**
 	 * Test construct payment object.
 	 */
diff --git a/tests/src/CustomerHelperTest.php b/tests/src/CustomerHelperTest.php
index 026c11ea..95b5cb01 100644
--- a/tests/src/CustomerHelperTest.php
+++ b/tests/src/CustomerHelperTest.php
@@ -10,6 +10,8 @@
 
 namespace Pronamic\WordPress\Pay;
 
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
+
 /**
  * Customer helper test
  *
@@ -17,7 +19,7 @@
  * @version 2.6.0
  * @since   2.6.0
  */
-class CustomerHelperTest extends \PHPUnit\Framework\TestCase {
+class CustomerHelperTest extends TestCase {
 	/**
 	 * Test customer from array.
 	 */
diff --git a/tests/src/Dependencies/DependenciesTest.php b/tests/src/Dependencies/DependenciesTest.php
index 5bdc7765..0ce37ca8 100644
--- a/tests/src/Dependencies/DependenciesTest.php
+++ b/tests/src/Dependencies/DependenciesTest.php
@@ -10,6 +10,8 @@
 
 namespace Pronamic\WordPress\Pay\Dependencies;
 
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
+
 /**
  * Dependencies
  *
@@ -17,7 +19,7 @@
  * @version 2.2.6
  * @since   2.2.6
  */
-class DependenciesTest extends \WP_UnitTestCase {
+class DependenciesTest extends TestCase {
 	/**
 	 * Test dependencies.
 	 */
diff --git a/tests/src/Dependencies/DependencyTest.php b/tests/src/Dependencies/DependencyTest.php
index ff053e95..9c15e7b7 100644
--- a/tests/src/Dependencies/DependencyTest.php
+++ b/tests/src/Dependencies/DependencyTest.php
@@ -10,6 +10,8 @@
 
 namespace Pronamic\WordPress\Pay\Dependencies;
 
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
+
 /**
  * Dependency test
  *
@@ -17,7 +19,7 @@
  * @version 2.2.6
  * @since   2.2.6
  */
-class DependencyTest extends \WP_UnitTestCase {
+class DependencyTest extends TestCase {
 	/**
 	 * Test dependency is met.
 	 *
diff --git a/tests/src/Dependencies/PhpDependencyTest.php b/tests/src/Dependencies/PhpDependencyTest.php
index 65fcc4a0..424ced71 100644
--- a/tests/src/Dependencies/PhpDependencyTest.php
+++ b/tests/src/Dependencies/PhpDependencyTest.php
@@ -10,6 +10,8 @@
 
 namespace Pronamic\WordPress\Pay\Dependencies;
 
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
+
 /**
  * PHP Dependency test
  *
@@ -17,7 +19,7 @@
  * @version 2.2.6
  * @since   2.2.6
  */
-class PhpDependencyTest extends \WP_UnitTestCase {
+class PhpDependencyTest extends TestCase {
 	/**
 	 * Test dependency is met.
 	 */
diff --git a/tests/src/Dependencies/PhpExtensionDependencyTest.php b/tests/src/Dependencies/PhpExtensionDependencyTest.php
index eb67d075..d1f011bb 100644
--- a/tests/src/Dependencies/PhpExtensionDependencyTest.php
+++ b/tests/src/Dependencies/PhpExtensionDependencyTest.php
@@ -10,6 +10,8 @@
 
 namespace Pronamic\WordPress\Pay\Dependencies;
 
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
+
 /**
  * PHP Extension Dependency test
  *
@@ -17,7 +19,7 @@
  * @version 2.2.6
  * @since   2.2.6
  */
-class PhpExtensionDependencyTest extends \WP_UnitTestCase {
+class PhpExtensionDependencyTest extends TestCase {
 	/**
 	 * Test loaded extensions.
 	 *
diff --git a/tests/src/Dependencies/WordPressDependencyTest.php b/tests/src/Dependencies/WordPressDependencyTest.php
index 89885ddc..dcbdcc78 100644
--- a/tests/src/Dependencies/WordPressDependencyTest.php
+++ b/tests/src/Dependencies/WordPressDependencyTest.php
@@ -10,6 +10,8 @@
 
 namespace Pronamic\WordPress\Pay\Dependencies;
 
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
+
 /**
  * WordPress Dependency test
  *
@@ -17,7 +19,7 @@
  * @version 2.2.6
  * @since   2.2.6
  */
-class WordPressDependencyTest extends \WP_UnitTestCase {
+class WordPressDependencyTest extends TestCase {
 	/**
 	 * Test dependency is met.
 	 */
diff --git a/tests/src/HouseNumberTest.php b/tests/src/HouseNumberTest.php
index bb26f34a..3f1f75b4 100644
--- a/tests/src/HouseNumberTest.php
+++ b/tests/src/HouseNumberTest.php
@@ -10,7 +10,7 @@
 
 namespace Pronamic\WordPress\Pay;
 
-use WP_UnitTestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 /**
  * House number test
@@ -21,7 +21,7 @@
  * @version 2.1.6
  * @since   2.1.6
  */
-class HouseNumberTest extends WP_UnitTestCase {
+class HouseNumberTest extends TestCase {
 	/**
 	 * Test house number.
 	 */
diff --git a/tests/src/JavaScriptFilesTest.php b/tests/src/JavaScriptFilesTest.php
index e725ad25..1660fcfd 100644
--- a/tests/src/JavaScriptFilesTest.php
+++ b/tests/src/JavaScriptFilesTest.php
@@ -10,6 +10,8 @@
 
 namespace Pronamic\WordPress\Pay;
 
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
+
 /**
  * JavaScript files test
  *
@@ -17,7 +19,7 @@
  * @version 2.1.6
  * @since   2.1.6
  */
-class JavaScriptFilesTest extends \PHPUnit\Framework\TestCase {
+class JavaScriptFilesTest extends TestCase {
 	/**
 	 * Test files.
 	 */
diff --git a/tests/src/MoneyJsonTransformerTest.php b/tests/src/MoneyJsonTransformerTest.php
index 7a1b7da8..522fc475 100644
--- a/tests/src/MoneyJsonTransformerTest.php
+++ b/tests/src/MoneyJsonTransformerTest.php
@@ -11,7 +11,7 @@
 namespace Pronamic\WordPress\Pay;
 
 use InvalidArgumentException;
-use PHPUnit\Framework\TestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 use Pronamic\WordPress\Money\Money;
 use stdClass;
 
diff --git a/tests/src/Payments/FailureReasonTest.php b/tests/src/Payments/FailureReasonTest.php
index 297cb39e..e0453231 100644
--- a/tests/src/Payments/FailureReasonTest.php
+++ b/tests/src/Payments/FailureReasonTest.php
@@ -10,6 +10,8 @@
 
 namespace Pronamic\WordPress\Pay\Payments;
 
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
+
 /**
  * Failure reason test
  *
@@ -17,7 +19,7 @@
  * @version 2.2.8
  * @since   2.2.8
  */
-class FailureReasonTest extends \PHPUnit\Framework\TestCase {
+class FailureReasonTest extends TestCase {
 	/**
 	 * Test failure reason object.
 	 *
diff --git a/tests/src/Payments/PaymentLineTest.php b/tests/src/Payments/PaymentLineTest.php
index 26f1f68d..e7a50766 100644
--- a/tests/src/Payments/PaymentLineTest.php
+++ b/tests/src/Payments/PaymentLineTest.php
@@ -12,7 +12,7 @@
 
 use Pronamic\WordPress\Money\Money;
 use Pronamic\WordPress\Money\TaxedMoney;
-use WP_UnitTestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 /**
  * Payment line test
@@ -21,7 +21,7 @@
  * @version 2.1.0
  * @since   1.0.0
  */
-class PaymentLineTest extends WP_UnitTestCase {
+class PaymentLineTest extends TestCase {
 	/**
 	 * Test setters and getters.
 	 */
diff --git a/tests/src/Payments/PaymentTest.php b/tests/src/Payments/PaymentTest.php
index ce77c2e7..47e33107 100644
--- a/tests/src/Payments/PaymentTest.php
+++ b/tests/src/Payments/PaymentTest.php
@@ -20,7 +20,7 @@
 use Pronamic\WordPress\Pay\Core\Gateway;
 use Pronamic\WordPress\Pay\CreditCard;
 use Pronamic\WordPress\Pay\Customer;
-use WP_UnitTestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 /**
  * Payment test
@@ -29,7 +29,7 @@
  * @version 2.2.6
  * @since   1.0.0
  */
-class PaymentTest extends WP_UnitTestCase {
+class PaymentTest extends TestCase {
 	/**
 	 * Test construct payment object.
 	 */
diff --git a/tests/src/RegionTest.php b/tests/src/RegionTest.php
index 5052839a..6f7e8826 100644
--- a/tests/src/RegionTest.php
+++ b/tests/src/RegionTest.php
@@ -10,7 +10,7 @@
 
 namespace Pronamic\WordPress\Pay;
 
-use WP_UnitTestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 /**
  * Region test
@@ -21,7 +21,7 @@
  * @version 2.1.6
  * @since   2.1.6
  */
-class RegionTest extends WP_UnitTestCase {
+class RegionTest extends TestCase {
 	/**
 	 * Test country.
 	 */
diff --git a/tests/src/Subscriptions/AlignmentRuleTest.php b/tests/src/Subscriptions/AlignmentRuleTest.php
index fd865fd0..a12cd274 100644
--- a/tests/src/Subscriptions/AlignmentRuleTest.php
+++ b/tests/src/Subscriptions/AlignmentRuleTest.php
@@ -10,6 +10,8 @@
 
 namespace Pronamic\WordPress\Pay\Subscriptions;
 
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
+
 /**
  * Alignment Rule Test
  *
@@ -17,7 +19,7 @@
  * @version 2.5.0
  * @since   2.5.0
  */
-class AlignmentRuleTest extends \WP_UnitTestCase {
+class AlignmentRuleTest extends TestCase {
 	/**
 	 * Test prorating rule week.
 	 */
diff --git a/tests/src/Subscriptions/SubscriptionHelperTest.php b/tests/src/Subscriptions/SubscriptionHelperTest.php
index fd592586..65e18fc9 100644
--- a/tests/src/Subscriptions/SubscriptionHelperTest.php
+++ b/tests/src/Subscriptions/SubscriptionHelperTest.php
@@ -12,6 +12,7 @@
 
 use Pronamic\WordPress\DateTime\DateTime;
 use Pronamic\WordPress\Money\TaxedMoney;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 /**
  * Subscription Helper Test
@@ -19,7 +20,7 @@
  * @author  Remco Tolsma
  * @version 2.5.0
  */
-class SubscriptionHelperTest extends \WP_UnitTestCase {
+class SubscriptionHelperTest extends TestCase {
 	/**
 	 * Test next.
 	 */
diff --git a/tests/src/Subscriptions/SubscriptionIntervalTest.php b/tests/src/Subscriptions/SubscriptionIntervalTest.php
index f7afd242..d62b6fb4 100644
--- a/tests/src/Subscriptions/SubscriptionIntervalTest.php
+++ b/tests/src/Subscriptions/SubscriptionIntervalTest.php
@@ -10,13 +10,15 @@
 
 namespace Pronamic\WordPress\Pay\Subscriptions;
 
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
+
 /**
  * Subscription Interval Test
  *
  * @author  Remco Tolsma
  * @version 2.5.0
  */
-class SubscriptionIntervalTest extends \WP_UnitTestCase {
+class SubscriptionIntervalTest extends TestCase {
 	/**
 	 * Test interval.
 	 */
diff --git a/tests/src/Subscriptions/SubscriptionPhaseTest.php b/tests/src/Subscriptions/SubscriptionPhaseTest.php
index 3ca688b7..c941d948 100644
--- a/tests/src/Subscriptions/SubscriptionPhaseTest.php
+++ b/tests/src/Subscriptions/SubscriptionPhaseTest.php
@@ -11,6 +11,7 @@
 namespace Pronamic\WordPress\Pay\Subscriptions;
 
 use Pronamic\WordPress\Money\TaxedMoney;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 /**
  * Subscription Phase Test
@@ -18,7 +19,7 @@
  * @author  Remco Tolsma
  * @version 2.5.0
  */
-class SubscriptionPhaseTest extends \WP_UnitTestCase {
+class SubscriptionPhaseTest extends TestCase {
 	/**
 	 * New period definition.
 	 *
diff --git a/tests/src/Subscriptions/SubscriptionPhasesTraitTest.php b/tests/src/Subscriptions/SubscriptionPhasesTraitTest.php
index e0e9a087..f511f265 100644
--- a/tests/src/Subscriptions/SubscriptionPhasesTraitTest.php
+++ b/tests/src/Subscriptions/SubscriptionPhasesTraitTest.php
@@ -12,6 +12,7 @@
 
 use Pronamic\WordPress\Money\Money;
 use Pronamic\WordPress\Money\TaxedMoney;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 /**
  * Subscription Phases Trait Test
@@ -19,7 +20,7 @@
  * @author  Remco Tolsma
  * @version 2.5.0
  */
-class SubscriptionPhasesTraitTest extends \WP_UnitTestCase {
+class SubscriptionPhasesTraitTest extends TestCase {
 	/**
 	 * Create new subscription.
 	 *
diff --git a/tests/src/Subscriptions/SubscriptionTest.php b/tests/src/Subscriptions/SubscriptionTest.php
index f26dfcb7..4f07b81e 100644
--- a/tests/src/Subscriptions/SubscriptionTest.php
+++ b/tests/src/Subscriptions/SubscriptionTest.php
@@ -13,7 +13,7 @@
 use Pronamic\WordPress\DateTime\DateTime;
 use Pronamic\WordPress\Money\Money;
 use Pronamic\WordPress\Money\TaxedMoney;
-use WP_UnitTestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 /**
  * Subscription test
@@ -21,7 +21,7 @@
  * @author  Remco Tolsma
  * @version 2.5.0
  */
-class SubscriptionTest extends WP_UnitTestCase {
+class SubscriptionTest extends TestCase {
 	/**
 	 * Test construct subscription object.
 	 */
diff --git a/tests/src/Subscriptions/SubscriptionsCompletionControllerTest.php b/tests/src/Subscriptions/SubscriptionsCompletionControllerTest.php
index 22029183..3ca65132 100644
--- a/tests/src/Subscriptions/SubscriptionsCompletionControllerTest.php
+++ b/tests/src/Subscriptions/SubscriptionsCompletionControllerTest.php
@@ -11,11 +11,12 @@
 namespace Pronamic\WordPress\Pay\Subscriptions;
 
 use Pronamic\WordPress\Money\Money;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 /**
  * Subscriptions completion controller test.
  */
-class SubscriptionsCompletionControllerTest extends \WP_UnitTestCase {
+class SubscriptionsCompletionControllerTest extends TestCase {
 	/**
 	 * Test completion.
 	 */
diff --git a/tests/src/Subscriptions/SubscriptionsFollowUpPaymentsControllerTest.php b/tests/src/Subscriptions/SubscriptionsFollowUpPaymentsControllerTest.php
index c82be3e5..24770e71 100644
--- a/tests/src/Subscriptions/SubscriptionsFollowUpPaymentsControllerTest.php
+++ b/tests/src/Subscriptions/SubscriptionsFollowUpPaymentsControllerTest.php
@@ -15,6 +15,7 @@
 use Pronamic\WordPress\Pay\Core\GatewayConfig;
 use Pronamic\WordPress\Pay\AbstractGatewayIntegration;
 use Pronamic\WordPress\Pay\GatewayIntegrations;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 // phpcs:disable Generic.Files.OneObjectStructurePerFile.MultipleFound
 
@@ -70,7 +71,7 @@ public function __construct( TestGatewayConfig $config ) {
 /**
  * Subscriptions follow-up payments controller test.
  */
-class SubscriptionsFollowUpPaymentsControllerTest extends \WP_UnitTestCase {
+class SubscriptionsFollowUpPaymentsControllerTest extends TestCase {
 	/**
 	 * Test follow-up payment.
 	 */
@@ -92,7 +93,7 @@ public function test_follow_up_payment() {
 		/**
 		 * Gateway.
 		 */
-		$config_id = $this->factory->post->create(
+		$config_id = wp_insert_post(
 			array(
 				'post_type'  => 'pronamic_gateway',
 				'meta_input' => array(
diff --git a/tests/src/Subscriptions/SubscriptionsNotificationsControllerTest.php b/tests/src/Subscriptions/SubscriptionsNotificationsControllerTest.php
index 83ae42b8..61c4453a 100644
--- a/tests/src/Subscriptions/SubscriptionsNotificationsControllerTest.php
+++ b/tests/src/Subscriptions/SubscriptionsNotificationsControllerTest.php
@@ -11,11 +11,12 @@
 namespace Pronamic\WordPress\Pay\Subscriptions;
 
 use Pronamic\WordPress\Money\Money;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 /**
  * Subscriptions notifications controller test.
  */
-class SubscriptionsNotificationsControllerTest extends \WP_UnitTestCase {
+class SubscriptionsNotificationsControllerTest extends TestCase {
 	/**
 	 * Test notification.
 	 */
diff --git a/tests/src/TrackingModuleTest.php b/tests/src/TrackingModuleTest.php
index 57e52118..81a100a0 100644
--- a/tests/src/TrackingModuleTest.php
+++ b/tests/src/TrackingModuleTest.php
@@ -10,13 +10,15 @@
 
 namespace Pronamic\WordPress\Pay;
 
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
+
 /**
  * Tracking module test
  *
  * @author  Reüel van der Steege
  * @version 2.4.0
  */
-class TrackingModuleTest extends \PHPUnit_Framework_TestCase {
+class TrackingModuleTest extends TestCase {
 	/**
 	 * Test get tracking url.
 	 */
diff --git a/tests/src/VatNumbers/VatNumberTest.php b/tests/src/VatNumbers/VatNumberTest.php
index d420eed9..6d7d4226 100644
--- a/tests/src/VatNumbers/VatNumberTest.php
+++ b/tests/src/VatNumbers/VatNumberTest.php
@@ -10,6 +10,8 @@
 
 namespace Pronamic\WordPress\Pay\VatNumbers;
 
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
+
 /**
  * VAT Number test
  *
@@ -17,7 +19,7 @@
  * @version 2.4.0
  * @since   2.1.6
  */
-class VatNumberTest extends \WP_UnitTestCase {
+class VatNumberTest extends TestCase {
 	/**
 	 * Test VAT number.
 	 */
diff --git a/tests/src/VatNumbers/VatNumberValidityTest.php b/tests/src/VatNumbers/VatNumberValidityTest.php
index 892b5389..cc80abec 100644
--- a/tests/src/VatNumbers/VatNumberValidityTest.php
+++ b/tests/src/VatNumbers/VatNumberValidityTest.php
@@ -10,6 +10,8 @@
 
 namespace Pronamic\WordPress\Pay\VatNumbers;
 
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
+
 /**
  * VAT Number validity test
  *
@@ -17,7 +19,7 @@
  * @version 2.4.0
  * @since   2.1.6
  */
-class VatNumberValidityTest extends \WP_UnitTestCase {
+class VatNumberValidityTest extends TestCase {
 	/**
 	 * Test VAT number validity.
 	 */
diff --git a/tests/wp-config.php b/tests/wp-config.php
deleted file mode 100644
index 2152a6be..00000000
--- a/tests/wp-config.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/* Path to the WordPress codebase you'd like to test. Add a forward slash in the end. */
-define( 'ABSPATH', dirname( dirname( __FILE__ ) ) . '/wordpress/' );
-
-/*
- * Path to the theme to test with.
- *
- * The 'default' theme is symlinked from test/phpunit/data/themedir1/default into
- * the themes directory of the WordPress installation defined above.
- */
-define( 'WP_DEFAULT_THEME', 'default' );
-
-// Test with multisite enabled.
-// Alternatively, use the tests/phpunit/multisite.xml configuration file.
-// define( 'WP_TESTS_MULTISITE', true );
-
-// Force known bugs to be run.
-// Tests with an associated Trac ticket that is still open are normally skipped.
-// define( 'WP_TESTS_FORCE_KNOWN_BUGS', true );
-
-// Test with WordPress debug mode (default).
-define( 'WP_DEBUG', true );
-
-// ** MySQL settings ** //
-
-// This configuration file will be used by the copy of WordPress being tested.
-// wordpress/wp-config.php will be ignored.
-
-// WARNING WARNING WARNING!
-// These tests will DROP ALL TABLES in the database with the prefix named below.
-// DO NOT use a production database or one that is shared with something else.
-define( 'DB_NAME'       , getenv( 'WP_TESTS_DB_NAME' ) ?: 'wp_phpunit_tests' );
-define( 'DB_USER'       , getenv( 'WP_TESTS_DB_USER' ) ?: 'root' );
-define( 'DB_PASSWORD'   , getenv( 'WP_TESTS_DB_PASS' ) ?: '' );
-define( 'DB_HOST'       , getenv( 'WP_TESTS_DB_HOST' ) ?: 'localhost' );
-define( 'DB_CHARSET'    , 'utf8' );
-define( 'DB_COLLATE'    , '' );
-
-/**#@+
- * Authentication Unique Keys and Salts.
- *
- * Change these to different unique phrases!
- * You can generate these using the {@link https://api.wordpress.org/secret-key/1.1/salt/ WordPress.org secret-key service}
- */
-define( 'AUTH_KEY',         'put your unique phrase here' );
-define( 'SECURE_AUTH_KEY',  'put your unique phrase here' );
-define( 'LOGGED_IN_KEY',    'put your unique phrase here' );
-define( 'NONCE_KEY',        'put your unique phrase here' );
-define( 'AUTH_SALT',        'put your unique phrase here' );
-define( 'SECURE_AUTH_SALT', 'put your unique phrase here' );
-define( 'LOGGED_IN_SALT',   'put your unique phrase here' );
-define( 'NONCE_SALT',       'put your unique phrase here' );
-
-define( 'WP_TESTS_DOMAIN', 'example.org' );
-define( 'WP_TESTS_EMAIL', 'admin@example.org' );
-define( 'WP_TESTS_TITLE', 'Test Blog' );
-
-define( 'WP_PHP_BINARY', 'php' );
-
-define( 'WPLANG', '' );

From c2b2f6d9096bbe9a9bf3a45bbb6cade270a95907 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Fri, 8 Apr 2022 15:28:10 +0200
Subject: [PATCH 65/87] Change post title, WorDBless could not handle the other
 post title notation.

---
 src/Payments/PaymentsDataStoreCPT.php           | 14 ++++----------
 src/Subscriptions/SubscriptionsDataStoreCPT.php |  6 +++---
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/Payments/PaymentsDataStoreCPT.php b/src/Payments/PaymentsDataStoreCPT.php
index 0e78232c..32414d65 100644
--- a/src/Payments/PaymentsDataStoreCPT.php
+++ b/src/Payments/PaymentsDataStoreCPT.php
@@ -267,22 +267,16 @@ public function create( Payment $payment ) {
 		 */
 		\do_action( 'pronamic_pay_pre_create_payment', $payment );
 
-		$title = $payment->title;
-
-		if ( empty( $title ) ) {
-			$title = sprintf(
-				'Payment – %s',
-				date_i18n( _x( 'M d, Y @ h:i A', 'Payment title date format parsed by `date_i18n`.', 'pronamic_ideal' ) )
-			);
-		}
-
 		$customer = $payment->get_customer();
 
 		$result = wp_insert_post(
 			array(
 				'post_type'        => 'pronamic_payment',
 				'post_date_gmt'    => $this->get_mysql_utc_date( $payment->date ),
-				'post_title'       => $title,
+				'post_title'       => \sprintf(
+					'Payment %s',
+					$payment->get_key()
+				),
 				'post_author'      => null === $customer ? null : $customer->get_user_id(),
 				'pronamic_payment' => $payment,
 			),
diff --git a/src/Subscriptions/SubscriptionsDataStoreCPT.php b/src/Subscriptions/SubscriptionsDataStoreCPT.php
index 96e0f6ba..4bc8a0c9 100644
--- a/src/Subscriptions/SubscriptionsDataStoreCPT.php
+++ b/src/Subscriptions/SubscriptionsDataStoreCPT.php
@@ -300,9 +300,9 @@ public function create( $subscription ) {
 			array(
 				'post_type'             => 'pronamic_pay_subscr',
 				'post_date_gmt'         => $this->get_mysql_utc_date( $subscription->date ),
-				'post_title'            => sprintf(
-					'Subscription – %s',
-					date_i18n( _x( 'M d, Y @ h:i A', 'Subscription title date format parsed by `date_i18n`.', 'pronamic_ideal' ) )
+				'post_title'            => \sprintf(
+					'Subscription %s',
+					$subscription->get_key()
 				),
 				'post_author'           => null === $customer ? null : $customer->get_user_id(),
 				'pronamic_subscription' => $subscription,

From 59ef8eb133ae682306046046ace9d42485d0f9f9 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Fri, 8 Apr 2022 15:37:13 +0200
Subject: [PATCH 66/87] Fix tests.

---
 composer.json       | 2 +-
 tests/bootstrap.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 6cd106a1..fe6ef262 100644
--- a/composer.json
+++ b/composer.json
@@ -59,7 +59,7 @@
 		"pronamic/wp-number": "^1.1",
 		"roots/wordpress": "^5.9",
 		"viison/address-splitter": "^0.3.4",
-		"woocommerce/action-scheduler": "^3.0"
+		"woocommerce/action-scheduler": "^3.4"
 	},
 	"require-dev": {
 		"automattic/wordbless": "^0.3.1",
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index b6cf3484..3a717826 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -23,7 +23,7 @@
  */
 $plugin = \Pronamic\WordPress\Pay\Plugin::instance(
     array(
-        'action_scheduler' => __DIR__ . '/../wp-content/plugins/action-scheduler/action-scheduler.php',
+        'action_scheduler' => __DIR__ . '/../vendor/woocommerce/action-scheduler/action-scheduler.php',
     )
 );
 

From 26c57df4b4939f5061faf86801409aa5b9e73eda Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Fri, 8 Apr 2022 15:46:23 +0200
Subject: [PATCH 67/87] Update phpstan.neon.dist

---
 phpstan.neon.dist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index bcb77c32..41411d6c 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -14,7 +14,7 @@ parameters:
 		- vendor/php-stubs/wordpress-globals/wordpress-globals.php
 		- vendor/php-stubs/wp-cli-stubs/wp-cli-stubs.php
 	scanDirectories:
-		- wp-content/plugins/action-scheduler
+		- vendor/woocommerce/action-scheduler
 	paths:
 		- src/
 		- views/

From d25002de082c02d41cbe15969cf726ed110a0544 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Fri, 8 Apr 2022 15:58:30 +0200
Subject: [PATCH 68/87] Update Plugin.php

---
 src/Plugin.php | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/Plugin.php b/src/Plugin.php
index d94c6dde..6d5b6b95 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -1031,6 +1031,24 @@ public static function start_payment( Payment $payment ) {
 		// Save payment.
 		$payment->save();
 
+		// Periods.
+		$periods = $payment->get_periods();
+
+		if ( null !== $periods ) {
+			foreach ( $periods as $period ) {
+				$phase = $period->get_phase();
+
+				$phase->set_next_date( \max( $phase->get_next_date(), $period->get_end_date() ) );
+			}
+		}
+
+		// Subscriptions.
+		$subscriptions = $payment->get_subscriptions();
+
+		foreach ( $subscriptions as $subscription ) {
+			$subscription->save();
+		}
+
 		// Gateway.
 		$gateway = $payment->get_gateway();
 
@@ -1052,22 +1070,6 @@ public static function start_payment( Payment $payment ) {
 			throw new \Exception( 'Gateway does not support recurring payments.' );
 		}
 
-		// Periods.
-		$periods = $payment->get_periods();
-
-		if ( null !== $periods ) {
-			foreach ( $periods as $period ) {
-				$phase = $period->get_phase();
-
-				$phase->set_next_date( \max( $phase->get_next_date(), $period->get_end_date() ) );
-			}
-		}
-
-		// Subscriptions.
-		foreach ( $subscriptions as $subscription ) {
-			$subscription->save();
-		}
-
 		// Start payment at the gateway.
 		try {
 			$gateway->start( $payment );

From 8072c85db36631b02d47177bb428bb7b27bc22bc Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Fri, 8 Apr 2022 16:25:19 +0200
Subject: [PATCH 69/87] Only echo string license status, can't handle other
 values.

---
 views/tab-system_status.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/views/tab-system_status.php b/views/tab-system_status.php
index f356ed25..f2738694 100644
--- a/views/tab-system_status.php
+++ b/views/tab-system_status.php
@@ -45,7 +45,9 @@
 
 						break;
 					default:
-						echo esc_html( $license_status );
+						if ( \is_string( $license_status ) ) {
+							echo \esc_html( $license_status );
+						}
 
 						break;
 				}

From 6290dfefff6fcd042c11be4100c17bbe14473b10 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Fri, 8 Apr 2022 16:27:32 +0200
Subject: [PATCH 70/87] Will only return false when string argument is provided
 for extension parameter.

---
 views/tab-system_status.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/views/tab-system_status.php b/views/tab-system_status.php
index f2738694..51419831 100644
--- a/views/tab-system_status.php
+++ b/views/tab-system_status.php
@@ -120,10 +120,6 @@
 
 				$php_version = \phpversion();
 
-				if ( false === $php_version ) {
-					\esc_html_e( 'Unable to get the current PHP version.', 'pronamic_ideal' );
-				}
-
 				if ( false !== $php_version ) {
 					if ( \version_compare( $php_version, '5.2', '>' ) ) {
 						echo '✓';

From c96cf45f5780c04e6beaf192c66572e43a61de18 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Mon, 11 Apr 2022 09:21:12 +0200
Subject: [PATCH 71/87] Store next (payment) date in subscription and not in
 phase.

---
 src/Plugin.php                          |  4 ++--
 src/Subscriptions/Subscription.php      | 17 ++++++++++-------
 src/Subscriptions/SubscriptionPhase.php | 11 ++++-------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/Plugin.php b/src/Plugin.php
index 6d5b6b95..897baaa4 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -1036,9 +1036,9 @@ public static function start_payment( Payment $payment ) {
 
 		if ( null !== $periods ) {
 			foreach ( $periods as $period ) {
-				$phase = $period->get_phase();
+				$subscription = $period->get_phase()->get_subscription();
 
-				$phase->set_next_date( \max( $phase->get_next_date(), $period->get_end_date() ) );
+				$subscription->set_next_payment_date( \max( $subscription->get_next_payment_date(), $period->get_end_date() ) );
 			}
 		}
 
diff --git a/src/Subscriptions/Subscription.php b/src/Subscriptions/Subscription.php
index 07d70f35..9b644568 100644
--- a/src/Subscriptions/Subscription.php
+++ b/src/Subscriptions/Subscription.php
@@ -413,14 +413,17 @@ public function is_first_payment( Payment $payment ) {
 	 * @return DateTimeImmutable|null
 	 */
 	public function get_next_payment_date() {
-		// Get current phase.
-		$phase = $this->get_current_phase();
-
-		if ( null === $phase ) {
-			return null;
-		}
+		return $this->next_payment_date;
+	}
 
-		return $phase->get_next_date();
+	/**
+	 * Set the next payment date of this subscription.
+	 *
+	 * @param $date Date.
+	 * @return void
+	 */
+	public function set_next_payment_date( $date ) {
+		$this->next_payment_date = ( null === $date ) ? null : DateTimeImmutable::create_from_interface( $date );
 	}
 
 	/**
diff --git a/src/Subscriptions/SubscriptionPhase.php b/src/Subscriptions/SubscriptionPhase.php
index fe9e5be2..b4a0b924 100644
--- a/src/Subscriptions/SubscriptionPhase.php
+++ b/src/Subscriptions/SubscriptionPhase.php
@@ -118,7 +118,6 @@ public function __construct( Subscription $subscription, \DateTimeInterface $sta
 		$this->subscription = $subscription;
 
 		$this->set_start_date( $start_date );
-		$this->set_next_date( $start_date );
 
 		$this->interval = $interval;
 		$this->amount   = $amount;
@@ -431,7 +430,9 @@ public function is_infinite() {
 	 * @return bool True if all periods are created, false otherwise.
 	 */
 	public function all_periods_created() {
-		if ( null === $this->next_date ) {
+		$next_date = $this->subscription->get_next_payment_date();
+
+		if ( null === $next_date ) {
 			return true;
 		}
 
@@ -439,7 +440,7 @@ public function all_periods_created() {
 			return false;
 		}
 
-		return $this->next_date >= $this->end_date;
+		return $next_date >= $this->end_date;
 	}
 
 	/**
@@ -602,10 +603,6 @@ public static function from_json( $json ) {
 			$phase->set_periods_created( $json->periods_created );
 		}
 
-		if ( property_exists( $json, 'next_date' ) ) {
-			$phase->set_next_date( null === $json->next_date ? null : new DateTimeImmutable( $json->next_date ) );
-		}
-
 		if ( property_exists( $json, 'alignment_rate' ) ) {
 			$phase->set_alignment_rate( $json->alignment_rate );
 		}

From 1fe1e44703a77488f5b5929a3be3346d6873a6fd Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Mon, 11 Apr 2022 09:30:05 +0200
Subject: [PATCH 72/87] Read next payment date from subscription meta and store
 it in the subscription, no longer in phase.

---
 src/Subscriptions/SubscriptionsDataStoreCPT.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Subscriptions/SubscriptionsDataStoreCPT.php b/src/Subscriptions/SubscriptionsDataStoreCPT.php
index 4bc8a0c9..d1b18f82 100644
--- a/src/Subscriptions/SubscriptionsDataStoreCPT.php
+++ b/src/Subscriptions/SubscriptionsDataStoreCPT.php
@@ -451,13 +451,6 @@ public function read( $subscription ) {
 			);
 
 			$phase->set_total_periods( $this->get_meta_int( $id, 'frequency' ) );
-
-			// Set next date.
-			$next_date = $this->get_meta_date( $id, 'next_payment_date' );
-
-			if ( null !== $next_date ) {
-				$phase->set_next_date( $next_date );
-			}
 		}
 	}
 
@@ -623,6 +616,11 @@ protected function read_post_meta( $subscription ) {
 			$subscription->set_payment_method( $this->get_meta_string( $id, 'payment_method' ) );
 		}
 
+		// Set next date.
+		$next_date = $this->get_meta_date( $id, 'next_payment_date' );
+
+		$subscription->set_next_payment_date( $next_date );
+
 		// Legacy.
 		parent::read_post_meta( $subscription );
 

From 03f62f02bad0e7677f455b59fd59cb538dbaae32 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Mon, 11 Apr 2022 09:33:07 +0200
Subject: [PATCH 73/87] No longer display next payment date per subscription
 phase.

---
 views/meta-box-subscription-phases.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/views/meta-box-subscription-phases.php b/views/meta-box-subscription-phases.php
index e3a88ec0..dd72e798 100644
--- a/views/meta-box-subscription-phases.php
+++ b/views/meta-box-subscription-phases.php
@@ -44,7 +44,6 @@
 					<th scope="col"><?php esc_html_e( 'Recurrence', 'pronamic_ideal' ); ?></th>
 					<th scope="col"><?php esc_html_e( 'Start Date', 'pronamic_ideal' ); ?></th>
 					<th scope="col"><?php esc_html_e( 'End Date', 'pronamic_ideal' ); ?></th>
-					<th scope="col"><?php esc_html_e( 'Next Date', 'pronamic_ideal' ); ?></th>
 
 					<?php if ( $has_trial ) : ?>
 
@@ -120,15 +119,6 @@
 
 							?>
 						</td>
-						<td>
-							<?php
-
-							$next_date = $phase->get_next_date();
-
-							echo esc_html( null === $next_date ? '—' : ( new \Pronamic\WordPress\DateTime\DateTime( '@' . $next_date->getTimestamp() ) )->format_i18n( __( 'D j M Y', 'pronamic_ideal' ) ) );
-
-							?>
-						</td>
 
 						<?php if ( $has_trial ) : ?>
 

From 1bb1c3075da8a815ae02e76d119c09a8d39e8c98 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Mon, 11 Apr 2022 09:42:29 +0200
Subject: [PATCH 74/87] No longer store next date in phase JSON.

---
 src/Subscriptions/SubscriptionPhase.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Subscriptions/SubscriptionPhase.php b/src/Subscriptions/SubscriptionPhase.php
index b4a0b924..1f54eb9d 100644
--- a/src/Subscriptions/SubscriptionPhase.php
+++ b/src/Subscriptions/SubscriptionPhase.php
@@ -534,7 +534,6 @@ public function jsonSerialize() {
 			'sequence_number'   => $this->get_sequence_number(),
 			'start_date'        => $this->start_date->format( \DATE_ATOM ),
 			'end_date'          => ( null === $this->end_date ) ? null : $this->end_date->format( \DATE_ATOM ),
-			'next_date'         => ( null === $this->next_date ) ? null : $this->next_date->format( \DATE_ATOM ),
 			'interval'          => $this->interval->get_specification(),
 			'amount'            => $this->amount->jsonSerialize(),
 			// Numbers.

From b53913ead67f723188d1422ce04197b4ecc42208 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Mon, 11 Apr 2022 09:46:09 +0200
Subject: [PATCH 75/87] Store and load next payment date.

---
 src/Subscriptions/Subscription.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Subscriptions/Subscription.php b/src/Subscriptions/Subscription.php
index 9b644568..e0364b61 100644
--- a/src/Subscriptions/Subscription.php
+++ b/src/Subscriptions/Subscription.php
@@ -593,6 +593,12 @@ public static function from_json( $json, $subscription = null ) {
 
 		$subscription->set_activated_at( $activated_at );
 
+		if ( \property_exists( $json, 'next_payment_date' ) ) {
+			if ( null !== $json->next_payment_date ) {
+				$subscription->set_next_payment_date( new DateTimeImmutable( $json->next_payment_date ) );
+			}
+		}
+
 		return $subscription;
 	}
 
@@ -614,6 +620,8 @@ public function get_json() {
 
 		$properties['activated_at'] = $this->get_activated_at()->format( \DATE_ATOM );
 
+		$properties['next_payment_date'] = ( null === $this->next_payment_date ) ? null : $this->next_payment_date->format( \DATE_ATOM );
+
 		$object = (object) $properties;
 
 		return $object;

From 3580600eadcfcd7eb36e16409b6492c375f9c326 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Mon, 11 Apr 2022 10:05:08 +0200
Subject: [PATCH 76/87] Update subscription.json

---
 tests/json/subscription.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/json/subscription.json b/tests/json/subscription.json
index 0a6ea04a..4ffe46af 100644
--- a/tests/json/subscription.json
+++ b/tests/json/subscription.json
@@ -2,5 +2,6 @@
   "id": 1,
   "mode": "live",
   "phases": [],
-  "activated_at": "2005-05-05T00:00:00+00:00"
+  "activated_at": "2005-05-05T00:00:00+00:00",
+  "next_payment_date": null
 }

From 221de86adde562fce78a3827ace11eab80a5de6f Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Mon, 11 Apr 2022 10:18:45 +0200
Subject: [PATCH 77/87] Update SubscriptionPhase.php

---
 src/Subscriptions/SubscriptionPhase.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Subscriptions/SubscriptionPhase.php b/src/Subscriptions/SubscriptionPhase.php
index 1f54eb9d..829ad655 100644
--- a/src/Subscriptions/SubscriptionPhase.php
+++ b/src/Subscriptions/SubscriptionPhase.php
@@ -225,7 +225,7 @@ public function get_next_date() {
 	 * @return void
 	 */
 	public function set_next_date( $next_date ) {
-		$this->next_date = ( null === $next_date ) ? null : DateTimeImmutable::create_from_interface( $next_date );
+		$this->subscription->set_next_payment_date( $next_date );
 	}
 
 	/**

From 211fbf78e727730c3a32af2e69ef0270601f0b30 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Mon, 11 Apr 2022 10:38:50 +0200
Subject: [PATCH 78/87] Fix test.

---
 src/Subscriptions/SubscriptionPhase.php       | 2 +-
 src/Subscriptions/SubscriptionPhasesTrait.php | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Subscriptions/SubscriptionPhase.php b/src/Subscriptions/SubscriptionPhase.php
index 829ad655..3a66c9a5 100644
--- a/src/Subscriptions/SubscriptionPhase.php
+++ b/src/Subscriptions/SubscriptionPhase.php
@@ -215,7 +215,7 @@ public function get_next_date() {
 		/**
 		 * Ok.
 		 */
-		return $this->next_date;
+		return $this->subscription->get_next_payment_date();
 	}
 
 	/**
diff --git a/src/Subscriptions/SubscriptionPhasesTrait.php b/src/Subscriptions/SubscriptionPhasesTrait.php
index 4fa39945..b5dc463c 100644
--- a/src/Subscriptions/SubscriptionPhasesTrait.php
+++ b/src/Subscriptions/SubscriptionPhasesTrait.php
@@ -57,6 +57,10 @@ public function set_phases( $phases ) {
 	public function add_phase( SubscriptionPhase $phase ) {
 		$this->phases[] = $phase;
 
+		if ( null === $this->next_payment_date ) {
+			$this->next_payment_date = $phase->get_start_date();
+		}
+
 		$phase->set_sequence_number( \count( $this->phases ) );
 	}
 

From 32de2376442b00b5e180c27e20129fd19bbc5d3f Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Mon, 11 Apr 2022 11:02:17 +0200
Subject: [PATCH 79/87] Fix tests.

---
 src/Subscriptions/Subscription.php                      | 8 ++++++++
 tests/src/Subscriptions/SubscriptionPhasesTraitTest.php | 6 ++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Subscriptions/Subscription.php b/src/Subscriptions/Subscription.php
index e0364b61..2a1c6477 100644
--- a/src/Subscriptions/Subscription.php
+++ b/src/Subscriptions/Subscription.php
@@ -423,6 +423,14 @@ public function get_next_payment_date() {
 	 * @return void
 	 */
 	public function set_next_payment_date( $date ) {
+		$end_date = $this->get_end_date();
+
+		if ( null !== $end_date && $date >= $end_date ) {
+			$this->next_payment_date = null;
+
+			return;
+		}
+
 		$this->next_payment_date = ( null === $date ) ? null : DateTimeImmutable::create_from_interface( $date );
 	}
 
diff --git a/tests/src/Subscriptions/SubscriptionPhasesTraitTest.php b/tests/src/Subscriptions/SubscriptionPhasesTraitTest.php
index f511f265..2c22eed3 100644
--- a/tests/src/Subscriptions/SubscriptionPhasesTraitTest.php
+++ b/tests/src/Subscriptions/SubscriptionPhasesTraitTest.php
@@ -80,14 +80,12 @@ public function test_current_period_definition() {
 		$subscription = $this->new_subscription();
 
 		$phase_1 = $this->new_phase( $subscription );
+		$phase_2 = $this->new_phase( $subscription );
+		$phase_3 = $this->new_phase( $subscription );
 
 		$phase_1->set_total_periods( 1 );
 		$phase_1->set_periods_created( 1 );
 
-		$phase_2 = $this->new_phase( $subscription );
-
-		$phase_3 = $this->new_phase( $subscription );
-
 		$current_phase = $subscription->get_current_phase();
 
 		$this->assertEquals( $phase_2, $current_phase );

From 964c0275ccddb5b4777e5ba81a87262e7335e7e6 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Mon, 11 Apr 2022 11:07:12 +0200
Subject: [PATCH 80/87] Remove subscription phases trait.

---
 src/Subscriptions/Subscription.php            | 239 +++++++++++++++-
 src/Subscriptions/SubscriptionPhasesTrait.php | 260 ------------------
 .../SubscriptionPhasesTraitTest.php           | 117 --------
 tests/src/Subscriptions/SubscriptionTest.php  |  93 +++++++
 4 files changed, 330 insertions(+), 379 deletions(-)
 delete mode 100644 src/Subscriptions/SubscriptionPhasesTrait.php
 delete mode 100644 tests/src/Subscriptions/SubscriptionPhasesTraitTest.php

diff --git a/src/Subscriptions/Subscription.php b/src/Subscriptions/Subscription.php
index 2a1c6477..8a9072a4 100644
--- a/src/Subscriptions/Subscription.php
+++ b/src/Subscriptions/Subscription.php
@@ -14,6 +14,7 @@
 use Pronamic\WordPress\DateTime\DateTime;
 use Pronamic\WordPress\DateTime\DateTimeInterface;
 use Pronamic\WordPress\DateTime\DateTimeImmutable;
+use Pronamic\WordPress\Money\Money;
 use Pronamic\WordPress\Pay\Payments\PaymentInfo;
 use Pronamic\WordPress\Pay\Payments\PaymentStatus;
 use Pronamic\WordPress\Pay\Payments\Payment;
@@ -27,8 +28,6 @@
  * @since   1.0.0
  */
 class Subscription extends PaymentInfo implements \JsonSerializable {
-	use SubscriptionPhasesTrait;
-
 	/**
 	 * The status of this subscription, for example 'Success'.
 	 *
@@ -48,6 +47,13 @@ class Subscription extends PaymentInfo implements \JsonSerializable {
 	 */
 	private $activated_at;
 
+	/**
+	 * Phases.
+	 *
+	 * @var SubscriptionPhase[]
+	 */
+	private $phases = array();
+
 	/**
 	 * Construct and initialize subscription object.
 	 *
@@ -663,4 +669,233 @@ public function get_activated_at() {
 	public function set_activated_at( DateTime $activated_at ) {
 		$this->activated_at = $activated_at;
 	}
+
+	/**
+	 * Get phases.
+	 *
+	 * @return array<int, SubscriptionPhase>
+	 */
+	public function get_phases() {
+		return $this->phases;
+	}
+
+	/**
+	 * Set phases.
+	 *
+	 * @param array<int, SubscriptionPhase> $phases Phases.
+	 * @return void
+	 */
+	public function set_phases( $phases ) {
+		$this->phases = $phases;
+	}
+
+	/**
+	 * Add the specified phase to this subscription.
+	 *
+	 * @param SubscriptionPhase $phase Phase.
+	 * @return void
+	 */
+	public function add_phase( SubscriptionPhase $phase ) {
+		$this->phases[] = $phase;
+
+		if ( null === $this->next_payment_date ) {
+			$this->next_payment_date = $phase->get_start_date();
+		}
+
+		$phase->set_sequence_number( \count( $this->phases ) );
+	}
+
+	/**
+	 * Create new phase for this subscription.
+	 *
+	 * @param \DateTimeInterface $start_date    Start date.
+	 * @param string             $interval_spec Interval specification.
+	 * @param Money              $amount        Amount.
+	 * @return SubscriptionPhase
+	 */
+	public function new_phase( $start_date, $interval_spec, $amount ) {
+		$interval = new SubscriptionInterval( $interval_spec );
+
+		$phase = new SubscriptionPhase( $this, $start_date, $interval, $amount );
+
+		$this->add_phase( $phase );
+
+		return $phase;
+	}
+
+	/**
+	 * Check if all the periods within the subscription phases are created.
+	 *
+	 * @return bool True if all created, false otherwise.
+	 */
+	public function all_periods_created() {
+		foreach ( $this->phases as $phase ) {
+			if ( ! $phase->all_periods_created() ) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if this subscription is infinite.
+	 *
+	 * @return bool True if infinite, false otherwise.
+	 */
+	public function is_infinite() {
+		foreach ( $this->phases as $phase ) {
+			if ( $phase->is_infinite() ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Get current phase or null if all completed.
+	 *
+	 * @return SubscriptionPhase|null
+	 */
+	public function get_current_phase() {
+		foreach ( $this->phases as $phase ) {
+			if ( $phase->all_periods_created() ) {
+				continue;
+			}
+
+			if ( $phase->is_canceled() ) {
+				continue;
+			}
+
+			return $phase;
+		}
+
+		return null;
+	}
+
+	/**
+	 * Get phase for display.
+	 *
+	 * @return SubscriptionPhase|null
+	 */
+	public function get_display_phase() {
+		// Get first uncompleted regular phase.
+		foreach ( $this->phases as $phase ) {
+			// Skip trial phases.
+			if ( $phase->is_trial() ) {
+				continue;
+			}
+
+			// Skip prorated phases.
+			if ( $phase->is_prorated() ) {
+				continue;
+			}
+
+			if ( ! $phase->all_periods_created() ) {
+				return $phase;
+			}
+		}
+
+		// Get first regular phase.
+		foreach ( $this->phases as $phase ) {
+			// Skip trial phases.
+			if ( $phase->is_trial() ) {
+				continue;
+			}
+
+			// Skip prorated phases.
+			if ( $phase->is_prorated() ) {
+				continue;
+			}
+
+			return $phase;
+		}
+
+		// Get first phase.
+		foreach ( $this->phases as $phase ) {
+			return $phase;
+		}
+
+		return null;
+	}
+
+	/**
+	 * Check if subscription is in a trial period.
+	 *
+	 * @return bool True if current period definition is a trial, false otherwise.
+	 */
+	public function in_trial_period() {
+		$current_phase = $this->get_current_phase();
+
+		if ( null === $current_phase ) {
+			return false;
+		}
+
+		return $current_phase->is_trial();
+	}
+
+	/**
+	 * Get the next period.
+	 *
+	 * @return SubscriptionPeriod|null
+	 */
+	public function get_next_period() {
+		$current_phase = $this->get_current_phase();
+
+		if ( null === $current_phase ) {
+			return null;
+		}
+
+		return $current_phase->get_next_period();
+	}
+
+	/**
+	 * Next period.
+	 *
+	 * @return SubscriptionPeriod|null
+	 */
+	public function next_period() {
+		$current_phase = $this->get_current_phase();
+
+		if ( null === $current_phase ) {
+			return null;
+		}
+
+		return $current_phase->next_period();
+	}
+
+	/**
+	 * Get phase by sequence number.
+	 *
+	 * @param int $sequence_number Sequence number.
+	 * @return SubscriptionPhase|null
+	 */
+	public function get_phase_by_sequence_number( $sequence_number ) {
+		/**
+		 * PHP arrays are zero-based indexed, sequence number starts from 1.
+		 */
+		$key = $sequence_number - 1;
+
+		if ( array_key_exists( $key, $this->phases ) ) {
+			return $this->phases[ $key ];
+		}
+
+		return null;
+	}
+
+	/**
+	 * Get end date.
+	 *
+	 * @return DateTimeImmutable|null
+	 */
+	public function get_end_date() {
+		$end_phase = \end( $this->phases );
+
+		if ( false === $end_phase ) {
+			return null;
+		}
+
+		return $end_phase->get_end_date();
+	}
 }
diff --git a/src/Subscriptions/SubscriptionPhasesTrait.php b/src/Subscriptions/SubscriptionPhasesTrait.php
deleted file mode 100644
index b5dc463c..00000000
--- a/src/Subscriptions/SubscriptionPhasesTrait.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-/**
- * Subscription Phases Trait
- *
- * @author    Pronamic <info@pronamic.eu>
- * @copyright 2005-2022 Pronamic
- * @license   GPL-3.0-or-later
- * @package   Pronamic\WordPress\Pay\Subscriptions
- */
-
-namespace Pronamic\WordPress\Pay\Subscriptions;
-
-use Pronamic\WordPress\DateTime\DateTime;
-use Pronamic\WordPress\DateTime\DateTimeImmutable;
-use Pronamic\WordPress\Money\Money;
-
-/**
- * Subscription Phases Trait
- *
- * @author  Remco Tolsma
- * @version 2.5.0
- * @since   2.5.0
- */
-trait SubscriptionPhasesTrait {
-	/**
-	 * Phases.
-	 *
-	 * @var SubscriptionPhase[]
-	 */
-	private $phases = array();
-
-	/**
-	 * Get phases.
-	 *
-	 * @return array<int, SubscriptionPhase>
-	 */
-	public function get_phases() {
-		return $this->phases;
-	}
-
-	/**
-	 * Set phases.
-	 *
-	 * @param array<int, SubscriptionPhase> $phases Phases.
-	 * @return void
-	 */
-	public function set_phases( $phases ) {
-		$this->phases = $phases;
-	}
-
-	/**
-	 * Add the specified phase to this subscription.
-	 *
-	 * @param SubscriptionPhase $phase Phase.
-	 * @return void
-	 */
-	public function add_phase( SubscriptionPhase $phase ) {
-		$this->phases[] = $phase;
-
-		if ( null === $this->next_payment_date ) {
-			$this->next_payment_date = $phase->get_start_date();
-		}
-
-		$phase->set_sequence_number( \count( $this->phases ) );
-	}
-
-	/**
-	 * Create new phase for this subscription.
-	 *
-	 * @param \DateTimeInterface $start_date    Start date.
-	 * @param string             $interval_spec Interval specification.
-	 * @param Money              $amount        Amount.
-	 * @return SubscriptionPhase
-	 */
-	public function new_phase( $start_date, $interval_spec, $amount ) {
-		$interval = new SubscriptionInterval( $interval_spec );
-
-		$phase = new SubscriptionPhase( $this, $start_date, $interval, $amount );
-
-		$this->add_phase( $phase );
-
-		return $phase;
-	}
-
-	/**
-	 * Check if all the periods within the subscription phases are created.
-	 *
-	 * @return bool True if all created, false otherwise.
-	 */
-	public function all_periods_created() {
-		foreach ( $this->phases as $phase ) {
-			if ( ! $phase->all_periods_created() ) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Check if this subscription is infinite.
-	 *
-	 * @return bool True if infinite, false otherwise.
-	 */
-	public function is_infinite() {
-		foreach ( $this->phases as $phase ) {
-			if ( $phase->is_infinite() ) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Get current phase or null if all completed.
-	 *
-	 * @return SubscriptionPhase|null
-	 */
-	public function get_current_phase() {
-		foreach ( $this->phases as $phase ) {
-			if ( $phase->all_periods_created() ) {
-				continue;
-			}
-
-			if ( $phase->is_canceled() ) {
-				continue;
-			}
-
-			return $phase;
-		}
-
-		return null;
-	}
-
-	/**
-	 * Get phase for display.
-	 *
-	 * @return SubscriptionPhase|null
-	 */
-	public function get_display_phase() {
-		// Get first uncompleted regular phase.
-		foreach ( $this->phases as $phase ) {
-			// Skip trial phases.
-			if ( $phase->is_trial() ) {
-				continue;
-			}
-
-			// Skip prorated phases.
-			if ( $phase->is_prorated() ) {
-				continue;
-			}
-
-			if ( ! $phase->all_periods_created() ) {
-				return $phase;
-			}
-		}
-
-		// Get first regular phase.
-		foreach ( $this->phases as $phase ) {
-			// Skip trial phases.
-			if ( $phase->is_trial() ) {
-				continue;
-			}
-
-			// Skip prorated phases.
-			if ( $phase->is_prorated() ) {
-				continue;
-			}
-
-			return $phase;
-		}
-
-		// Get first phase.
-		foreach ( $this->phases as $phase ) {
-			return $phase;
-		}
-
-		return null;
-	}
-
-	/**
-	 * Check if subscription is in a trial period.
-	 *
-	 * @return bool True if current period definition is a trial, false otherwise.
-	 */
-	public function in_trial_period() {
-		$current_phase = $this->get_current_phase();
-
-		if ( null === $current_phase ) {
-			return false;
-		}
-
-		return $current_phase->is_trial();
-	}
-
-	/**
-	 * Get the next period.
-	 *
-	 * @return SubscriptionPeriod|null
-	 */
-	public function get_next_period() {
-		$current_phase = $this->get_current_phase();
-
-		if ( null === $current_phase ) {
-			return null;
-		}
-
-		return $current_phase->get_next_period();
-	}
-
-	/**
-	 * Next period.
-	 *
-	 * @return SubscriptionPeriod|null
-	 */
-	public function next_period() {
-		$current_phase = $this->get_current_phase();
-
-		if ( null === $current_phase ) {
-			return null;
-		}
-
-		return $current_phase->next_period();
-	}
-
-	/**
-	 * Get phase by sequence number.
-	 *
-	 * @param int $sequence_number Sequence number.
-	 * @return SubscriptionPhase|null
-	 */
-	public function get_phase_by_sequence_number( $sequence_number ) {
-		/**
-		 * PHP arrays are zero-based indexed, sequence number starts from 1.
-		 */
-		$key = $sequence_number - 1;
-
-		if ( array_key_exists( $key, $this->phases ) ) {
-			return $this->phases[ $key ];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Get end date.
-	 *
-	 * @return DateTimeImmutable|null
-	 */
-	public function get_end_date() {
-		$end_phase = \end( $this->phases );
-
-		if ( false === $end_phase ) {
-			return null;
-		}
-
-		return $end_phase->get_end_date();
-	}
-}
diff --git a/tests/src/Subscriptions/SubscriptionPhasesTraitTest.php b/tests/src/Subscriptions/SubscriptionPhasesTraitTest.php
deleted file mode 100644
index 2c22eed3..00000000
--- a/tests/src/Subscriptions/SubscriptionPhasesTraitTest.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * Subscription Phases Trait Test
- *
- * @author    Pronamic <info@pronamic.eu>
- * @copyright 2005-2022 Pronamic
- * @license   GPL-3.0-or-later
- * @package   Pronamic\WordPress\Pay\Payments
- */
-
-namespace Pronamic\WordPress\Pay\Subscriptions;
-
-use Pronamic\WordPress\Money\Money;
-use Pronamic\WordPress\Money\TaxedMoney;
-use Yoast\PHPUnitPolyfills\TestCases\TestCase;
-
-/**
- * Subscription Phases Trait Test
- *
- * @author  Remco Tolsma
- * @version 2.5.0
- */
-class SubscriptionPhasesTraitTest extends TestCase {
-	/**
-	 * Create new subscription.
-	 *
-	 * @return Subscription
-	 * @throws \Exception Throws exception on invalid date interval.
-	 */
-	private function new_subscription() {
-		$subscription = new Subscription();
-
-		return $subscription;
-	}
-
-	/**
-	 * New phase for subscription.
-	 *
-	 * @param Subscription $subscription Subscription.
-	 * @return SubscriptionPhase
-	 * @throws \Exception Throws exception on invalid date interval.
-	 */
-	private function new_phase( $subscription ) {
-		$phase = $subscription->new_phase( new \DateTimeImmutable(), 'P1W', new TaxedMoney( 50, 'EUR' ) );
-
-		return $phase;
-	}
-
-	/**
-	 * Test new period definition.
-	 */
-	public function test_new_period_definition() {
-		$subscription = $this->new_subscription();
-
-		$phase_1 = $this->new_phase( $subscription );
-
-		$this->assertInstanceOf( SubscriptionPhase::class, $phase_1 );
-
-		$phase_2 = $this->new_phase( $subscription );
-
-		$this->assertInstanceOf( SubscriptionPhase::class, $phase_2 );
-	}
-
-	/**
-	 * Test infinite.
-	 */
-	public function test_infinite() {
-		$subscription = $this->new_subscription();
-
-		$phase_1 = $this->new_phase( $subscription );
-		$phase_2 = $this->new_phase( $subscription );
-
-		$this->assertTrue( $subscription->is_infinite() );
-	}
-
-	/**
-	 * Test current period definition.
-	 */
-	public function test_current_period_definition() {
-		$subscription = $this->new_subscription();
-
-		$phase_1 = $this->new_phase( $subscription );
-		$phase_2 = $this->new_phase( $subscription );
-		$phase_3 = $this->new_phase( $subscription );
-
-		$phase_1->set_total_periods( 1 );
-		$phase_1->set_periods_created( 1 );
-
-		$current_phase = $subscription->get_current_phase();
-
-		$this->assertEquals( $phase_2, $current_phase );
-	}
-
-	/**
-	 * Test in trial period.
-	 */
-	public function test_in_trial_period() {
-		$subscription = $this->new_subscription();
-
-		$phase_1 = $this->new_phase( $subscription );
-		$phase_2 = $this->new_phase( $subscription );
-		$phase_3 = $this->new_phase( $subscription );
-
-		$current_phase = $subscription->get_current_phase();
-
-		$this->assertFalse( $subscription->in_trial_period() );
-
-		$phase_1->set_trial( true );
-
-		$this->assertTrue( $subscription->in_trial_period() );
-
-		$phase_1->set_total_periods( 1 );
-		$phase_1->set_periods_created( 1 );
-
-		$this->assertFalse( $subscription->in_trial_period() );
-	}
-}
diff --git a/tests/src/Subscriptions/SubscriptionTest.php b/tests/src/Subscriptions/SubscriptionTest.php
index 4f07b81e..cc9d6ee5 100644
--- a/tests/src/Subscriptions/SubscriptionTest.php
+++ b/tests/src/Subscriptions/SubscriptionTest.php
@@ -178,4 +178,97 @@ public function test_new_period() {
 		$this->assertEquals( '2005-06-05', $period->get_end_date()->format( 'Y-m-d' ) );
 		$this->assertEquals( 89.95, $period->get_amount()->get_value() );
 	}
+	/**
+	 * Create new subscription.
+	 *
+	 * @return Subscription
+	 * @throws \Exception Throws exception on invalid date interval.
+	 */
+	private function new_subscription() {
+		$subscription = new Subscription();
+
+		return $subscription;
+	}
+
+	/**
+	 * New phase for subscription.
+	 *
+	 * @param Subscription $subscription Subscription.
+	 * @return SubscriptionPhase
+	 * @throws \Exception Throws exception on invalid date interval.
+	 */
+	private function new_phase( $subscription ) {
+		$phase = $subscription->new_phase( new \DateTimeImmutable(), 'P1W', new TaxedMoney( 50, 'EUR' ) );
+
+		return $phase;
+	}
+
+	/**
+	 * Test new period definition.
+	 */
+	public function test_new_period_definition() {
+		$subscription = $this->new_subscription();
+
+		$phase_1 = $this->new_phase( $subscription );
+
+		$this->assertInstanceOf( SubscriptionPhase::class, $phase_1 );
+
+		$phase_2 = $this->new_phase( $subscription );
+
+		$this->assertInstanceOf( SubscriptionPhase::class, $phase_2 );
+	}
+
+	/**
+	 * Test infinite.
+	 */
+	public function test_infinite() {
+		$subscription = $this->new_subscription();
+
+		$phase_1 = $this->new_phase( $subscription );
+		$phase_2 = $this->new_phase( $subscription );
+
+		$this->assertTrue( $subscription->is_infinite() );
+	}
+
+	/**
+	 * Test current period definition.
+	 */
+	public function test_current_period_definition() {
+		$subscription = $this->new_subscription();
+
+		$phase_1 = $this->new_phase( $subscription );
+		$phase_2 = $this->new_phase( $subscription );
+		$phase_3 = $this->new_phase( $subscription );
+
+		$phase_1->set_total_periods( 1 );
+		$phase_1->set_periods_created( 1 );
+
+		$current_phase = $subscription->get_current_phase();
+
+		$this->assertEquals( $phase_2, $current_phase );
+	}
+
+	/**
+	 * Test in trial period.
+	 */
+	public function test_in_trial_period() {
+		$subscription = $this->new_subscription();
+
+		$phase_1 = $this->new_phase( $subscription );
+		$phase_2 = $this->new_phase( $subscription );
+		$phase_3 = $this->new_phase( $subscription );
+
+		$current_phase = $subscription->get_current_phase();
+
+		$this->assertFalse( $subscription->in_trial_period() );
+
+		$phase_1->set_trial( true );
+
+		$this->assertTrue( $subscription->in_trial_period() );
+
+		$phase_1->set_total_periods( 1 );
+		$phase_1->set_periods_created( 1 );
+
+		$this->assertFalse( $subscription->in_trial_period() );
+	}
 }

From 7f76b3f9a0b6a8839f042f49fad6752f7ad93d18 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Mon, 11 Apr 2022 11:11:41 +0200
Subject: [PATCH 81/87] Update SubscriptionsDataStoreCPT.php

---
 src/Subscriptions/SubscriptionsDataStoreCPT.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Subscriptions/SubscriptionsDataStoreCPT.php b/src/Subscriptions/SubscriptionsDataStoreCPT.php
index d1b18f82..7e1a5e9d 100644
--- a/src/Subscriptions/SubscriptionsDataStoreCPT.php
+++ b/src/Subscriptions/SubscriptionsDataStoreCPT.php
@@ -617,7 +617,7 @@ protected function read_post_meta( $subscription ) {
 		}
 
 		// Set next date.
-		$next_date = $this->get_meta_date( $id, 'next_payment_date' );
+		$next_date = $this->get_meta_date( $id, 'next_payment' );
 
 		$subscription->set_next_payment_date( $next_date );
 

From a5f1fe7893fe02d1ac685731d4735cfad27d5b16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Mon, 11 Apr 2022 11:27:54 +0200
Subject: [PATCH 82/87] Coding standards.

---
 src/Subscriptions/Subscription.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Subscriptions/Subscription.php b/src/Subscriptions/Subscription.php
index 8a9072a4..cf564d97 100644
--- a/src/Subscriptions/Subscription.php
+++ b/src/Subscriptions/Subscription.php
@@ -54,6 +54,13 @@ class Subscription extends PaymentInfo implements \JsonSerializable {
 	 */
 	private $phases = array();
 
+	/**
+	 * Next payment date.
+	 *
+	 * @var DateTimeImmutable|null
+	 */
+	private $next_payment_date;
+
 	/**
 	 * Construct and initialize subscription object.
 	 *
@@ -425,7 +432,7 @@ public function get_next_payment_date() {
 	/**
 	 * Set the next payment date of this subscription.
 	 *
-	 * @param $date Date.
+	 * @param DateTimeInterface $date Date.
 	 * @return void
 	 */
 	public function set_next_payment_date( $date ) {

From e37c9cbd4af1480f4a1c5d4114777b679164da50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Mon, 11 Apr 2022 11:28:39 +0200
Subject: [PATCH 83/87] Update next payment date in subscription instead of
 current phase on manual edit.

---
 .../SubscriptionsDataStoreCPT.php             | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Subscriptions/SubscriptionsDataStoreCPT.php b/src/Subscriptions/SubscriptionsDataStoreCPT.php
index 7e1a5e9d..c7f71a1f 100644
--- a/src/Subscriptions/SubscriptionsDataStoreCPT.php
+++ b/src/Subscriptions/SubscriptionsDataStoreCPT.php
@@ -229,27 +229,27 @@ private function update_subscription_form_post_array( $subscription, $postarr )
 
 			$new_value = $postarr['pronamic_subscription_next_payment_date'];
 
-			$current_phase = $subscription->get_current_phase();
-
-			if ( null !== $current_phase && ! empty( $new_value ) && $old_value !== $new_value ) {
+			if ( ! empty( $new_value ) && $old_value !== $new_value ) {
 				$new_date = new DateTimeImmutable( $new_value );
 
-				$next_date = $current_phase->get_next_date();
+				$next_payment_date = $subscription->get_next_payment_date();
 
-				$updated_date = null === $next_date ? clone $new_date : clone $next_date;
+				$updated_date = null === $next_payment_date ? clone $new_date : clone $next_payment_date;
 
 				$updated_date = $updated_date->setDate( (int) $new_date->format( 'Y' ), (int) $new_date->format( 'm' ), (int) $new_date->format( 'd' ) );
 
-				$current_phase->set_next_date( $updated_date );
+				if ( false !== $updated_date ) {
+					$subscription->set_next_payment_date( $updated_date );
 
-				$note = \sprintf(
+					$note = \sprintf(
 					/* translators: %1: old formatted date, %2: new formatted date */
-					\__( 'Next payment date updated from %1$s to %2$s.', 'pronamic_ideal' ),
-					null === $next_date ? '' : $next_date->format_i18n( \__( 'D j M Y', 'pronamic_ideal' ) ),
-					$updated_date->format_i18n( \__( 'D j M Y', 'pronamic_ideal' ) )
-				);
+						\__( 'Next payment date updated from %1$s to %2$s.', 'pronamic_ideal' ),
+						null === $next_payment_date ? '' : $next_payment_date->format_i18n( \__( 'D j M Y', 'pronamic_ideal' ) ),
+						$updated_date->format_i18n( \__( 'D j M Y', 'pronamic_ideal' ) )
+					);
 
-				$subscription->add_note( $note );
+					$subscription->add_note( $note );
+				}
 			}
 		}
 	}

From 6ab12f2c8ebcc3e6a97745068a0ff622e6b2c56a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= <reuel@pronamic.nl>
Date: Mon, 11 Apr 2022 11:40:34 +0200
Subject: [PATCH 84/87] Coding standards.

---
 src/Subscriptions/SubscriptionsDataStoreCPT.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Subscriptions/SubscriptionsDataStoreCPT.php b/src/Subscriptions/SubscriptionsDataStoreCPT.php
index c7f71a1f..38f6e231 100644
--- a/src/Subscriptions/SubscriptionsDataStoreCPT.php
+++ b/src/Subscriptions/SubscriptionsDataStoreCPT.php
@@ -242,7 +242,7 @@ private function update_subscription_form_post_array( $subscription, $postarr )
 					$subscription->set_next_payment_date( $updated_date );
 
 					$note = \sprintf(
-					/* translators: %1: old formatted date, %2: new formatted date */
+						/* translators: %1: old formatted date, %2: new formatted date */
 						\__( 'Next payment date updated from %1$s to %2$s.', 'pronamic_ideal' ),
 						null === $next_payment_date ? '' : $next_payment_date->format_i18n( \__( 'D j M Y', 'pronamic_ideal' ) ),
 						$updated_date->format_i18n( \__( 'D j M Y', 'pronamic_ideal' ) )

From 5677c598542ab9c89fc8ed0643f3644232486355 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Mon, 11 Apr 2022 13:01:20 +0200
Subject: [PATCH 85/87] Update SubscriptionPhase.php

---
 src/Subscriptions/SubscriptionPhase.php | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/Subscriptions/SubscriptionPhase.php b/src/Subscriptions/SubscriptionPhase.php
index 3a66c9a5..5cbc970b 100644
--- a/src/Subscriptions/SubscriptionPhase.php
+++ b/src/Subscriptions/SubscriptionPhase.php
@@ -73,17 +73,6 @@ class SubscriptionPhase implements \JsonSerializable {
 	 */
 	private $end_date;
 
-	/**
-	 * The start date of the next period, also known as:
-	 * - Billing cycle anchor (billing_cycle_anchor).
-	 * - Period anchor.
-	 *
-	 * @link https://stripe.com/docs/billing/subscriptions/billing-cycle
-	 * @link https://stripe.com/docs/api/subscriptions/create#create_subscription-billing_cycle_anchor
-	 * @var DateTimeImmutable|null
-	 */
-	private $next_date;
-
 	/**
 	 * Alignment rate.
 	 *
@@ -308,14 +297,16 @@ public function set_total_periods( $total_periods ) {
 	 * @return int
 	 */
 	public function get_periods_created() {
-		if ( null === $this->next_date ) {
+		$next_date = $this->subscription->get_next_payment_date();
+
+		if ( null === $next_date ) {
 			return 0;
 		}
 
 		$period = new \DatePeriod(
 			new \DateTimeImmutable( $this->start_date->format( 'Y-m-d 00:00:00' ) ),
 			$this->interval,
-			new \DateTimeImmutable( $this->next_date->format( 'Y-m-d 00:00:00' ) )
+			new \DateTimeImmutable( $next_date->format( 'Y-m-d 00:00:00' ) )
 		);
 
 		return \iterator_count( $period );

From 6f5d86372426d917fe6bc1376b202d75d772122c Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Mon, 11 Apr 2022 14:54:45 +0200
Subject: [PATCH 86/87] Remove publishing actions div.

---
 views/meta-box-subscription-update.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/views/meta-box-subscription-update.php b/views/meta-box-subscription-update.php
index b99f41c3..c6e70626 100644
--- a/views/meta-box-subscription-update.php
+++ b/views/meta-box-subscription-update.php
@@ -32,10 +32,6 @@
 <input type="hidden" name="post_author_override" value="<?php echo esc_attr( $post_author ); ?>" />
 
 <div class="pronamic-pay-inner">
-	<div id="minor-publishing-actions">
-		<div class="clear"></div>
-	</div>
-
 	<div class="pronamic-pay-minor-actions">
 		<div class="misc-pub-section misc-pub-post-status">
 			<?php echo esc_html( __( 'Status:', 'pronamic_ideal' ) ); ?>

From 5417c7031b3b8e3b0f2e097878d1e54d701bf609 Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Mon, 11 Apr 2022 15:32:48 +0200
Subject: [PATCH 87/87] Working in 4.1.0.

---
 CHANGELOG.md | 12 ++++++++++++
 package.json |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d648041..1d646843 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,18 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 ## [Unreleased][unreleased]
 - Updated https://github.com/pronamic/wp-pay-logos to version `1.7.1`.
 
+## [4.1.0] - 2022-04-11
+### Added
+- Added a user interface to change a subscription's next payment date.
+- Added a count badge in the WordPress admin menu for the number of subscriptions on hold.
+
+### Changed
+- The next payment date is now stored in the subscription and no longer in the subscription phases.
+
+### Removed
+- The general / global gateway integration mode setting for test or live mode is removed.
+- Sorting payments by customer or transaction number in the WordPress admin dashboard has been removed.
+
 ## [4.0.2] - 2022-02-16
 - Changed minimum PHP version requirement to `7.4` ([pronamic/wp-pronamic-pay#274](https://github.com/pronamic/wp-pronamic-pay/issues/274)).
 - Changed follow-up payments query to subscriptions which needed renewal in past 24 hours only.
diff --git a/package.json b/package.json
index 8c92b895..34876439 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@wp-pay/core",
-  "version": "4.0.2",
+  "version": "4.1.0",
   "description": "Core components for the WordPress payment processing library.",
   "repository": {
     "type": "git",