Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-22 15:20:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

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) { if (strpos($field, 'date') !== false) {
//$class[] = 'group-date-monthyear';
$class[] = 'group-date-' . (isset($this->options['group_dates_by']) ? $this->options['group_dates_by'] : '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'; $class[] = 'group-letter-100';
} elseif (in_array($field, ['amount', 'paid', 'balance'])) { } elseif (in_array($field, ['amount', 'paid', 'balance'])) {
$class[] = 'group-number-50'; $class[] = 'group-number-50';

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

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

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

@ -243,7 +243,7 @@
var sumColumns = []; var sumColumns = [];
@foreach ($columns as $column) @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 @endforeach
$(function() { $(function() {