From 4adb51e75ff7b186122bf893a21da3fbec97bc5d Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 7 Feb 2017 16:09:39 +0200
Subject: [PATCH] Improve report grouping

---
 app/Ninja/Reports/AbstractReport.php            | 3 +--
 app/Ninja/Reports/ExpenseReport.php             | 2 +-
 resources/views/reports/chart_builder.blade.php | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/Ninja/Reports/AbstractReport.php b/app/Ninja/Reports/AbstractReport.php
index c30f21b3caaa..1b4a9caf8e25 100644
--- a/app/Ninja/Reports/AbstractReport.php
+++ b/app/Ninja/Reports/AbstractReport.php
@@ -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';
diff --git a/app/Ninja/Reports/ExpenseReport.php b/app/Ninja/Reports/ExpenseReport.php
index dc0684bd04b9..3ff175a247af 100644
--- a/app/Ninja/Reports/ExpenseReport.php
+++ b/app/Ninja/Reports/ExpenseReport.php
@@ -13,7 +13,7 @@ class ExpenseReport extends AbstractReport
         'client',
         'date',
         'category',
-        'expense_amount',
+        'amount',
     ];
 
     public function run()
diff --git a/resources/views/reports/chart_builder.blade.php b/resources/views/reports/chart_builder.blade.php
index e524afde2b52..077295a6a192 100644
--- a/resources/views/reports/chart_builder.blade.php
+++ b/resources/views/reports/chart_builder.blade.php
@@ -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() {