From e5c4756ae626609a4efcf3f87f33302063adc6d5 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Fri, 2 Jan 2026 17:25:29 +0100 Subject: [PATCH] wait #7923 @0.25 --- app/Jobs/ProcessTotals.php | 4 ++-- resources/views/extranet/totals.blade.php | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/Jobs/ProcessTotals.php b/app/Jobs/ProcessTotals.php index 2782e2803..0728b1c17 100644 --- a/app/Jobs/ProcessTotals.php +++ b/app/Jobs/ProcessTotals.php @@ -49,8 +49,8 @@ class ProcessTotals extends Base 'years' => $this->totalYears, 'months' => $this->totalMonths, 'quarters' => $this->totalQuarters, - 'currentYear' => $this->totalYears[date('Y')], - 'currentYearProjection' => $this->totalYears[date('Y')] + $this->pendingProjects, + 'currentYear' => $this->totalYears[date('Y')] ?? 0, + 'currentYearProjection' => ($this->totalYears[date('Y')] ?? 0) + $this->pendingProjects, 'unpaid' => $this->unpaidTotals, 'categories' => $this->totalCategories, ] diff --git a/resources/views/extranet/totals.blade.php b/resources/views/extranet/totals.blade.php index 4b5a63061..3b0b8c28e 100644 --- a/resources/views/extranet/totals.blade.php +++ b/resources/views/extranet/totals.blade.php @@ -79,7 +79,7 @@ @for($i=1;$i<=4;$i++) {{format_ke($data['quarters'][$y.'-Q'.$i]??0)}} @endfor - {{format_ke($data['years'][$y])}} + {{format_ke($data['years'][$y]??0)}} @endfor @@ -117,7 +117,7 @@ @for($i=1;$i<=12;$i++) {{format_ke($data['months'][$y.'-'.($i>=10?$i:'0'.$i)]??0)}} @endfor - {{format_ke($data['years'][$y])}} + {{format_ke($data['years'][$y]??0)}} @endfor @@ -143,7 +143,8 @@ {{$label}} @for($y=$currentYear-11;$y<=$currentYear;$y++) - {{format_ke($data['categories'][$c]['years'][$y]['amount']??0)}}
{{format_pct($data['categories'][$c]['years'][$y]['ratio']??0)}} + {{format_ke($data['categories'][$c]['years'][$y]['amount']??0)}} +
{{format_pct($data['categories'][$c]['years'][$y]['ratio']??0)}} @endfor {{format_ke($data['categories'][$c]['total']??0)}} -- 2.39.5