diff --git a/dashboard.php b/dashboard.php index 3a192c9..e755a77 100644 --- a/dashboard.php +++ b/dashboard.php @@ -79,8 +79,8 @@ if ($user['role'] === 'founder') { // Repayment Summary Calculation $stmt = db()->prepare(" SELECT - SUM(i.amount) as total_raised, - SUM(i.total_return) as total_obligation, + SUM(CASE WHEN i.status IN ('approved', 'completed') THEN i.amount ELSE 0 END) as total_raised, + SUM(CASE WHEN i.status IN ('approved', 'completed') THEN i.total_return ELSE 0 END) as total_obligation, SUM(CASE WHEN i.status = 'approved' THEN i.monthly_dividend ELSE 0 END) as monthly_outgoing, COUNT(DISTINCT CASE WHEN i.status = 'approved' THEN i.investor_id END) as active_investors, MIN(CASE WHEN i.status = 'approved' THEN i.next_payment_date END) as next_payment_date diff --git a/startup_details.php b/startup_details.php index 35cb550..b2bfb42 100644 --- a/startup_details.php +++ b/startup_details.php @@ -457,13 +457,13 @@ $progress = ($goal > 0) ? round(($raised / $goal) * 100) : 0; diff(new DateTime($nextPayDate))->days; + $daysLeft = (new DateTime())->diff(new DateTime($nextPayDate))->format("%r%a"); ?>
- £ @ % over mo + £ @ % over mo