Align renewal notification meta key with 14-day default

Author: Copilot

src/Subscriptions/SubscriptionsNotificationsController.php

@@ -148,7 +148,11 @@ private function meets_notification_requirements( Subscription $subscription ) {
 		 * If a notification has already been sent in the past 2 weeks, it no longer
 		 * makes sense to send a notification.
 		 */
-		$notification_date_string = $subscription->get_meta( 'notification_date_1_week' );
+		$notification_date_string = $subscription->get_meta( 'notification_date_renewal' );
+
+		if ( empty( $notification_date_string ) ) {
+			$notification_date_string = $subscription->get_meta( 'notification_date_1_week' );
+		}
 
 		if ( $notification_date_string ) {
 			$notification_date = new DateTime( $notification_date_string );
@@ -251,7 +255,10 @@ public function send_subscription_renewal_notification( Subscription $subscripti
 		 */
 		\do_action( 'pronamic_subscription_renewal_notice_' . $source, $subscription );
 
-		$subscription->set_meta( 'notification_date_1_week', \gmdate( DATE_ATOM ) );
+		$notification_date = \gmdate( DATE_ATOM );
+
+		$subscription->set_meta( 'notification_date_renewal', $notification_date );
+		$subscription->set_meta( 'notification_date_1_week', $notification_date );
 	}
 
 	/**

tests/src/Subscriptions/SubscriptionsNotificationsControllerTest.php

@@ -92,13 +92,13 @@ public function test_no_notification_within_2_weeks() {
 
 		$phase = new SubscriptionPhase(
 			$subscription,
-			new \DateTime( '-1 week midnight', new \DateTimeZone( 'GMT' ) ),
+			new \DateTime( '-3 weeks midnight', new \DateTimeZone( 'GMT' ) ),
 			new SubscriptionInterval( 'P1M' ),
 			new Money( '10', 'EUR' )
 		);
 
 		$subscription->add_phase( $phase );
-		$subscription->set_meta( 'notification_date_1_week', \gmdate( DATE_ATOM, \strtotime( '-8 days' ) ) );
+		$subscription->set_meta( 'notification_date_renewal', \gmdate( DATE_ATOM, \strtotime( '-8 days' ) ) );
 		$subscription->save();
 
 		$notifications_controller->send_subscription_renewal_notification( $subscription );