From 0e0bde955d17b0e4f92e4dd73bdcb00e096dcffc Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sun, 24 Mar 2019 15:40:49 +0300 Subject: [PATCH] fixed #800 --- app/Http/Controllers/Expenses/Bills.php | 5 ++++- app/Http/Controllers/Incomes/Invoices.php | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php index 6c556e250..b59f45e8f 100644 --- a/app/Http/Controllers/Expenses/Bills.php +++ b/app/Http/Controllers/Expenses/Bills.php @@ -54,7 +54,10 @@ class Bills extends Controller $categories = collect(Category::enabled()->type('expense')->orderBy('name')->pluck('name', 'id')); - $statuses = collect(BillStatus::all()->pluck('name', 'code')); + $statuses = collect(BillStatus::get()->each(function($item) { + $item->name = trans('bills.status.' . $item->code); + return $item; + })->pluck('name', 'code')); return view('expenses.bills.index', compact('bills', 'vendors', 'categories', 'statuses')); } diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php index ff82a9566..0646b6b3b 100644 --- a/app/Http/Controllers/Incomes/Invoices.php +++ b/app/Http/Controllers/Incomes/Invoices.php @@ -59,7 +59,10 @@ class Invoices extends Controller $categories = collect(Category::enabled()->type('income')->orderBy('name')->pluck('name', 'id')); - $statuses = collect(InvoiceStatus::all()->pluck('name', 'code')); + $statuses = collect(InvoiceStatus::get()->each(function($item) { + $item->name = trans('invoices.status.' . $item->code); + return $item; + })->pluck('name', 'code')); return view('incomes.invoices.index', compact('invoices', 'customers', 'categories', 'statuses')); }