Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 18:14:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don’t show expense invoice status on /reports

Browse Source
This commit is contained in:
Hillel Coren 2017-08-25 11:51:11 +03:00
parent 4822f3eb00
commit 7c1ab1bfca
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,7 +119,7 @@
</div> </div>
</div> </div>
<div id="statusField" style="display:{{ in_array($reportType, [ENTITY_INVOICE, ENTITY_PRODUCT]) ? 'block' : 'none' }}"> <div id="statusField" style="display:none">
{!! Former::select('invoice_status')->label('status') {!! Former::select('invoice_status')->label('status')
->addOption(trans('texts.status_all'), 'all') ->addOption(trans('texts.status_all'), 'all')
->addOption(trans('texts.status_draft'), 'draft') ->addOption(trans('texts.status_draft'), 'draft')
@ -128,7 +128,7 @@
->addOption(trans('texts.status_paid'), 'paid') !!} ->addOption(trans('texts.status_paid'), 'paid') !!}
</div> </div>
<div id="dateField" style="display:{{ $reportType == ENTITY_TAX_RATE ? 'block' : 'none' }}"> <div id="dateField" style="display:none">
{!! Former::select('date_field')->label(trans('texts.filter')) {!! Former::select('date_field')->label(trans('texts.filter'))
->addOption(trans('texts.invoice_date'), FILTER_INVOICE_DATE) ->addOption(trans('texts.invoice_date'), FILTER_INVOICE_DATE)
->addOption(trans('texts.payment_date'), FILTER_PAYMENT_DATE) !!} ->addOption(trans('texts.payment_date'), FILTER_PAYMENT_DATE) !!}
@ -264,6 +264,20 @@
$('#action').val(''); $('#action').val('');
} }
function setFiltersShown() {
var val = $('#report_type').val();
if (val == '{{ ENTITY_TAX_RATE }}') {
$('#dateField').fadeIn();
} else {
$('#dateField').fadeOut();
}
if (val == '{{ ENTITY_INVOICE }}' || val == '{{ ENTITY_PRODUCT }}') {
$('#statusField').fadeIn();
} else {
$('#statusField').fadeOut();
}
}
var sumColumns = []; var sumColumns = [];
@foreach ($columns as $column) @foreach ($columns as $column)
sumColumns.push("{{ in_array($column, ['amount', 'paid', 'balance', 'cost', 'duration']) ? trans("texts.{$column}") : false }}"); sumColumns.push("{{ in_array($column, ['amount', 'paid', 'balance', 'cost', 'duration']) ? trans("texts.{$column}") : false }}");
@ -278,17 +292,8 @@
}); });
$('#report_type').change(function() { $('#report_type').change(function() {
var val = $('#report_type').val(); var val = $('#report_type').val();
if (val == '{{ ENTITY_TAX_RATE }}') { setFiltersShown();
$('#dateField').fadeIn();
} else {
$('#dateField').fadeOut();
}
if (val == '{{ ENTITY_INVOICE }}' || val == '{{ ENTITY_PRODUCT }}') {
$('#statusField').fadeIn();
} else {
$('#statusField').fadeOut();
}
if (isStorageSupported()) { if (isStorageSupported()) {
localStorage.setItem('last:report_type', val); localStorage.setItem('last:report_type', val);
} }
@ -353,6 +358,7 @@
if (lastReportType) { if (lastReportType) {
$('#report_type').val(lastReportType); $('#report_type').val(lastReportType);
} }
setFiltersShown();
}); });
}) })