From eb1e792e77d4a617233d49a3891a69ea8df1e630 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 10 Jul 2023 16:01:53 -0400 Subject: [PATCH] Only Show Monthly Recurring based off the year selected and all previous years --- dashboard_financial.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dashboard_financial.php b/dashboard_financial.php index 14a22729..67d36be6 100644 --- a/dashboard_financial.php +++ b/dashboard_financial.php @@ -78,12 +78,12 @@ $sql_latest_expenses = mysqli_query( ); //Get Yearly Recurring Total -$sql_recurring_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_amount) AS recurring_yearly_total FROM recurring WHERE recurring_status = 1 AND recurring_frequency = 'year'"); +$sql_recurring_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_amount) AS recurring_yearly_total FROM recurring WHERE recurring_status = 1 AND recurring_frequency = 'year' AND YEAR(recurring_created_at) <= $year"); $row = mysqli_fetch_array($sql_recurring_yearly_total); $recurring_yearly_total = floatval($row['recurring_yearly_total']); //Get Monthly Recurring Total -$sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_amount) AS recurring_monthly_total FROM recurring WHERE recurring_status = 1 AND recurring_frequency = 'month'"); +$sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_amount) AS recurring_monthly_total FROM recurring WHERE recurring_status = 1 AND recurring_frequency = 'month' AND YEAR(recurring_created_at) <= $year"); $row = mysqli_fetch_array($sql_recurring_monthly_total); $recurring_monthly_total = floatval($row['recurring_monthly_total']) + ($recurring_yearly_total / 12);