diff --git a/app/Http/Controllers/Banking/Transactions.php b/app/Http/Controllers/Banking/Transactions.php index fcc639375..bfa13b243 100644 --- a/app/Http/Controllers/Banking/Transactions.php +++ b/app/Http/Controllers/Banking/Transactions.php @@ -28,7 +28,7 @@ class Transactions extends Controller $request_type = !request()->has('type') ? ['income', 'expense'] : request('type'); $categories = Category::enabled()->type($request_type)->orderBy('name')->pluck('name', 'id'); - $transactions = Transaction::with(['account', 'category', 'contact', 'bill:id', 'invoice.id'])->collect(['paid_at'=> 'desc']); + $transactions = Transaction::with(['account', 'category', 'contact'])->collect(['paid_at'=> 'desc']); return view('banking.transactions.index', compact('transactions', 'accounts', 'types', 'categories')); } diff --git a/resources/views/banking/transactions/index.blade.php b/resources/views/banking/transactions/index.blade.php index 7218078c9..2e1b9da89 100644 --- a/resources/views/banking/transactions/index.blade.php +++ b/resources/views/banking/transactions/index.blade.php @@ -46,21 +46,15 @@ {{ trans_choice('general.' . Str::plural($item->type), 1) }} {{ $item->category->name }} {{ $item->description }} - @if(!is_null(data_get($item, 'bill.id'))) - + @php + $id = !empty($item->document_id) ? $item->document_id : $item->id; + $route = ($item->type == 'income') ? (!empty($item->document_id) ? 'invoices.show' : 'revenues.edit') : (!empty($item->document_id) ? 'bills.show' : 'payments.edit'); + @endphp + @money($item->amount, $item->currency_code, true) - @elseif(!is_null(data_get($item, 'invoice.id'))) - - - @money($item->amount, $item->currency_code, true) - - - @else - @money($item->amount, $item->currency_code, true) - @endif @endforeach