3.2 RC1 changelog and version numbers

strangerstudios · Sep 26, 2024 · cdb5db4 · cdb5db4
1 parent d09c472
commit cdb5db4
Show file tree

Hide file tree

Showing 23 changed files with 120 additions and 118 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,5 +1,5 @@
 == Changelog ==
-= 3.2 - TBD =
+= 3.2 RC1 - 09-26-2024 =
 * FEATURE: Users will now receive a notification email when they have an upcoming subscription payment. #3109 (@dparker1005)
 * FEATURE: Added integration with Cloudflare Turnstile. #3123 (@andrewlimaza)
 * ENHANCEMENT: The business address for the website can now be set on the Advanced Settings page and will be shown on invoices. #3134 (@MaximilianoRicoTabo)
@@ -11,6 +11,7 @@
 * ENHANCEMENT: Now creating a user at checkout even when order creation checks fail. #3137 (@dparker1005)
 * ENHANCEMENT: Memberships on the Membership Account page will now be shown in the order set on the Membership Levels settings page. #3112 (@kimcoleman)
 * BUG FIX/ENHANCEMENT: Street2 billing address lines are now stored separately in the MemberOrder object. #3122 (@dparker1005)
+* BUG FIX: Fixed an issue where payment fields on the update billing page might be wrapped in nested cards. #3143 (@kimcoleman)
 * REFACTOR: Abstracted all "Terms of Service" logic into a single file. #3119 (@dparker1005)
 * REFACTOR: Abstracted all reCAPTCHA logic into a single file. #3105 (@dparker1005)
 * REFACTOR: Cleaned up the checkout preheader flow including deprecating the `pmpro_build_order_for_checkout()` function in favor of inline logic. #3129 (@dparker1005)

