Fixing signups not showing on the last day of memberships report (#3280)

dparker1005 · web-flow · commit a3901674e7a4 · 2025-02-03T12:21:32.000-05:00
* Fixing signups not showing on the last day of memberships report

* Fixing SQL formatting

* Fixing sql again

* Fixing signups, not cancellations

* Reverting incorrect change

* Fixing another query
diff --git a/adminpages/reports/memberships.php b/adminpages/reports/memberships.php
@@ -196,7 +196,7 @@ function pmpro_report_memberships_page() {
 	}
 
 	$sqlQuery .= "WHERE mu.startdate >= '" . esc_sql( $startdate ) . "' ";
-	$sqlQuery .= "AND mu.startdate <= '" . esc_sql( $enddate ) . "' ";
+	$sqlQuery .= "AND mu.startdate <= '" . esc_sql( $enddate ) . " 23:59:59' ";
 
 	if ( ! empty( $l ) ) {
 		$sqlQuery .= 'AND mu.membership_id IN(' . $l . ') '; // $l is already escaped for SQL. See declaration.
@@ -279,7 +279,8 @@ function pmpro_report_memberships_page() {
 	}
 
 	$sqlQuery .= "AND mu1.enddate >= '" . esc_sql( $startdate ) . "'
-	AND mu1.enddate < '" . esc_sql( $enddate ) . "' ";
+	AND mu1.enddate <= '" . $enddate . " 23:59:59' ";
+
 
 	// restrict by level
 	if ( ! empty( $l ) ) {

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ function pmpro_report_memberships_page() {`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`$sqlQuery .= "WHERE mu.startdate >= '" . esc_sql( $startdate ) . "' ";`
`199`		`- $sqlQuery .= "AND mu.startdate <= '" . esc_sql( $enddate ) . "' ";`
	`199`	`+ $sqlQuery .= "AND mu.startdate <= '" . esc_sql( $enddate ) . " 23:59:59' ";`
`200`	`200`
`201`	`201`	`if ( ! empty( $l ) ) {`
`202`	`202`	`$sqlQuery .= 'AND mu.membership_id IN(' . $l . ') '; // $l is already escaped for SQL. See declaration.`
`@@ -279,7 +279,8 @@ function pmpro_report_memberships_page() {`
`279`	`279`	`}`
`280`	`280`
`281`	`281`	`$sqlQuery .= "AND mu1.enddate >= '" . esc_sql( $startdate ) . "'`
`282`		`- AND mu1.enddate < '" . esc_sql( $enddate ) . "' ";`
	`282`	`+ AND mu1.enddate <= '" . $enddate . " 23:59:59' ";`
	`283`	`+`
`283`	`284`
`284`	`285`	`// restrict by level`
`285`	`286`	`if ( ! empty( $l ) ) {`