Merge branch 'dev' of https://github.com/strangerstudios/paid-members…

…hips-pro into v3.4
strangerstudios · Feb 3, 2025 · 3f8905d · 3f8905d
2 parents 8c1183d + 2abdf23
commit 3f8905d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -24,9 +24,11 @@
 = TBD - TBD =
 * ENHANCEMENT: Added a table with the raw report data under the Membership Stats report. #3260 (@dparker1005)
 * BUG FIX: Fixed an issue where the "Signups vs. Cancellations" and "Signups vs. Expirations" reports would not display. #3260 (@dparker1005)
+* BUG FIX: Fixed an issue where the last day of each month for daily Memberships reports would show 0 signups. #3280 (@dparker1005, @kimcoleman)
 * BUG FIX: Fixed an issue where reset password errors would not be handled correctly. #3262 (@mircobabini)
 * BUG FIX: Fixed an issue where the "Activate" button may not show immediately after installing an Add On on the Memberships > Add Ons page. #3255 (@MaximilianoRicoTabo, @dparker1005)
 * BUG FIX: Fixed a PHP fatal error if `pmpro_getAddons()` fails to retrieve the list of Add Ons. #3249 (@dparker1005)
+* BUG FIX: Fixed an issue where notifications may be incorrectly shown when a callback does not exist. #3279 (@andrewlimaza)
 * BUG FIX: Fixed a PHP 5.6 fatal error in the admin activity email class. #3253 (@andrewlimaza)
 * BUG FIX: Fixed a styling issue when there are multiple paragraphs in a contextual message. #3250 (@kimcoleman)
 * BUG FIX: Fixed a styling issue where there may be a gap when Turnstile is enabled but not visible. #3273 (@kimcoleman)

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 ) ) {

diff --git a/includes/notifications.php b/includes/notifications.php
@@ -220,6 +220,8 @@ function pmpro_should_show_notification( $notification ) {
 					// one test failed, let's not show
 					break;
 				}
+			} else {
+				$show = false;
 			}
 		}
 	}

diff --git a/readme.txt b/readme.txt
@@ -229,9 +229,11 @@ Not sure? You can find out by doing a bit a research.
 = TBD - TBD =
 * ENHANCEMENT: Added a table with the raw report data under the Membership Stats report. #3260 (@dparker1005)
 * BUG FIX: Fixed an issue where the "Signups vs. Cancellations" and "Signups vs. Expirations" reports would not display. #3260 (@dparker1005)
+* BUG FIX: Fixed an issue where the last day of each month for daily Memberships reports would show 0 signups. #3280 (@dparker1005, @kimcoleman)
 * BUG FIX: Fixed an issue where reset password errors would not be handled correctly. #3262 (@mircobabini)
 * BUG FIX: Fixed an issue where the "Activate" button may not show immediately after installing an Add On on the Memberships > Add Ons page. #3255 (@MaximilianoRicoTabo, @dparker1005)
 * BUG FIX: Fixed a PHP fatal error if `pmpro_getAddons()` fails to retrieve the list of Add Ons. #3249 (@dparker1005)
+* BUG FIX: Fixed an issue where notifications may be incorrectly shown when a callback does not exist. #3279 (@andrewlimaza)
 * BUG FIX: Fixed a PHP 5.6 fatal error in the admin activity email class. #3253 (@andrewlimaza)
 * BUG FIX: Fixed a styling issue when there are multiple paragraphs in a contextual message. #3250 (@kimcoleman)
 * BUG FIX: Fixed a styling issue where there may be a gap when Turnstile is enabled but not visible. #3273 (@kimcoleman)
-Original file line number
+Diff line change
@@ Expand Up / @@ -220,6 +220,8 @@ function pmpro_should_show_notification( $notification ) { @@
     					// one test failed, let's not show
     					break;
     				}
+    			} else {
+    				$show = false;
     			}
     		}
     	}
@@ Expand Down @@