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

Merge pull request #585 from kostasdizas/issue578

Browse Source 
Fixed bug in reconciliations that prevented it from working in linux and other OSes
This commit is contained in:
Cüneyt Şentürk
2018-11-02 18:17:10 +03:00
committed by GitHub
parent 97f8c168a4 bf74ee7f83
commit 0083171a99
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,7 @@
<td>{{ Date::parse($item->paid_at)->format($date_format) }}</td>
<td>{{ $item->description }}</td>
<td>@if (!empty($item->contact)) {{ $item->contact->name }} @else {{ trans('general.na') }}@endif</td>
@if ((basename($item->model) == 'Invoice') || (basename($item->model) == 'Revenue'))
@if (($item->model == 'App\Models\Income\Invoice') || ($item->model == 'App\Models\Income\Revenue'))
<td class="text-right">@money($item->amount, $item->currency_code, true)</td>
<td>&nbsp;</td>
@else

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

@ -41,7 +41,7 @@
<td>{{ Date::parse($item->paid_at)->format($date_format) }}</td>
<td>{{ $item->description }}</td>
<td>@if (!empty($item->contact)) {{ $item->contact->name }} @else {{ trans('general.na') }}@endif</td>
@if ((basename($item->model) == 'Invoice') || (basename($item->model) == 'Revenue'))
@if (($item->model == 'App\Models\Income\Invoice') || ($item->model == 'App\Models\Income\Revenue'))
<td class="text-right">@money($item->amount, $item->currency_code, true)</td>
<td>&nbsp;</td>
@else