bbs/clrghouz
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/domain/view.blade.php
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','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','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','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> </tr>
@endforeach @endforeach
</tbody> </tbody>

5
resources/views/system/address-merge.blade.php
View File

@ -47,12 +47,13 @@
</td> </td>
<td> <td>
<ul> <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) ->where('fftn_id',$ao->id)
->orderBy('created_at','DESC') ->orderBy('created_at','DESC')
->with('echoarea')
->limit(5) ->limit(5)
->get() as $eo) ->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 @endforeach
</ul> </ul>
</td> </td>