Merge pull request #3059 from gocodebox/dev

Release 9.1.2

Author: brianhogg

.wordpress-org/readme/05-description.md

@@ -236,6 +236,7 @@ Increase your LMS website and it's training program's value with these add-ons:
 + [LifterLMS Advanced Coupons](https://lifterlms.com/product/lifterlms-advanced-coupons/?utm_source=LifterLMS%20Plugin&utm_medium=README&utm_campaign=Readme%20to%20Sale)
 + [LifterLMS Notes](https://lifterlms.com/product/lifterlms-notes/?utm_source=LifterLMS%20Plugin&utm_medium=README&utm_campaign=Readme%20to%20Sale)
 + [LifterLMS Continuing Education](https://lifterlms.com/product/lifterlms-continuing-education/?utm_source=LifterLMS%20Plugin&utm_medium=README&utm_campaign=Readme%20to%20Sale)
++ [LifterLMS Gifts](https://lifterlms.com/product/lifterlms-gifts/?utm_source=LifterLMS%20Plugin&utm_medium=README&utm_campaign=Readme%20to%20Sale)
 
 **Integrations**
 

CHANGELOG.md

@@ -1,6 +1,24 @@
 LifterLMS Changelog
 ===================
 
+v9.1.2 - 2025-11-20
+-------------------
+
+##### Updates and Enhancements
+
++ Changed options for a new Access Plan to include gifts, and removing the Free Trial option.
+
+##### Bug Fixes
+
++ Avoid warning when creating the first access plan on a course/membership. [#3046](https://github.com/gocodebox/lifterlms/issues/3046)
+
+##### Developer Notes
+
++ Filters for displaying already enrolled message during checkout.
++ Filter to avoid sending a Purchase Receipt under certain conditions.
++ Filter to prevent automatic enrollment in a product after purchase completed.
+
+
 v9.1.1 - 2025-11-11
 -------------------
 

class-lifterlms.php

@@ -34,7 +34,7 @@ final class LifterLMS {
 	 *
 	 * @var string
 	 */
-	public $version = '9.1.1';
+	public $version = '9.1.2';
 
 	/**
 	 * LLMS_Assets instance

includes/admin/views/access-plans/access-plan-dialog.php

@@ -38,10 +38,6 @@ class="llms-dialog-container"
 				<strong><?php echo esc_html( __( 'Paid Trial', 'lifterlms' ) ); ?></strong>
 				<span><?php echo esc_html( __( 'Charge a fee for trial access and capture recurring payment info with a future monthly subscription that will start in 1 week.', 'lifterlms' ) ); ?></span>
 			</button>
-			<button class="template" data-template="free-trial">
-				<strong><?php echo esc_html( __( 'Free Trial', 'lifterlms' ) ); ?></strong>
-				<span><?php echo esc_html( __( 'Grant free access for 1 week with a future monthly subscription that will start in 1 week.', 'lifterlms' ) ); ?></span>
-			</button>
 			<button class="template" data-template="hidden-access">
 				<strong><?php echo esc_html( __( 'Hidden Access', 'lifterlms' ) ); ?></strong>
 				<span><?php echo esc_html( __( 'Grant free access without making this plan publicly available.', 'lifterlms' ) ); ?></span>
@@ -62,6 +58,13 @@ class="llms-dialog-container"
 			 */
 			do_action( 'llms_access_plan_dialog_after_pre_sale' );
 			?>
+			<?php if ( apply_filters( 'llms_access_plan_dialog_show_gifts_addon_option', true ) ) : ?>
+				<a target="_blank" href="https://lifterlms.com/product/lifterlms-gifts/?utm_source=LifterLMS%20Plugin&utm_medium=Access%20Plans&utm_campaign=Plugin%20to%20Sale">
+					<span class="add-on"><?php echo esc_html( __( 'Add-on', 'lifterlms' ) ); ?></span>
+					<strong><?php echo esc_html( __( 'Gift Purchases', 'lifterlms' ) ); ?></strong>
+					<span><?php echo esc_html( __( 'Allow a buyer to purchase a voucher to gift access to someone else.', 'lifterlms' ) ); ?></span>
+				</a>
+			<?php endif; ?>
 			<?php if ( apply_filters( 'llms_access_plan_dialog_show_group_addon_option', true ) ) : ?>
 				<a target="_blank" href="https://lifterlms.com/product/groups/?utm_source=LifterLMS%20Plugin&utm_medium=Access%20Plans&utm_campaign=Plugin%20to%20Sale">
 					<span class="add-on"><?php echo esc_html( __( 'Add-on', 'lifterlms' ) ); ?></span>

includes/admin/views/access-plans/access-plan.php

@@ -96,7 +96,7 @@
 		<h4><?php esc_html_e( 'General Plan Information', 'lifterlms' ); ?></h4>
 
 		<?php
-		if ( ! $checkout_url ) :
+		if ( $plan && ! $checkout_url ) :
 			?>
 
 			<div>

includes/controllers/class.llms.controller.orders.php

@@ -82,7 +82,6 @@ public function __construct() {
 
 		// Expire access plans.
 		add_action( 'llms_access_plan_expiration', array( $this, 'expire_access' ), 10, 1 );
-
 	}
 
 	/**
@@ -122,8 +121,17 @@ public function complete_order( $order, $old_status ) {
 		 */
 		do_action( 'lifterlms_order_complete', $order_id ); // @todo used by AffiliateWP only, can remove after updating AffiliateWP.
 
-		// Enroll student.
-		llms_enroll_student( $user_id, $product_id, 'order_' . $order_id );
+		/**
+		 * Filter whether the user should be automatically enrolled when the order completes.
+		 *
+		 * @since 9.1.2
+		 *
+		 * @param bool Whether to enroll the student. Defaults to true.
+		 * @param LLMS_Order $order The order.
+		 */
+		if ( apply_filters( 'lifterlms_enroll_student_on_order_complete', true, $order ) ) {
+			llms_enroll_student( $user_id, $product_id, 'order_' . $order_id );
+		}
 
 		// Trigger purchase action, used by engagements.
 
@@ -153,7 +161,6 @@ public function complete_order( $order, $old_status ) {
 
 		// Maybe schedule a payment.
 		$order->maybe_schedule_payment();
-
 	}
 
 	/**
@@ -210,7 +217,6 @@ public function error_order( $order ) {
 		}
 
 		llms_unenroll_student( $order->get( 'user_id' ), $order->get( 'product_id' ), $status, 'order_' . $order->get( 'id' ) );
-
 	}
 
 	/**
@@ -229,7 +235,6 @@ public function on_delete_order( $post_id ) {
 		if ( $order && is_a( $order, 'LLMS_Order' ) ) {
 			llms_delete_student_enrollment( $order->get( 'user_id' ), $order->get( 'product_id' ), 'order_' . $order->get( 'id' ) );
 		}
-
 	}
 
 	/**
@@ -258,7 +263,6 @@ public function on_user_enrollment_deleted( $user_id, $product_id, $trigger ) {
 			remove_filter( 'llms_unenroll_on_error_order', '__return_false', 100 );
 
 		}
-
 	}
 
 	/**
@@ -325,7 +329,6 @@ public function expire_access( $order_id ) {
 		if ( $new_order_status ) {
 			$order->set_status( $new_order_status );
 		}
-
 	}
 
 	/**
@@ -343,7 +346,6 @@ public function pending_cancel_order( $order ) {
 
 		$order->unschedule_recurring_payment();
 		$order->maybe_schedule_expiration();
-
 	}
 
 	/**
@@ -511,7 +513,6 @@ public function recurring_charge( $order_id ) {
 		// Passed validation, hand off to the gateway.
 		$gateway->handle_recurring_transaction( $order );
 		return true;
-
 	}
 
 	/**
@@ -546,7 +547,6 @@ public function set_untrash_status( $new_status, $post_id, $previous_status ) {
 		}
 
 		return $new_status;
-
 	}
 
 	/**
@@ -576,7 +576,6 @@ public function transaction_failed( $txn ) {
 			$order->set( 'status', 'llms-failed' );
 
 		}
-
 	}
 
 	/**
@@ -596,7 +595,6 @@ public function transaction_refunded( $txn ) {
 			return; }
 
 		$order->set( 'status', 'llms-refunded' );
-
 	}
 
 	/**
@@ -625,7 +623,6 @@ public function transaction_succeeded( $txn ) {
 
 		// Maybe schedule a payment.
 		$order->maybe_schedule_payment();
-
 	}
 
 	/**
@@ -691,7 +688,6 @@ public function transition_status( $new_status, $old_status, $post ) {
 		 * @param string                      $new_status The new order or transaction status.
 		 */
 		do_action( "lifterlms_{$post_type}_status_{$new_status}", $obj, $old_status, $new_status );
-
 	}
 
 	/**
@@ -734,7 +730,6 @@ private function validate_selected_gateway( $gateway_id, $plan ) {
 		}
 
 		return $gateway;
-
 	}
 
 	/**
@@ -804,7 +799,6 @@ public function switch_payment_source() {
 		_deprecated_function( __METHOD__, '7.0.0', 'LLMS_Controller_Checkout::switch_payment_source' );
 		LLMS_Controller_Checkout::instance()->switch_payment_source();
 	}
-
 }
 
 return new LLMS_Controller_Orders();

includes/functions/llms.functions.order.php

@@ -36,7 +36,6 @@ function llms_can_gateway_be_used_for_plan( $gateway_id, $plan ) {
 	 * @param LLMS_Access_plan $plan        The access plan object.
 	 */
 	return apply_filters( 'llms_can_gateway_be_used_for_plan', $can_be_used, $gateway_id, $plan );
-
 }
 
 /**
@@ -100,7 +99,6 @@ function llms_can_gateway_be_used_for_plan_or_order( $gateway_id, $plan_or_order
 	$can_use = apply_filters( 'llms_can_gateway_be_used_for_plan_or_order', $can_use, $gateway_id, $plan_or_order );
 
 	return is_wp_error( $can_use ) && ! $wp_err ? false : $can_use;
-
 }
 
 /**
@@ -126,7 +124,6 @@ function llms_get_order_by_key( $key, $return = 'order' ) {
 
 	// Return an int not a numeric string.
 	return $id ? absint( $id ) : $id;
-
 }
 
 /**
@@ -182,7 +179,6 @@ function llms_get_order_statuses( $order_type = 'any' ) {
 	 * @param string  $order_type The type of the order.
 	 */
 	return apply_filters( 'llms_get_order_statuses', $statuses, $order_type );
-
 }
 
 /**
@@ -207,7 +203,6 @@ function llms_get_possible_order_statuses( $order ) {
 	}
 
 	return $statuses;
-
 }
 
 /**
@@ -247,7 +242,6 @@ function llms_locate_order_for_email_and_plan( $email, $plan_id ) {
 	);
 
 	return $query->posts[0] ?? null;
-
 }
 
 /**
@@ -280,7 +274,6 @@ function llms_locate_order_for_user_and_plan( $user_id, $plan_id ) {
 
 	// Return an int not a numeric string.
 	return $id ? absint( $id ) : $id;
-
 }
 
 /**
@@ -414,7 +407,15 @@ function llms_setup_pending_order( $data = array() ) {
 	}
 
 	// Ensure the new user isn't enrolled in the product being purchased.
-	if ( llms_is_user_enrolled( $person_id, $plan->get( 'product_id' ) ) ) {
+	/**
+	 * Filter to allow checkout if already enrolled.
+	 *
+	 * @param bool $block_checkout Whether to block checkout if already enrolled.
+	 * @param LLMS_Access_Plan $plan The access plan.
+	 *
+	 * @since 9.1.2
+	 */
+	if ( llms_is_user_enrolled( $person_id, $plan->get( 'product_id' ) ) && apply_filters( 'llms_checkout_block_enrolled_checkout', true, $plan ) ) {
 
 		$product = $plan->get_product();
 		$err->add(
@@ -451,5 +452,4 @@ function llms_setup_pending_order( $data = array() ) {
 	 * @param array $data Array of input data from a checkout form.
 	 */
 	return apply_filters( 'llms_after_setup_pending_order', compact( 'person', 'plan', 'gateway', 'coupon' ), $data );
-
 }

includes/functions/llms.functions.templates.pricing.table.php

@@ -186,7 +186,6 @@ function llms_template_product_not_purchasable( $post_id = null ) {
 			'product/not-purchasable.php',
 			compact( 'product' )
 		);
-
 	}
 }
 
@@ -214,12 +213,15 @@ function lifterlms_template_pricing_table( $post_id = null ) {
 		 * It does not modify the user's enrollment status.
 		 *
 		 * @since Unknown
+		 * @since 9.1.2 Added product param.
 		 *
 		 * @param boolean $is_enrolled User's current enrollment status.
+		 * @param LLMS_Product $product Product for the pricing table.
 		 */
 		$is_enrolled = apply_filters(
 			'llms_product_pricing_table_enrollment_status',
-			llms_is_user_enrolled( get_current_user_id(), $product->get( 'id' ) )
+			llms_is_user_enrolled( get_current_user_id(), $product->get( 'id' ) ),
+			$product
 		);
 
 		$purchasable      = $product->is_purchasable();
@@ -230,6 +232,5 @@ function lifterlms_template_pricing_table( $post_id = null ) {
 			'product/pricing-table.php',
 			compact( 'product', 'is_enrolled', 'purchasable', 'has_free', 'has_restrictions' )
 		);
-
 	}
 }

includes/notifications/controllers/class.llms.notification.controller.purchase.receipt.php

@@ -62,12 +62,21 @@ class LLMS_Notification_Controller_Purchase_Receipt extends LLMS_Abstract_Notifi
 	 */
 	public function action_callback( $transaction = null ) {
 
-		$order         = $transaction->get_order();
+		$order = $transaction->get_order();
+
+		/**
+		 * Filter to avoid sending notification for purchase receipts.
+		 *
+		 * @since 9.1.2
+		 */
+		if ( ! apply_filters( 'llms_send_purchase_receipt_notification', true, $order, $transaction ) ) {
+			return;
+		}
+
 		$this->user_id = $order->get( 'user_id' );
 		$this->post_id = $transaction->get( 'id' );
 
 		$this->send();
-
 	}
 
 	/**
@@ -106,7 +115,6 @@ protected function get_subscriber( $subscriber ) {
 		}
 
 		return $uid;
-
 	}
 
 	/**
@@ -178,7 +186,6 @@ public function get_test_settings( $type ) {
 				// 'selected' => false,
 			),
 		);
-
 	}
 
 	/**
@@ -217,7 +224,6 @@ public function send_test( $type, $data = array() ) {
 		$this->post_id = $transaction->get( 'id' );
 
 		return parent::send_test( $type );
-
 	}
 
 	/**
@@ -243,9 +249,7 @@ protected function set_subscriber_options( $type ) {
 		}
 
 		return $options;
-
 	}
-
 }
 
 return LLMS_Notification_Controller_Purchase_Receipt::instance();