From b2a2ac66301d23dd68d01369a75fc7ac16636572 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 16 May 2017 16:56:51 +0300 Subject: [PATCH] Add 'Sent' filter to invoice reports #1414 --- app/Ninja/Reports/InvoiceReport.php | 2 +- app/Ninja/Reports/ProductReport.php | 2 +- resources/lang/en/texts.php | 2 ++ resources/views/reports/chart_builder.blade.php | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Ninja/Reports/InvoiceReport.php b/app/Ninja/Reports/InvoiceReport.php index b9cb66d0f560..1da6e8c5ef25 100644 --- a/app/Ninja/Reports/InvoiceReport.php +++ b/app/Ninja/Reports/InvoiceReport.php @@ -30,7 +30,7 @@ class InvoiceReport extends AbstractReport ->with(['invoices' => function ($query) use ($status) { if ($status == 'draft') { $query->whereIsPublic(false); - } elseif ($status == 'unpaid' || $status == 'paid') { + } elseif (in_array($status, ['paid', 'unpaid', 'sent'])) { $query->whereIsPublic(true); } $query->invoices() diff --git a/app/Ninja/Reports/ProductReport.php b/app/Ninja/Reports/ProductReport.php index a0124a825b48..37ad9b6cfd2c 100644 --- a/app/Ninja/Reports/ProductReport.php +++ b/app/Ninja/Reports/ProductReport.php @@ -30,7 +30,7 @@ class ProductReport extends AbstractReport ->with(['invoices' => function ($query) use ($status) { if ($status == 'draft') { $query->whereIsPublic(false); - } elseif ($status == 'unpaid' || $status == 'paid') { + } elseif (in_array($status, ['paid', 'unpaid', 'sent'])) { $query->whereIsPublic(true); } $query->invoices() diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 68d19a4e536a..b8b0a9d74d4c 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -2248,6 +2248,8 @@ $LANG = array( 'oauth_taken' => 'The account is already registered', 'emailed_payment' => 'Successfully emailed payment', 'email_payment' => 'Email Payment', + 'sent' => 'Sent', + ); return $LANG; diff --git a/resources/views/reports/chart_builder.blade.php b/resources/views/reports/chart_builder.blade.php index a6cd6774ee2a..e1597623c028 100644 --- a/resources/views/reports/chart_builder.blade.php +++ b/resources/views/reports/chart_builder.blade.php @@ -122,6 +122,7 @@ {!! Former::select('invoice_status')->label('status') ->addOption(trans('texts.all'), 'all') ->addOption(trans('texts.draft'), 'draft') + ->addOption(trans('texts.sent'), 'sent') ->addOption(trans('texts.unpaid'), 'unpaid') ->addOption(trans('texts.paid'), 'paid') !!}