Sales reporting fixes and improvements

.changelogs/fix_date-range-widget-1.yml

@@ -0,0 +1,7 @@
+significance: patch
+type: fixed
+links:
+  - "#2860"
+  - "#2861"
+entry: Sales reporting includes partially refunded transactions, and
+  transactions from orders regardless of status.

.changelogs/fix_date-range-widget-2.yml

@@ -0,0 +1,6 @@
+significance: patch
+type: fixed
+links:
+  - "#2860"
+entry: On-hold, pending cancellation, cancelled and expired orders now included
+  in "# of Sales" widget.

.changelogs/fix_date-range-widget.yml

@@ -0,0 +1,6 @@
+significance: minor
+type: fixed
+links:
+  - "#2858"
+entry: Fixes sales reporting for transactions or orders that happened between
+  23:23:59 and midnight.

includes/abstracts/abstract.llms.analytics.widget.php

@@ -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} >= %s AND orders.{$date_field} < %s";
 			$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();
-
 	}
-
-
 }

includes/admin/reporting/widgets/class.llms.analytics.widget.coursecompletions.php

@@ -60,7 +60,8 @@ public function set_query() {
 							    upm.meta_key = '_is_complete'
 							AND p.post_type = 'course'
 							AND upm.meta_value = 'yes'
-							AND upm.updated_date BETWEEN CAST( %s AS DATETIME ) AND CAST( %s AS  DATETIME )
+							AND upm.updated_date >= %s
+						    AND upm.updated_date < %s
 							{$student_ids}
 							{$lesson_ids}
 						;";
@@ -69,7 +70,6 @@ public function set_query() {
 			$this->format_date( $dates['start'], 'start' ),
 			$this->format_date( $dates['end'], 'end' ),
 		);
-
 	}
 
 	protected function format_response() {
@@ -79,7 +79,5 @@ protected function format_response() {
 			return count( $this->get_results() );
 
 		}
-
 	}
-
 }

includes/admin/reporting/widgets/class.llms.analytics.widget.enrollments.php

@@ -59,7 +59,8 @@ public function set_query() {
 						WHERE
 							    meta_key = '_status'
 							AND ( meta_value = 'Enrolled' OR meta_value = 'enrolled' )
-							AND updated_date BETWEEN CAST( %s AS DATETIME ) AND CAST( %s AS  DATETIME )
+							AND updated_date >= %s
+						    AND updated_date < %s
 							{$student_ids}
 							{$product_ids}
 						;";
@@ -68,7 +69,6 @@ public function set_query() {
 			$this->format_date( $dates['start'], 'start' ),
 			$this->format_date( $dates['end'], 'end' ),
 		);
-
 	}
 
 	protected function format_response() {
@@ -78,7 +78,5 @@ protected function format_response() {
 			return count( $this->get_results() );
 
 		}
-
 	}
-
 }

includes/admin/reporting/widgets/class.llms.analytics.widget.lessoncompletions.php

@@ -58,7 +58,6 @@ private function get_lesson_ids( $products ) {
 		}
 
 		return $lessons;
-
 	}
 
 	public function set_query() {
@@ -90,7 +89,8 @@ public function set_query() {
 							    upm.meta_key = '_is_complete'
 							AND p.post_type = 'lesson'
 							AND upm.meta_value = 'yes'
-							AND upm.updated_date BETWEEN CAST( %s AS DATETIME ) AND CAST( %s AS  DATETIME )
+							AND upm.updated_date >= %s
+						    AND upm.updated_date < %s
 							{$student_ids}
 							{$lesson_ids}
 						;";
@@ -99,7 +99,6 @@ public function set_query() {
 			$this->format_date( $dates['start'], 'start' ),
 			$this->format_date( $dates['end'], 'end' ),
 		);
-
 	}
 
 	protected function format_response() {
@@ -109,7 +108,5 @@ protected function format_response() {
 			return count( $this->get_results() );
 
 		}
-
 	}
-
 }

includes/admin/reporting/widgets/class.llms.analytics.widget.refunded.php

