Merge pull request #2900 from gocodebox/dev

Release 8.0.3

Author: brianhogg

.gitignore

@@ -20,6 +20,7 @@ assets/css/builder.css
 assets/css/builder.min.css
 assets/css/builder-rtl.css
 assets/css/builder-rtl.min.css
+assets/css/bricks-editor-rtl.css
 assets/css/admin-importer*
 assets/css/editor*
 assets/css/certificates*

CHANGELOG.md

@@ -1,6 +1,38 @@
 LifterLMS Changelog
 ===================
 
+v8.0.3 - 2025-04-07
+-------------------
+
+##### New Features
+
++ Initial support for the Bricks theme.
++ New "# of transactions" sales reporting widget.
+
+##### Updates and Enhancements
+
++ Change default date display format of lifterlms_course_info used in settings like Enrollment Start and End Date to match the site date format. [#2903](https://github.com/gocodebox/lifterlms/issues/2903)
++ Display date pickers in the site date format, but save the data in the previous format. [#2447](https://github.com/gocodebox/lifterlms/issues/2447)
++ Update Last Activity Date label to accurately reflect the data value. [#2898](https://github.com/gocodebox/lifterlms/issues/2898)
+
+##### Bug Fixes
+
++ Updating postal code (eircode) display for Ireland. [#2891](https://github.com/gocodebox/lifterlms/issues/2891)
++ Net Sales reporting includes partially refunded transactions, and transactions from orders regardless of status. [#2860](https://github.com/gocodebox/lifterlms/issues/2860), [#2861](https://github.com/gocodebox/lifterlms/issues/2861)
++ On-hold, pending cancellation, cancelled and expired orders now included in "# of Sales" widget. [#2860](https://github.com/gocodebox/lifterlms/issues/2860)
++ Fixes sales reporting for transactions or orders that happened between 23:23:59 and midnight. [#2858](https://github.com/gocodebox/lifterlms/issues/2858)
++ Password reset email is now in the user's language. [#2879](https://github.com/gocodebox/lifterlms/issues/2879)
+
+##### Developer Notes
+
++ Adds a new action so Turnstile or other captchas can be added without editing the free-enroll-form.php template directly.
+
+##### Updated Templates
+
++ [templates/admin/reporting/tabs/students/courses-course.php](https://github.com/gocodebox/lifterlms/blob/8.0.3/templates/admin/reporting/tabs/students/courses-course.php)
++ [templates/product/free-enroll-form.php](https://github.com/gocodebox/lifterlms/blob/8.0.3/templates/product/free-enroll-form.php)
+
+
 v8.0.2 - 2025-03-17
 -------------------
 

assets/css/bricks-editor.css

@@ -148,7 +148,7 @@
 						height: '75%',
 						width: '85%',
 					},
-					colors: ['#606C38','#E85D75','#EF8354','#C64191','#731963'],
+					colors: ['#606C38','#E85D75','#EF8354','#C64191','#731963','#2B6CB0','#E1B530','#319795'],
 					height: 560,
 					lineWidth: 4,
 					seriesType: 'bars',

assets/js/llms-analytics.js

@@ -269,12 +269,25 @@
 		 */
 		this.bind_datepicker = function( $el ) {
 			var format  = $el.attr( 'data-format' ) || 'mm/dd/yy',
+				altFormat = $el.attr( 'data-alt-format' ) || '',
+				altField = $el.attr( 'data-alt-field' ) || '',
 				maxDate = $el.attr( 'data-max-date' ) || null,
 				minDate = $el.attr( 'data-min-date' ) || null;
 			$el.datepicker( {
 				dateFormat: format,
 				maxDate: maxDate,
 				minDate: minDate,
+				altField: altField,
+				altFormat: altFormat
+			} ).on( "keyup", function() {
+				var date;
+				try {
+					date = $.datepicker.parseDate( $.datepicker._defaults.dateFormat, this.value );
+				} catch ( e ) { }
+
+				if ( !date && altField ) {
+					$( $.escapeSelector( altField ) ).val( "" );
+				}
 			} );
 		}
 

assets/js/llms-analytics.min.js

@@ -34,7 +34,7 @@ final class LifterLMS {
 	 *
 	 * @var string
 	 */
-	public $version = '8.0.2';
+	public $version = '8.0.3';
 
 	/**
 	 * LLMS_Assets instance
@@ -336,6 +336,7 @@ public function init() {
 		( new LLMS_Media_Protector() )->register_callbacks();
 
 		include_once 'includes/class-llms-elementor-migrate.php';
+		include_once 'includes/class-llms-bricks.php';
 		include_once 'includes/class-llms-beaver-builder.php';
 		include_once 'includes/class-llms-beaver-builder-migrate.php';
 

assets/js/private/llms-metaboxes.js

@@ -116,21 +116,18 @@ protected function get_posted_dates() {
 
 		$dates = llms_filter_input_sanitize_string( INPUT_POST, 'dates', array( FILTER_REQUIRE_ARRAY ) );
 		return $dates ? $dates : '';
-
 	}
 
 	protected function get_posted_courses() {
 
 		$courses = llms_filter_input( INPUT_POST, 'courses', FILTER_SANITIZE_NUMBER_INT, FILTER_REQUIRE_ARRAY );
 		return $courses ? $courses : array();
-
 	}
 
 	protected function get_posted_memberships() {
 
 		$memberships = llms_filter_input( INPUT_POST, 'memberships', FILTER_SANITIZE_NUMBER_INT, FILTER_REQUIRE_ARRAY );
 		return $memberships ? $memberships : array();
-
 	}
 
 	protected function get_posted_posts() {
@@ -140,7 +137,6 @@ protected function get_posted_posts() {
 	protected function get_posted_students() {
 		$students = llms_filter_input( INPUT_POST, 'students', FILTER_SANITIZE_NUMBER_INT, FILTER_REQUIRE_ARRAY );
 		return $students ? $students : array();
-
 	}
 
 	protected function get_prepared_query() {
@@ -169,20 +165,26 @@ protected function format_date( $date, $type ) {
 				break;
 
 			case 'end':
-				$date .= ' 23:23:59';
+				/**
+				 * Return 00:00:00 on the next day after this date, using PHP datetime functions to avoid issues with daylight savings time or leap years.
+				 *
+				 * 23:59:59 is not a safe way to capture the end of day in newer versions of MySQL, if the transaction happened at (say) 23:59:59.999.
+				 */
+				$end_date = new DateTime( $date );
+				$end_date->modify( '+1 day' );
+
+				$date = $end_date->format( 'Y-m-d' ) . ' 00:00:00';
 
 				break;
 
 		}
 
 		return $date;
-
 	}
 
 	protected function is_error() {
 
 		return ( $this->success ) ? false : true;
-
 	}
 
 	protected function set_order_data_query( $args = array() ) {
@@ -235,7 +237,7 @@ protected function set_order_data_query( $args = array() ) {
 		$order_dates = '';
 		if ( $date_range ) {
 			$dates              = $this->get_posted_dates();
-			$order_dates        = "AND orders.{$date_field} BETWEEN CAST( %s AS DATETIME ) AND CAST( %s AS DATETIME )";
+			$order_dates        = "AND orders.{$date_field} >= CAST( %s as DATETIME ) AND orders.{$date_field} < CAST( %s as DATETIME )";
 			$this->query_vars[] = $this->format_date( $dates['start'], 'start' );
 			$this->query_vars[] = $this->format_date( $dates['end'], 'end' );
 		}
@@ -291,7 +293,6 @@ protected function set_order_data_query( $args = array() ) {
 							{$wheres_clause}
 						{$order_clause}
 						;";
-
 	}
 
 	/**
@@ -333,7 +334,6 @@ protected function query() {
 			$this->message = $wpdb->last_error;
 
 		}
-
 	}
 
 	/**
@@ -384,7 +384,6 @@ public function can_be_processed() {
 			$widget_name,
 			$this
 		);
-
 	}
 
 	/**
@@ -409,8 +408,5 @@ public function output() {
 		header( 'Content-Type: application/json' );
 		echo wp_json_encode( $this );
 		wp_die();
-
 	}
-
-
 }