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
Show Stats 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'));
}
/**

19
app/Models/Banking/Transfer.php
View File

@ -5,10 +5,11 @@ namespace App\Models\Banking;
use App\Abstracts\Model;
use App\Traits\Currencies;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Znck\Eloquent\Traits\BelongsToThrough;
class Transfer extends Model
{
use HasFactory, Currencies;
use BelongsToThrough, Currencies, HasFactory;
protected $table = 'transfers';
@ -33,7 +34,13 @@ class Transfer extends Model
public function expense_account()
{
return $this->belongsTo('App\Models\Banking\Account', 'expense_transaction.account_id', 'id')->withDefault(['name' => trans('general.na')]);
return $this->belongsToThrough(
'App\Models\Banking\Account',
'App\Models\Banking\Transaction',
null,
'',
['App\Models\Banking\Transaction' => 'expense_transaction_id']
)->withDefault(['name' => trans('general.na')]);
}
public function income_transaction()
@ -43,7 +50,13 @@ class Transfer extends Model
public function income_account()
{
return $this->belongsTo('App\Models\Banking\Account', 'income_transaction.account_id', 'id')->withDefault(['name' => trans('general.na')]);
return $this->belongsToThrough(
'App\Models\Banking\Account',
'App\Models\Banking\Transaction',
null,
'',
['App\Models\Banking\Transaction' => 'income_transaction_id']
)->withDefault(['name' => trans('general.na')]);
}
/**

13
config/search-string.php
View File

@ -111,6 +111,19 @@ return [
],
],
App\Models\Banking\Transfer::class => [
'columns' => [
'expense_account' => [
'relationship' => true,
'route' => 'accounts.index',
],
'income_account' => [
'relationship' => true,
'route' => 'accounts.index',
],
],
],
App\Models\Common\Company::class => [
'columns' => [
'domain' => ['searchable' => true],

2
resources/lang/en-GB/search_string.php
View File

@ -13,6 +13,8 @@ return [
'issued_at' => 'Issue Date',
'symbol_first' => 'Symbol Position',
'reconciled' => 'Reconciled',
'expense_account' => 'From Account',
'income_account' => 'To Account',
],
];

17
resources/views/banking/transfers/index.blade.php
View File

@ -43,12 +43,19 @@
<tbody>
@foreach($transfers as $item)
@php
$item->name = trans('transfers.messages.delete', [
'from' => $item->expense_transaction->account->name,
'to' => $item->income_transaction->account->name,
'amount' => money($item->expense_transaction->amount, $item->expense_transaction->currency_code, true)
]);
@endphp
<tr class="row align-items-center border-top-1">
<td class="col-sm-2 col-md-1 d-none d-sm-block">{{ Form::bulkActionGroup($item->id, $item->from_account) }}</td>
<td class="col-md-2 d-none d-md-block"><a class="col-aka" href="{{ route('transfers.edit', $item->id) }}">@date($item->paid_at)</a></td>
<td class="col-sm-2 col-md-3 d-none d-sm-block">{{ $item->from_account }}</td>
<td class="col-xs-4 col-sm-4 col-md-2">{{ $item->to_account }}</td>
<td class="col-xs-4 col-sm-2 col-md-2 text-right">@money($item->amount, $item->currency_code, true)</td>
<td class="col-sm-2 col-md-1 d-none d-sm-block">{{ Form::bulkActionGroup($item->id, $item->expense_transaction->account->name) }}</td>
<td class="col-md-2 d-none d-md-block"><a class="col-aka" href="{{ route('transfers.edit', $item->id) }}">@date($item->expense_transaction->paid_at)</a></td>
<td class="col-sm-2 col-md-3 d-none d-sm-block">{{ $item->expense_transaction->account->name }}</td>
<td class="col-xs-4 col-sm-4 col-md-2">{{ $item->income_transaction->account->name }}</td>
<td class="col-xs-4 col-sm-2 col-md-2 text-right">@money($item->expense_transaction->amount, $item->expense_transaction->currency_code, true)</td>
<td class="col-xs-4 col-sm-2 col-md-2 text-center">
<div class="dropdown">
<a class="btn btn-neutral btn-sm text-light items-align-center py-2" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">