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

fixed #284

Browse Source
This commit is contained in:
denisdulici
2018-03-30 17:46:50 +03:00
parent 778006d2a4
commit a57f446d92
11 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/views/expenses/bills/index.blade.php
View File

@@ -35,8 +35,8 @@
<thead>
<tr>
<th class="col-md-2">@sortablelink('bill_number', trans_choice('general.numbers', 1))</th>
<th class="col-md-3">@sortablelink('vendor_name', trans_choice('general.vendors', 1))</th>
<th class="col-md-1">@sortablelink('amount', trans('general.amount'))</th>
<th class="col-md-2">@sortablelink('vendor_name', trans_choice('general.vendors', 1))</th>
<th class="col-md-2 text-right amount-space">@sortablelink('amount', trans('general.amount'))</th>
<th class="col-md-2">@sortablelink('billed_at', trans('bills.bill_date'))</th>
<th class="col-md-2">@sortablelink('due_at', trans('bills.due_date'))</th>
<th class="col-md-1">@sortablelink('bill_status_code', trans_choice('general.statuses', 1))</th>
@@ -48,7 +48,7 @@
<tr>
<td><a href="{{ url('expenses/bills/' . $item->id . ' ') }}">{{ $item->bill_number }}</a></td>
<td>{{ $item->vendor_name }}</td>
<td>@money($item->amount, $item->currency_code, true)</td>
<td class="text-right amount-space">@money($item->amount, $item->currency_code, true)</td>
<td>{{ Date::parse($item->billed_at)->format($date_format) }}</td>
<td>{{ Date::parse($item->due_at)->format($date_format) }}</td>
<td><span class="label {{ $item->status->label }}">{{ $item->status->name }}</span></td>

4
resources/views/expenses/payments/index.blade.php
View File

@@ -35,7 +35,7 @@
<thead>
<tr>
<th class="col-md-2">@sortablelink('paid_at', trans('general.date'))</th>
<th class="col-md-2">@sortablelink('amount', trans('general.amount'))</th>
<th class="col-md-2 text-right amount-space">@sortablelink('amount', trans('general.amount'))</th>
<th class="col-md-3 hidden-xs">@sortablelink('vendor.name', trans_choice('general.vendors', 1))</th>
<th class="col-md-2 hidden-xs">@sortablelink('category.name', trans_choice('general.categories', 1))</th>
<th class="col-md-2 hidden-xs">@sortablelink('account.name', trans_choice('general.accounts', 1))</th>
@@ -46,7 +46,7 @@
@foreach($payments as $item)
<tr>
<td><a href="{{ url('expenses/payments/' . $item->id . '/edit') }}">{{ Date::parse($item->paid_at)->format($date_format) }}</a></td>
<td>@money($item->amount, $item->currency_code, true)</td>
<td class="text-right amount-space">@money($item->amount, $item->currency_code, true)</td>
<td class="hidden-xs">{{ !empty($item->vendor->name) ? $item->vendor->name : trans('general.na') }}</td>
<td class="hidden-xs">{{ $item->category->name }}</td>
<td class="hidden-xs">{{ $item->account->name }}</td>