deon/osb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for viewing unprocessed charges

Browse Source
This commit is contained in:
Deon George 2022-07-25 23:59:28 +10:00
parent bb44c1a216
commit cc906e9b22
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Charge.php
View File

@ -61,7 +61,7 @@ class Charge extends Model
{ {
return $query return $query
->where('active',TRUE) ->where('active',TRUE)
->whereNotNull('charge_date') ->whereNotNull('charge_at')
->whereNotNull('type') ->whereNotNull('type')
->where(function($q) { ->where(function($q) {
return $q->where('processed',FALSE) return $q->where('processed',FALSE)

6
resources/views/theme/backend/adminlte/a/charge/unprocessed.blade.php
View File

@ -34,9 +34,9 @@
<tbody> <tbody>
@foreach(\App\Models\Charge::unprocessed()->with(['account.user','service'])->get() as $o) @foreach(\App\Models\Charge::unprocessed()->with(['account.user','service'])->get() as $o)
<tr> <tr>
<td><a href="{{ url('a/charge/addedit',$o->id) }}">{{ $o->id }}</td> <td><a href="{{ url('a/charge/addedit',$o->id) }}">{{ $o->id }}</a></td>
<td>{{ $o->charge_date->format('Y-m-d') }}</td> <td>{{ $o->charge_at->format('Y-m-d') }}</td>
<td>{{ $o->date_orig->format('Y-m-d') }}</td> <td>{{ $o->created_at->format('Y-m-d') }}</td>
<td>{{ $o->account->name }}</td> <td>{{ $o->account->name }}</td>
<td>{{ $o->service->name_short }}</td> <td>{{ $o->service->name_short }}</td>
<td>{{ $o->description }}</td> <td>{{ $o->description }}</td>