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

fixed #1830

Browse Source
This commit is contained in:
Denis Duliçi
2021-02-11 01:57:17 +03:00
parent 8cc2aeb9b9
commit 6d47a8c32a
5 changed files with 45 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
app/Http/Controllers/Banking/Transfers.php
View File

@ -25,64 +25,11 @@ class Transfers extends Controller
*/
public function index()
{
$data = [];
$items = Transfer::with(
$transfers = Transfer::with(
'expense_transaction', 'expense_transaction.account', 'income_transaction', 'income_transaction.account'
)->collect(['expense_transaction.paid_at' => 'desc']);
foreach ($items as $item) {
$income_transaction = $item->income_transaction;
$expense_transaction = $item->expense_transaction;
$name = trans('transfers.messages.delete', [
'from' => $expense_transaction->account->name,
'to' => $income_transaction->account->name,
'amount' => money($expense_transaction->amount, $expense_transaction->currency_code, true)
]);
$data[] = (object) [
'id' => $item->id,
'name' => $name,
'from_account' => $expense_transaction->account->name,
'to_account' => $income_transaction->account->name,
'amount' => $expense_transaction->amount,
'currency_code' => $expense_transaction->currency_code,
'paid_at' => $expense_transaction->paid_at,
];
}
$special_key = [
'expense_transaction.name' => 'from_account',
'income_transaction.name' => 'to_account',
];
$request = request();
if (isset($request['sort']) && array_key_exists($request['sort'], $special_key)) {
$sort_order = [];
foreach ($data as $key => $value) {
$sort = $request['sort'];
if (array_key_exists($request['sort'], $special_key)) {
$sort = $special_key[$request['sort']];
}
$sort_order[$key] = $value->{$sort};
}
$sort_type = (isset($request['order']) && $request['order'] == 'asc') ? SORT_ASC : SORT_DESC;
array_multisort($sort_order, $sort_type, $data);
}
$transfers = $request->expectsJson() ? $data : $this->paginate($data);
$accounts = collect(Account::enabled()->orderBy('name')->pluck('name', 'id'))
->prepend(trans('general.all_type', ['type' => trans_choice('general.accounts', 2)]), '');
return $this->response('banking.transfers.index', compact('transfers', 'accounts'));
return $this->response('banking.transfers.index', compact('transfers'));
}
/**