@@ -95,12 +95,12 @@ public function set_query() {
 						WHERE
 						        ( txns.post_status = 'llms-txn-succeeded' OR txns.post_status = 'llms-txn-refunded' )
 						    AND txns.post_type = 'llms_transaction'
-							AND txns.post_date BETWEEN CAST( %s AS DATETIME ) AND CAST( %s AS DATETIME )
+							AND txns.post_date >= %s
+							AND txns.post_date < %s
 							AND refund.meta_key = '_llms_refund_amount'
 							{$txn_meta_where}
 							ORDER BY txns.post_modified ASC
 						;";
-
 	}
 
 	/**
@@ -117,7 +117,5 @@ protected function format_response() {
 			return llms_price_raw( floatval( is_array( $results ) ? array_sum( wp_list_pluck( $results, 'amount' ) ) : $results ) );
 
 		}
-
 	}
-
 }

includes/admin/reporting/widgets/class.llms.analytics.widget.registrations.php

@@ -48,15 +48,15 @@ public function set_query() {
 		$this->query = "SELECT user_registered AS date
 						FROM {$wpdb->users}
 						WHERE
-							user_registered BETWEEN CAST( %s AS DATETIME ) AND CAST( %s AS  DATETIME )
+							user_registered >= %s
+						    AND user_registered < %s
 							{$student_ids}
 						;";
 
 		$this->query_vars = array(
 			$this->format_date( $dates['start'], 'start' ),
 			$this->format_date( $dates['end'], 'end' ),
 		);
-
 	}
 
 	protected function format_response() {
@@ -66,7 +66,5 @@ protected function format_response() {
 			return count( $this->get_results() );
 
 		}
-
 	}
-
 }

includes/admin/reporting/widgets/class.llms.analytics.widget.revenue.php

@@ -91,10 +91,10 @@ public function set_query() {
 						WHERE
 						        ( txns.post_status = 'llms-txn-succeeded' OR txns.post_status = 'llms-txn-refunded' )
 						    AND txns.post_type = 'llms_transaction'
-							AND txns.post_date BETWEEN CAST( %s AS DATETIME ) AND CAST( %s AS DATETIME )
+							AND txns.post_date >= %s
+							AND txns.post_date < %s
 							{$txn_meta_where}
 						;";
-
 	}
 
 	protected function format_response() {
@@ -104,7 +104,5 @@ protected function format_response() {
 			return llms_price_raw( floatval( $this->get_results() ) );
 
 		}
-
 	}
-
 }

includes/admin/reporting/widgets/class.llms.analytics.widget.sales.php

@@ -46,10 +46,13 @@ public function set_query() {
 				'statuses'       => array(
 					'llms-active',
 					'llms-completed',
+					'llms-on-hold',
+					'llms-pending-cancel',
+					'llms-cancelled',
+					'llms-expired',
 				),
 			)
 		);
-
 	}
 
 	protected function format_response() {
@@ -59,7 +62,5 @@ protected function format_response() {
 			return count( $this->get_results() );
 
 		}
-
 	}
-
 }

includes/admin/reporting/widgets/class.llms.analytics.widget.sold.php

@@ -69,11 +69,6 @@ public function set_query() {
 					'select'         => array(
 						'orders.ID',
 					),
-					'statuses'       => array(
-						'llms-active',
-						'llms-completed',
-						'llms-refunded',
-					),
 				)
 			);
 			$this->query();
@@ -112,14 +107,14 @@ public function set_query() {
 						{$txn_meta_join}
 						JOIN {$wpdb->postmeta} AS sales ON sales.post_id = txns.ID
 						WHERE
-						        ( txns.post_status = 'llms-txn-succeeded' )
+						        ( txns.post_status = 'llms-txn-succeeded' OR txns.post_status = 'llms-txn-refunded' )
 						    AND txns.post_type = 'llms_transaction'
-							AND txns.post_date BETWEEN CAST( %s AS DATETIME ) AND CAST( %s AS DATETIME )
+							AND txns.post_date >= %s
+							AND txns.post_date < %s
 							AND sales.meta_key = '_llms_amount'
 							{$txn_meta_where}
 							ORDER BY txns.post_modified ASC
 						;";
-
 	}
 
 	/**
@@ -136,7 +131,5 @@ protected function format_response() {
 			return llms_price_raw( floatval( is_array( $results ) ? array_sum( wp_list_pluck( $results, 'amount' ) ) : $results ) );
 
 		}
-
 	}
-
 }