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

Merge pull request #1660 from domkrm/fix/reconciliation-use-all-types

Browse Source 
Use all income types for reconciliations
This commit is contained in:
Cüneyt Şentürk 2020-11-10 22:04:55 +03:00 committed by GitHub
commit cfc548d3ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
resources/views/banking/reconciliations/create.blade.php
View File

@ -74,7 +74,7 @@
<td class="col-xs-4 col-sm-3 col-md-2 long-texts">@date($item->paid_at)</td>
<td class="col-md-2 text-center d-none d-md-block">{{ $item->description }}</td>
<td class="col-md-2 col-sm-3 col-md-3 d-none d-sm-block">{{ $item->contact->name }}</td>
@if ($item->type == 'income')
@if ($item->isIncome())
<td class="col-xs-4 col-sm-3 col-md-2 text-right">@money($item->amount, $item->currency_code, true)</td>
<td class="col-xs-4 col-sm-3 col-md-2 text-right">N/A</td>
@else
@ -83,14 +83,15 @@
@endif
<td class="col-md-1 text-right d-none d-md-block">
<div class="custom-control custom-checkbox">
{{ Form::checkbox($item->type . '_' . $item->id, $item->amount_for_account, $item->reconciled, [
@php $type = $item->isIncome() ? 'income' : 'expense'; @endphp
{{ Form::checkbox($type . '_' . $item->id, $item->amount_for_account, $item->reconciled, [
'data-field' => 'transactions',
'v-model' => 'form.transactions.' . $item->type . '_' . $item->id,
'id' => 'transaction-' . $item->id . '-'. $item->type,
'v-model' => 'form.transactions.' . $type . '_' . $item->id,
'id' => 'transaction-' . $item->id . '-'. $type,
'class' => 'custom-control-input',
'@change' => 'onCalculate'
]) }}
<label class="custom-control-label" for="transaction-{{ $item->id . '-'. $item->type }}"></label>
<label class="custom-control-label" for="transaction-{{ $item->id . '-'. $type }}"></label>
</div>
</td>
</tr>

11
resources/views/banking/reconciliations/edit.blade.php
View File

@ -46,7 +46,7 @@
<td class="col-xs-4 col-sm-3 col-md-2 long-texts">@date($item->paid_at)</td>
<td class="col-md-2 text-center d-none d-md-block">{{ $item->description }}</td>
<td class="col-md-2 col-sm-3 col-md-3 d-none d-sm-block">{{ $item->contact->name }}</td>
@if ($item->type == 'income')
@if ($item->isIncome())
<td class="col-xs-4 col-sm-3 col-md-2 text-right">@money($item->amount, $item->currency_code, true)</td>
<td class="col-xs-4 col-sm-3 col-md-2 text-right">N/A</td>
@else
@ -55,14 +55,15 @@
@endif
<td class="col-md-1 text-right d-none d-md-block">
<div class="custom-control custom-checkbox">
{{ Form::checkbox($item->type . '_' . $item->id, $item->amount_for_account, $item->reconciled, [
@php $type = $item->isIncome() ? 'income' : 'expense'; @endphp
{{ Form::checkbox($type . '_' . $item->id, $item->amount_for_account, $item->reconciled, [
'data-field' => 'transactions',
'v-model' => 'form.transactions.' . $item->type . '_' . $item->id,
'id' => 'transaction-' . $item->id . '-'. $item->type,
'v-model' => 'form.transactions.' . $type . '_' . $item->id,
'id' => 'transaction-' . $item->id . '-'. $type,
'class' => 'custom-control-input',
'@change' => 'onCalculate'
]) }}
<label class="custom-control-label" for="transaction-{{ $item->id . '-'. $item->type }}"></label>
<label class="custom-control-label" for="transaction-{{ $item->id . '-'. $type }}"></label>
</div>
</td>
</tr>