tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve report grouping

Browse source
This commit is contained in:
Hillel Coren 2017-02-07 16:09:39 +02:00
parent c92947ad6f
commit 4adb51e75f
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Ninja/Reports/AbstractReport.php
View file

@ -65,9 +65,8 @@ class AbstractReport
}
if (strpos($field, 'date') !== false) {
//$class[] = 'group-date-monthyear';
$class[] = 'group-date-' . (isset($this->options['group_dates_by']) ? $this->options['group_dates_by'] : 'monthyear');
} elseif (in_array($field, ['client', 'vendor', 'method'])) {
} elseif (in_array($field, ['client', 'vendor', 'product', 'method'])) {
$class[] = 'group-letter-100';
} elseif (in_array($field, ['amount', 'paid', 'balance'])) {
$class[] = 'group-number-50';

2
app/Ninja/Reports/ExpenseReport.php
View file

@ -13,7 +13,7 @@ class ExpenseReport extends AbstractReport
'client',
'date',
'category',
'expense_amount',
'amount',
];
public function run()

2
resources/views/reports/chart_builder.blade.php
View file

@ -243,7 +243,7 @@
var sumColumns = [];
@foreach ($columns as $column)
sumColumns.push("{{ in_array($column, ['amount', 'paid', 'balance']) ? trans("texts.{$column}") : false }}");
sumColumns.push("{{ in_array($column, ['amount', 'paid', 'balance', 'cost']) ? trans("texts.{$column}") : false }}");
@endforeach
$(function() {