shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

close #2221 Fixed: Account Show wrong show transction date

Browse Source
This commit is contained in:
Cüneyt Şentürk 2021-08-11 10:39:14 +03:00
parent c0ebf807c1
commit d763f99d1b
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Banking/Accounts.php
View File

@ -34,8 +34,6 @@ class Accounts extends Controller
*/ */
public function show(Account $account) public function show(Account $account)
{ {
$limit = (int) request('limit', setting('default.list_limit', '25'));
// Handle transactions // Handle transactions
$transactions = Transaction::with('account', 'category')->where('account_id', $account->id)->collect('paid_at'); $transactions = Transaction::with('account', 'category')->where('account_id', $account->id)->collect('paid_at');
@ -43,7 +41,7 @@ class Accounts extends Controller
if ($transfer->expense_account->id == $account->id || $transfer->income_account->id == $account->id) { if ($transfer->expense_account->id == $account->id || $transfer->income_account->id == $account->id) {
return true; return true;
} }
return false; return false;
})->sortByDesc(function ($transfer) { })->sortByDesc(function ($transfer) {
return $transfer->expense_transaction->paid_at; return $transfer->expense_transaction->paid_at;

4
resources/views/banking/accounts/show.blade.php
View File

@ -216,7 +216,7 @@
<tbody> <tbody>
@foreach($transactions as $item) @foreach($transactions as $item)
<tr class="row align-items-center border-top-1 tr-py"> <tr class="row align-items-center border-top-1 tr-py">
<td class="col-sm-3"><a href="{{ route($item->route_name, $item->route_id) }}">@date($item->issued_at)</a></td> <td class="col-sm-3"><a href="{{ route($item->route_name, $item->route_id) }}">@date($item->paid_at)</a></td>
<td class="col-sm-3">@money($item->amount, $item->currency_code, true)</td> <td class="col-sm-3">@money($item->amount, $item->currency_code, true)</td>
<td class="col-sm-3">{{ $item->type_title }}</td> <td class="col-sm-3">{{ $item->type_title }}</td>
<td class="col-sm-3">{{ $item->category->name }}</td> <td class="col-sm-3">{{ $item->category->name }}</td>
@ -257,7 +257,7 @@
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="card-footer py-4 table-action"> <div class="card-footer py-4 table-action">