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 @@
{{ number_format($oo->where('stats','day')->pop()?->count) }} |
{{ number_format($oo->where('stats','week')->pop()?->count) }} |
{{ number_format($oo->where('stats','month')->pop()?->count) }} |
- {{ number_format($oo->where('stats','all')->pop()?->count) }} |
+ {{ number_format($oo->sum('count')) }} |
@endforeach
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 @@
- @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)
- - {{ sprintf('%04d: %s (%s) %s',$eo->id,$eo->from,$eo->msgid,$eo->msg) }}
+ - {{ sprintf('%s-%04d: %s (%s) %s',$eo->echoarea->name,$eo->id,$eo->from,$eo->msgid,$eo->msg) }}
@endforeach
|