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

Merge pull request #970 from sausin/patch-1

Browse Source 
Include links to bills on relevant transactions
This commit is contained in:
Denis Duliçi 2019-12-12 12:05:20 +03:00 committed by GitHub
commit 7db5dd2c5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Banking/Transactions.php
View File

@ -28,7 +28,7 @@ class Transactions extends Controller
$request_type = !request()->has('type') ? ['income', 'expense'] : request('type'); $request_type = !request()->has('type') ? ['income', 'expense'] : request('type');
$categories = Category::enabled()->type($request_type)->orderBy('name')->pluck('name', 'id'); $categories = Category::enabled()->type($request_type)->orderBy('name')->pluck('name', 'id');
$transactions = Transaction::with(['account', 'category', 'contact'])->collect(['paid_at'=> 'desc']); $transactions = Transaction::with(['account', 'category', 'contact', 'bill:id', 'invoice.id'])->collect(['paid_at'=> 'desc']);
return view('banking.transactions.index', compact('transactions', 'accounts', 'types', 'categories')); return view('banking.transactions.index', compact('transactions', 'accounts', 'types', 'categories'));
} }

14
resources/views/banking/transactions/index.blade.php
View File

@ -46,7 +46,21 @@
<td class="col-xs-4 col-sm-3 col-md-2">{{ trans_choice('general.' . Str::plural($item->type), 1) }}</td> <td class="col-xs-4 col-sm-3 col-md-2">{{ trans_choice('general.' . Str::plural($item->type), 1) }}</td>
<td class="col-sm-2 col-md-2 hidden-sm">{{ $item->category->name }}</td> <td class="col-sm-2 col-md-2 hidden-sm">{{ $item->category->name }}</td>
<td class="col-md-2 hidden-md">{{ $item->description }}</td> <td class="col-md-2 hidden-md">{{ $item->description }}</td>
@if(!is_null(data_get($item, 'bill.id')))
<td class="col-xs-4 col-sm-2 col-md-2 text-right">
<a href="{{ route('bills.show', $item->bill->id) }}">
@money($item->amount, $item->currency_code, true)
</a>
</td>
@elseif(!is_null(data_get($item, 'invoice.id')))
<td class="col-xs-4 col-sm-2 col-md-2 text-right">
<a href="{{ route('invoices.show', $item->invoice->id) }}">
@money($item->amount, $item->currency_code, true)
</a>
</td>
@else
<td class="col-xs-4 col-sm-2 col-md-2 text-right">@money($item->amount, $item->currency_code, true)</td> <td class="col-xs-4 col-sm-2 col-md-2 text-right">@money($item->amount, $item->currency_code, true)</td>
@endif
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>