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

akaunting · Aug 30, 2018 · 37f9fbe · 37f9fbe
1 parent eb50237
commit 37f9fbe
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/resources/views/customers/invoices/index.blade.php b/resources/views/customers/invoices/index.blade.php
@@ -39,7 +39,7 @@
                         <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->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>
                 @endforeach
                 </tbody>

diff --git a/resources/views/customers/invoices/show.blade.php b/resources/views/customers/invoices/show.blade.php
@@ -5,7 +5,11 @@
 @section('content')
     <div class="box box-success">
         <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="col-xs-7">

diff --git a/resources/views/expenses/bills/index.blade.php b/resources/views/expenses/bills/index.blade.php
@@ -52,7 +52,7 @@
                         <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>
+                        <td><span class="label {{ $item->status->label }}">{{ trans('bills.status.' . $item->status->code) }}</span></td>
                         <td class="text-center">
                             <div class="btn-group">
                                 <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-toggle-position="left" aria-expanded="false">

diff --git a/resources/views/expenses/bills/show.blade.php b/resources/views/expenses/bills/show.blade.php
@@ -19,7 +19,7 @@
         <div class="bill">
             <div id="badge">
                 <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>
 

diff --git a/resources/views/incomes/invoices/index.blade.php b/resources/views/incomes/invoices/index.blade.php
@@ -51,7 +51,7 @@
                         <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->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">
                             <div class="btn-group">
                                 <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-toggle-position="left" aria-expanded="false">

diff --git a/resources/views/incomes/invoices/show.blade.php b/resources/views/incomes/invoices/show.blade.php
@@ -19,7 +19,7 @@
         <section class="invoice">
             <div id="badge">
                 <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>