Fix domain echoarea totals, add echoarea name to address/merge

This commit is contained in:
Deon George 2023-09-12 00:10:16 +10:00
parent e553bb4ce6
commit 560bc2f8cb
2 changed files with 4 additions and 3 deletions

View File

@ -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>

View File

@ -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>