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

close #465 Fixed: For Invoice and Bill Status Problem Language Type

Browse Source
This commit is contained in:
cuneytsenturk 2018-08-30 12:17:18 +03:00
parent eb5023759c
commit 37f9fbe622
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/customers/invoices/index.blade.php
View File

@ -39,7 +39,7 @@
<td class="text-right">@money($item->amount, $item->currency_code, true)</td> <td class="text-right">@money($item->amount, $item->currency_code, true)</td>
<td class="text-right">{{ Date::parse($item->invoiced_at)->format($date_format) }}</td> <td class="text-right">{{ Date::parse($item->invoiced_at)->format($date_format) }}</td>
<td class="text-right">{{ Date::parse($item->due_at)->format($date_format) }}</td> <td class="text-right">{{ Date::parse($item->due_at)->format($date_format) }}</td>
<td class="text-center"><span class="label {{ $item->status->label }}">{{ $item->status->name }}</span></td> <td class="text-center"><span class="label {{ $item->status->label }}">{{ trans('invoices.status.' . $item->status->code) }}</span></td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>

6
resources/views/customers/invoices/show.blade.php
View File

@ -5,7 +5,11 @@
@section('content') @section('content')
<div class="box box-success"> <div class="box box-success">
<section class="invoice"> <section class="invoice">
<span class="badge bg-aqua">{{ $invoice->status->name }}</span> <div id="badge">
<div class="arrow-up"></div>
<div class="label {{ $invoice->status->label }}">{{ trans('invoices.status.' . $invoice->status->code) }}</div>
<div class="arrow-right"></div>
</div>
<div class="row invoice-header"> <div class="row invoice-header">
<div class="col-xs-7"> <div class="col-xs-7">

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

@ -52,7 +52,7 @@
<td class="text-right amount-space">@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->billed_at)->format($date_format) }}</td>
<td>{{ Date::parse($item->due_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> <td><span class="label {{ $item->status->label }}">{{ trans('bills.status.' . $item->status->code) }}</span></td>
<td class="text-center"> <td class="text-center">
<div class="btn-group"> <div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-toggle-position="left" aria-expanded="false"> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-toggle-position="left" aria-expanded="false">

2
resources/views/expenses/bills/show.blade.php
View File

@ -19,7 +19,7 @@
<div class="bill"> <div class="bill">
<div id="badge"> <div id="badge">
<div class="arrow-up"></div> <div class="arrow-up"></div>
<div class="label {{ $bill->status->label }}">{{ $bill->status->name }}</div> <div class="label {{ $bill->status->label }}">{{ trans('bills.status.' . $bill->status->code) }}</div>
<div class="arrow-right"></div> <div class="arrow-right"></div>
</div> </div>

2
resources/views/incomes/invoices/index.blade.php
View File

@ -51,7 +51,7 @@
<td class="text-right amount-space">@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->invoiced_at)->format($date_format) }}</td> <td>{{ Date::parse($item->invoiced_at)->format($date_format) }}</td>
<td>{{ Date::parse($item->due_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> <td><span class="label {{ $item->status->label }}">{{ trans('invoices.status.' . $item->status->code) }}</span></td>
<td class="text-center"> <td class="text-center">
<div class="btn-group"> <div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-toggle-position="left" aria-expanded="false"> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-toggle-position="left" aria-expanded="false">

2
resources/views/incomes/invoices/show.blade.php
View File

@ -19,7 +19,7 @@
<section class="invoice"> <section class="invoice">
<div id="badge"> <div id="badge">
<div class="arrow-up"></div> <div class="arrow-up"></div>
<div class="label {{ $invoice->status->label }}">{{ $invoice->status->name }}</div> <div class="label {{ $invoice->status->label }}">{{ trans('invoices.status.' . $invoice->status->code) }}</div>
<div class="arrow-right"></div> <div class="arrow-right"></div>
</div> </div>