diff --git a/adminpages/emailtemplates.php b/adminpages/emailtemplates.php
@@ -103,7 +103,7 @@ function( $key ) {
 							/**
 							 * Filter the extra actions for this template.
 							 *
-							 * @since TBD
+							 * @since 3.2
 							 *
 							 * @param array  $actions The list of actions.
 							 * @param object $template   The email template data.

diff --git a/adminpages/securitysettings.php b/adminpages/securitysettings.php
@@ -32,7 +32,7 @@
 		/**
 		 * Fires after security settings are saved.
 		 *
-		 * @since TBD
+		 * @since 3.2
 		 */
 		do_action( 'pmpro_save_security_settings' );
 
@@ -166,7 +166,7 @@ function pmpro_is_plugin_installed_or_active( $plugin_file ) {
 						 * Fires after the spam protection settings are displayed.
 						 * Can be used to add additional spam protection settings.
 						 *
-						 * @since TBD
+						 * @since 3.2
 						 */
 						do_action( 'pmpro_security_spam_fields' );
 						?>

diff --git a/classes/class-pmpro-field.php b/classes/class-pmpro-field.php
@@ -258,7 +258,7 @@ class PMPro_Field {
 	/**
 	 * The default value for a field.
 	 *
-	 * @since TBD
+	 * @since 3.2
 	 *
 	 * @var string
 	 */
@@ -267,7 +267,7 @@ class PMPro_Field {
 	/**
 	 * File upload types.
 	 * 
-	 * @since TBD
+	 * @since 3.2
 	 * 
 	 * @var string
 	 *
@@ -277,7 +277,7 @@ class PMPro_Field {
 	/**
 	 * File upload limit
 	 * 
-	 * @since TBD
+	 * @since 3.2
 	 * 
 	 * @var int
 	 */
@@ -676,7 +676,7 @@ function getHTML($value = "")
 			 * @param string $value The default value for the field.
 			 * @param object $this The field object.
 			 * 
-			 * @since TBD
+			 * @since 3.2
 			 */
 			$value = apply_filters( 'pmpro_field_default_value', $this->default, $this );
 		}

diff --git a/classes/class.memberorder.php b/classes/class.memberorder.php
@@ -346,80 +346,80 @@ public function __get( $property ) {
 			 */
 			switch ( $property ) {
 				case 'ExpirationDate':
-					_doing_it_wrong( __METHOD__, __( 'ExpirationDate is deprecated. Use expirationmonth and expirationyear instead.', 'paid-memberships-pro' ), 'TBD' );
+					_doing_it_wrong( __METHOD__, __( 'ExpirationDate is deprecated. Use expirationmonth and expirationyear instead.', 'paid-memberships-pro' ), '3.2' );
 					return $this->expirationmonth . $this->expirationyear;
 				case 'ExpirationDate_YdashM':
-					_doing_it_wrong( __METHOD__, __( 'ExpirationDate_YdashM is deprecated. Use expirationyear and expirationmonth instead.', 'paid-memberships-pro' ), 'TBD' );
+					_doing_it_wrong( __METHOD__, __( 'ExpirationDate_YdashM is deprecated. Use expirationyear and expirationmonth instead.', 'paid-memberships-pro' ), '3.2' );
 					return $this->expirationyear . '-' . $this->expirationmonth;
 				case 'membership_name':
-					_doing_it_wrong( __METHOD__, __( 'membership_name is deprecated. Use pmpro_getLevel() instead.', 'paid-memberships-pro' ), 'TBD' );
+					_doing_it_wrong( __METHOD__, __( 'membership_name is deprecated. Use pmpro_getLevel() instead.', 'paid-memberships-pro' ), '3.2' );
 					$level = pmpro_getLevel( $this->membership_id );
 					return empty( $level->name ) ? '' : $level->name;
 				case 'InitialPayment':
-					_doing_it_wrong( __METHOD__, __( 'InitialPayment is deprecated. Use subtotal instead.', 'paid-memberships-pro' ), 'TBD' );
+					_doing_it_wrong( __METHOD__, __( 'InitialPayment is deprecated. Use subtotal instead.', 'paid-memberships-pro' ), '3.2' );
 					return $this->subtotal;
 				case 'PaymentAmount':
-					_doing_it_wrong( __METHOD__, __( 'PaymentAmount is deprecated. Get billing_amount from $this->getMembershipLevelAtCheckout() instead.', 'paid-memberships-pro' ), 'TBD' );
+					_doing_it_wrong( __METHOD__, __( 'PaymentAmount is deprecated. Get billing_amount from $this->getMembershipLevelAtCheckout() instead.', 'paid-memberships-pro' ), '3.2' );
 					$level = $this->getMembershipLevelAtCheckout();
 					return empty( $level->billing_amount ) ? 0 : $level->billing_amount;
 				case 'BillingPeriod':
-					_doing_it_wrong( __METHOD__, __( 'BillingPeriod is deprecated. Get cycle_period from $this->getMembershipLevelAtCheckout() instead.', 'paid-memberships-pro' ), 'TBD' );
+					_doing_it_wrong( __METHOD__, __( 'BillingPeriod is deprecated. Get cycle_period from $this->getMembershipLevelAtCheckout() instead.', 'paid-memberships-pro' ), '3.2' );
 					$level = $this->getMembershipLevelAtCheckout();
 					return empty( $level->cycle_period ) ? '' : $level->cycle_period;
 				case 'BillingFrequency':
-					_doing_it_wrong( __METHOD__, __( 'BillingFrequency is deprecated. Get cycle_number from $this->getMembershipLevelAtCheckout() instead.', 'paid-memberships-pro' ), 'TBD' );
+					_doing_it_wrong( __METHOD__, __( 'BillingFrequency is deprecated. Get cycle_number from $this->getMembershipLevelAtCheckout() instead.', 'paid-memberships-pro' ), '3.2' );
 					$level = $this->getMembershipLevelAtCheckout();
 					return empty( $level->cycle_number ) ? 0 : $level->cycle_number;
 				case 'TrialBillingPeriod':
-					_doing_it_wrong( __METHOD__, __( 'TrialBillingPeriod is deprecated. Get cycle_period from $this->getMembershipLevelAtCheckout() if the level is a trial instead.', 'paid-memberships-pro' ), 'TBD' );
+					_doing_it_wrong( __METHOD__, __( 'TrialBillingPeriod is deprecated. Get cycle_period from $this->getMembershipLevelAtCheckout() if the level is a trial instead.', 'paid-memberships-pro' ), '3.2' );
 					$level = $this->getMembershipLevelAtCheckout();
 					return pmpro_isLevelTrial( $level ) ? $level->cycle_period : '';
 				case 'TrialBillingFrequency':
-					_doing_it_wrong( __METHOD__, __( 'TrialBillingFrequency is deprecated. Get cycle_number from $this->getMembershipLevelAtCheckout() if the level is a trial instead.', 'paid-memberships-pro' ), 'TBD' );
+					_doing_it_wrong( __METHOD__, __( 'TrialBillingFrequency is deprecated. Get cycle_number from $this->getMembershipLevelAtCheckout() if the level is a trial instead.', 'paid-memberships-pro' ), '3.2' );
 					$level = $this->getMembershipLevelAtCheckout();
 					return pmpro_isLevelTrial( $level ) ? $level->cycle_number : 0;
 				case 'TrialBillingCycles':
-					_doing_it_wrong( __METHOD__, __( 'TrialBillingCycles is deprecated. Get trial_limit from $this->getMembershipLevelAtCheckout() instead.', 'paid-memberships-pro' ), 'TBD' );
+					_doing_it_wrong( __METHOD__, __( 'TrialBillingCycles is deprecated. Get trial_limit from $this->getMembershipLevelAtCheckout() instead.', 'paid-memberships-pro' ), '3.2' );
 					$level = $this->getMembershipLevelAtCheckout();
 					return $level->trial_limit;
 				case 'TrialAmount':
-					_doing_it_wrong( __METHOD__, __( 'TrialAmount is deprecated. Get trial_amount from $this->getMembershipLevelAtCheckout() instead.', 'paid-memberships-pro' ), 'TBD' );
+					_doing_it_wrong( __METHOD__, __( 'TrialAmount is deprecated. Get trial_amount from $this->getMembershipLevelAtCheckout() instead.', 'paid-memberships-pro' ), '3.2' );
 					$level = $this->getMembershipLevelAtCheckout();
 					return pmpro_round_price( $level->trial_amount );
 				case 'TotalBillingCycles':
-					_doing_it_wrong( __METHOD__, __( 'TotalBillingCycles is deprecated. Get billing_limit from $this->getMembershipLevelAtCheckout() instead.', 'paid-memberships-pro' ), 'TBD' );
+					_doing_it_wrong( __METHOD__, __( 'TotalBillingCycles is deprecated. Get billing_limit from $this->getMembershipLevelAtCheckout() instead.', 'paid-memberships-pro' ), '3.2' );
 					$level = $this->getMembershipLevelAtCheckout();
 					return empty( $level->billing_limit ) ? 0 : $level->billing_limit;
 				case 'ProfileStartDate':
-					_doing_it_wrong( __METHOD__, __( 'ProfileStartDate is deprecated. Use the pmpro_calculate_profile_start_date() instead.', 'paid-memberships-pro' ), 'TBD' );
+					_doing_it_wrong( __METHOD__, __( 'ProfileStartDate is deprecated. Use the pmpro_calculate_profile_start_date() instead.', 'paid-memberships-pro' ), '3.2' );
 					return pmpro_calculate_profile_start_date( $this, 'Y-m-d\TH:i:s' );
 				case 'CVV2':
-					_doing_it_wrong( __METHOD__, __( 'CVV2 is deprecated. Use the CVV from $_REQUEST instead.', 'paid-memberships-pro' ), 'TBD' );
+					_doing_it_wrong( __METHOD__, __( 'CVV2 is deprecated. Use the CVV from $_REQUEST instead.', 'paid-memberships-pro' ), '3.2' );
 					return empty( $_REQUEST['CVV'] ) ? '' : sanitize_text_field( $_REQUEST['CVV'] );
 				case 'FirstName':
-					_doing_it_wrong( __METHOD__, __( 'FirstName is deprecated. Use the the billing name instead.', 'paid-memberships-pro' ), 'TBD' );
+					_doing_it_wrong( __METHOD__, __( 'FirstName is deprecated. Use the the billing name instead.', 'paid-memberships-pro' ), '3.2' );
 					$nameparts = pnp_split_full_name( $this->billing->name );
 					return empty( $nameparts['fname'] ) ? '' : $nameparts['fname'];
 				case 'LastName':
-					_doing_it_wrong( __METHOD__, __( 'LastName is deprecated. Use the the billing name instead.', 'paid-memberships-pro' ), 'TBD' );
+					_doing_it_wrong( __METHOD__, __( 'LastName is deprecated. Use the the billing name instead.', 'paid-memberships-pro' ), '3.2' );
 					$nameparts = pnp_split_full_name( $this->billing->name );
 					return empty( $nameparts['lname'] ) ? '' : $nameparts['lname'];
 				case 'Address1':
-					_doing_it_wrong( __METHOD__, __( 'Address1 is deprecated. Use the the billing address instead.', 'paid-memberships-pro' ), 'TBD' );
+					_doing_it_wrong( __METHOD__, __( 'Address1 is deprecated. Use the the billing address instead.', 'paid-memberships-pro' ), '3.2' );
 					return empty( $this->billing->street ) ? '' : $this->billing->street;
 				case 'Address2':
-					_doing_it_wrong( __METHOD__, __( 'Address2 is deprecated. Use the the billing address instead.', 'paid-memberships-pro' ), 'TBD' );
+					_doing_it_wrong( __METHOD__, __( 'Address2 is deprecated. Use the the billing address instead.', 'paid-memberships-pro' ), '3.2' );
 					return empty( $this->billing->street2 ) ? '' : $this->billing->street2;
 				case 'Email':
-					_doing_it_wrong( __METHOD__, __( 'Email is deprecated. Use the the user email instead.', 'paid-memberships-pro' ), 'TBD' );
+					_doing_it_wrong( __METHOD__, __( 'Email is deprecated. Use the the user email instead.', 'paid-memberships-pro' ), '3.2' );
 					$user = get_userdata( $this->user_id );
 					return empty( $user->user_email ) ? '' : $user->user_email;
 				case 'initial_amount':
-					_doing_it_wrong( __METHOD__, __( 'initial_amount is deprecated. Use the subtotal and then calculate the tax instead.', 'paid-memberships-pro' ), 'TBD' );
+					_doing_it_wrong( __METHOD__, __( 'initial_amount is deprecated. Use the subtotal and then calculate the tax instead.', 'paid-memberships-pro' ), '3.2' );
 					$initial_tax = $this->getTaxForPrice( $this->subtotal );
 					return pmpro_round_price((float)$this->subtotal + (float)$initial_tax);
 				case 'subscription_amount':
-					_doing_it_wrong( __METHOD__, __( 'subscription_amount is deprecated. Use the billing_amount from $this->getMembershipLevelAtCheckout() instead.', 'paid-memberships-pro' ), 'TBD' );
+					_doing_it_wrong( __METHOD__, __( 'subscription_amount is deprecated. Use the billing_amount from $this->getMembershipLevelAtCheckout() instead.', 'paid-memberships-pro' ), '3.2' );
 					$level = $this->getMembershipLevelAtCheckout();
 					$subscription_tax = $this->getTaxForPrice( $level->billing_amount );
 					return pmpro_round_price( (float)$level->billing_amount + (float)$subscription_tax );
@@ -1474,7 +1474,7 @@ function saveOrder()
 				//only on inserts, we might want to set the expirationmonth and expirationyear from ExpirationDate/
 				// This will be removed in a future version.
 				if( (empty($this->expirationmonth) || empty($this->expirationyear)) && !empty($this->ExpirationDate)) {
-					_doing_it_wrong( 'MemberOrder::saveOrder', 'ExpirationDate is deprecated. Use expirationmonth and expirationyear.', 'TBD' );
+					_doing_it_wrong( 'MemberOrder::saveOrder', 'ExpirationDate is deprecated. Use expirationmonth and expirationyear.', '3.2' );
 					$this->expirationmonth = substr($this->ExpirationDate, 0, 2);
 					$this->expirationyear = substr($this->ExpirationDate, 2, 4);
 				}
@@ -1643,11 +1643,11 @@ function process()
 		 * For offsite gateways with a confirm step.
 		 *
 		 * @since 1.8
-		 * @deprecated TBD
+		 * @deprecated 3.2
 		 */
 		function confirm()
 		{
-			_deprecated_function( __FUNCTION__, 'TBD' );
+			_deprecated_function( __FUNCTION__, '3.2' );
 			if (is_object($this->Gateway)) {
 				return $this->Gateway->confirm($this);
 			}
@@ -1680,11 +1680,11 @@ function updateBilling()
 		/**
 		 * Call the getSubscriptionStatus method of the gateway class.
 		 *
-		 * @deprecated TBD
+		 * @deprecated 3.2
 		 */
 		function getGatewaySubscriptionStatus()
 		{
-			_deprecated_function( __FUNCTION__, 'TBD' );
+			_deprecated_function( __FUNCTION__, '3.2' );
 			if (is_object($this->Gateway)) {
 				return $this->Gateway->getSubscriptionStatus( $this );
 			}
@@ -1693,11 +1693,11 @@ function getGatewaySubscriptionStatus()
 		/**
 		 * Call the getTransactionStatus method of the gateway class.
 		 *
-		 * @deprecated TBD
+		 * @deprecated 3.2
 		 */
 		function getGatewayTransactionStatus()
 		{
-			_deprecated_function( __FUNCTION__, 'TBD' );
+			_deprecated_function( __FUNCTION__, '3.2' );
 			if (is_object($this->Gateway)) {
 				return $this->Gateway->getTransactionStatus( $this );
 			}
@@ -1706,10 +1706,10 @@ function getGatewayTransactionStatus()
 		/** 
 		 * Get TOS consent information.
 		 * @since  1.9.5
-		 * @deprecated TBD - Use pmpro_get_consent_log_entry_for_order() insetad.
+		 * @deprecated 3.2 - Use pmpro_get_consent_log_entry_for_order() insetad.
 		 */
 		function get_tos_consent_log_entry() {
-			_deprecated_function( __METHOD__, 'TBD', 'pmpro_get_consent_log_entry_for_order()' );
+			_deprecated_function( __METHOD__, '3.2', 'pmpro_get_consent_log_entry_for_order()' );
 			if ( empty( $this->id ) ) {
 				return false;
 			}

diff --git a/classes/gateways/class.pmprogateway.php b/classes/gateways/class.pmprogateway.php
@@ -18,11 +18,11 @@ function process( &$order ) {
 		}
 
 		/**
-		 * @deprecated TBD
+		 * @deprecated 3.2
 		 */
 		function authorize(&$order)
 		{
-			_deprecated_function( __METHOD__, 'TBD' );
+			_deprecated_function( __METHOD__, '3.2' );
 
 			//create a code for the order
 			if(empty($order->code))
@@ -35,11 +35,11 @@ function authorize(&$order)
 		}
 
 		/**
-		 * @deprecated TBD
+		 * @deprecated 3.2
 		 */
 		function void(&$order)
 		{
-			_deprecated_function( __METHOD__, 'TBD' );
+			_deprecated_function( __METHOD__, '3.2' );
 
 			//need a transaction id
 			if(empty($order->payment_transaction_id))
@@ -52,11 +52,11 @@ function void(&$order)
 		}	
 
 		/**
-		 * @deprecated TBD
+		 * @deprecated 3.2
 		 */
 		function charge(&$order)
 		{
-			_deprecated_function( __METHOD__, 'TBD' );
+			_deprecated_function( __METHOD__, '3.2' );
 
 			//create a code for the order
 			if(empty($order->code))
@@ -69,11 +69,11 @@ function charge(&$order)
 		}
 
 		/**
-		 * @deprecated TBD
+		 * @deprecated 3.2
 		 */
 		function subscribe(&$order)
 		{
-			_deprecated_function( __METHOD__, 'TBD' );
+			_deprecated_function( __METHOD__, '3.2' );
 
 			//create a code for the order
 			if(empty($order->code))
@@ -102,7 +102,7 @@ function update( &$order ) {
 		/**
 		 * Cancel the subscription associated with the passed order.
 		 *
-		 * @deprecated TBD Use cancel_subscription insetad.
+		 * @deprecated 3.2 Use cancel_subscription insetad.
 		 *
 		 * @param MemberOrder $order The order object associated with the subscription to cancel.
 		 * @return bool True if the subscription was canceled successfully, false otherwise.
@@ -126,11 +126,11 @@ function cancel_subscription( $subscription ) {
 		}
 
 		/**
-		 * @deprecated TBD
+		 * @deprecated 3.2
 		 */
 		function getSubscriptionStatus(&$order)
 		{
-			_deprecated_function( __METHOD__, 'TBD' );
+			_deprecated_function( __METHOD__, '3.2' );
 			//require a subscription id
 			if(empty($order->subscription_transaction_id))
 				return false;
@@ -140,11 +140,11 @@ function getSubscriptionStatus(&$order)
 		}
 
 		/**
-		 * @deprecated TBD
+		 * @deprecated 3.2
 		 */
 		function getTransactionStatus(&$order)
 		{
-			_deprecated_function( __METHOD__, 'TBD' );	
+			_deprecated_function( __METHOD__, '3.2' );	
 			//this looks different for each gateway, but generally an array of some sort
 			return array();
 		}		

diff --git a/classes/gateways/class.pmprogateway_authorizenet.php b/classes/gateways/class.pmprogateway_authorizenet.php
@@ -29,10 +29,10 @@ static function init()
 	}
 
 	/**
-	 * @deprecated TBD
+	 * @deprecated 3.2
 	 */
 	static function pmpro_checkout_order( $morder ) {
-		_deprecated_function( __FUNCTION__, 'TBD' );
+		_deprecated_function( __FUNCTION__, '3.2' );
 		return $morder;
 	}