From 560bc2f8cb4080c42893c3a6a8364c2eff742d69 Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Tue, 12 Sep 2023 00:10:16 +1000
Subject: [PATCH] Fix domain echoarea totals, add echoarea name to
 address/merge

---
 resources/views/domain/view.blade.php          | 2 +-
 resources/views/system/address-merge.blade.php | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/resources/views/domain/view.blade.php b/resources/views/domain/view.blade.php
index dd60039..338ce4a 100644
--- a/resources/views/domain/view.blade.php
+++ b/resources/views/domain/view.blade.php
@@ -58,7 +58,7 @@
 									<td class="text-end">{{ number_format($oo->where('stats','day')->pop()?->count) }}</td>
 									<td class="text-end">{{ number_format($oo->where('stats','week')->pop()?->count) }}</td>
 									<td class="text-end">{{ number_format($oo->where('stats','month')->pop()?->count) }}</td>
-									<td class="text-end">{{ number_format($oo->where('stats','all')->pop()?->count) }}</td>
+									<td class="text-end">{{ number_format($oo->sum('count')) }}</td>
 								</tr>
 							@endforeach
 							</tbody>
diff --git a/resources/views/system/address-merge.blade.php b/resources/views/system/address-merge.blade.php
index d00dfcc..4116d50 100644
--- a/resources/views/system/address-merge.blade.php
+++ b/resources/views/system/address-merge.blade.php
@@ -47,12 +47,13 @@
 							</td>
 							<td>
 								<ul>
-									@foreach(\App\Models\Echomail::select(['id','msgid','from','msg'])
+									@foreach(\App\Models\Echomail::select(['id','msgid','from','msg','echoarea_id'])
 										->where('fftn_id',$ao->id)
 										->orderBy('created_at','DESC')
+										->with('echoarea')
 										->limit(5)
 										->get() as $eo)
-										<li class="pb-4">{{ sprintf('%04d: %s (%s) %s',$eo->id,$eo->from,$eo->msgid,$eo->msg) }}</li>
+										<li class="pb-4">{{ sprintf('%s-%04d: %s (%s) %s',$eo->echoarea->name,$eo->id,$eo->from,$eo->msgid,$eo->msg) }}</li>
 									@endforeach
 								</ul>
 							</td>