Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00
Code Issues Releases Activity

Add 'Sent' filter to invoice reports #1414

Browse Source
This commit is contained in:
Hillel Coren 2017-05-16 16:56:51 +03:00
parent a99065f70b
commit b2a2ac6630
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Ninja/Reports/InvoiceReport.php
View File

@ -30,7 +30,7 @@ class InvoiceReport extends AbstractReport
->with(['invoices' => function ($query) use ($status) { ->with(['invoices' => function ($query) use ($status) {
if ($status == 'draft') { if ($status == 'draft') {
$query->whereIsPublic(false); $query->whereIsPublic(false);
} elseif ($status == 'unpaid' || $status == 'paid') { } elseif (in_array($status, ['paid', 'unpaid', 'sent'])) {
$query->whereIsPublic(true); $query->whereIsPublic(true);
} }
$query->invoices() $query->invoices()

2
app/Ninja/Reports/ProductReport.php
View File

@ -30,7 +30,7 @@ class ProductReport extends AbstractReport
->with(['invoices' => function ($query) use ($status) { ->with(['invoices' => function ($query) use ($status) {
if ($status == 'draft') { if ($status == 'draft') {
$query->whereIsPublic(false); $query->whereIsPublic(false);
} elseif ($status == 'unpaid' || $status == 'paid') { } elseif (in_array($status, ['paid', 'unpaid', 'sent'])) {
$query->whereIsPublic(true); $query->whereIsPublic(true);
} }
$query->invoices() $query->invoices()

2
resources/lang/en/texts.php
View File

@ -2248,6 +2248,8 @@ $LANG = array(
'oauth_taken' => 'The account is already registered', 'oauth_taken' => 'The account is already registered',
'emailed_payment' => 'Successfully emailed payment', 'emailed_payment' => 'Successfully emailed payment',
'email_payment' => 'Email Payment', 'email_payment' => 'Email Payment',
'sent' => 'Sent',
); );
return $LANG; return $LANG;

1
resources/views/reports/chart_builder.blade.php
View File

@ -122,6 +122,7 @@
{!! Former::select('invoice_status')->label('status') {!! Former::select('invoice_status')->label('status')
->addOption(trans('texts.all'), 'all') ->addOption(trans('texts.all'), 'all')
->addOption(trans('texts.draft'), 'draft') ->addOption(trans('texts.draft'), 'draft')
->addOption(trans('texts.sent'), 'sent')
->addOption(trans('texts.unpaid'), 'unpaid') ->addOption(trans('texts.unpaid'), 'unpaid')
->addOption(trans('texts.paid'), 'paid') !!} ->addOption(trans('texts.paid'), 'paid') !!}
</div> </div>