From f3e79c48854c3bb1968c295fb999a020e4975109 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Thu, 23 Jan 2020 15:03:25 +0300 Subject: [PATCH] removed chart field from pl and tax reports --- app/Listeners/Update/V20/Version200.php | 4 ++-- app/Reports/ProfitLoss.php | 9 +++++++++ app/Reports/TaxSummary.php | 9 +++++++++ database/seeds/Reports.php | 4 ++-- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/app/Listeners/Update/V20/Version200.php b/app/Listeners/Update/V20/Version200.php index ac4ac2275..12167db8a 100644 --- a/app/Listeners/Update/V20/Version200.php +++ b/app/Listeners/Update/V20/Version200.php @@ -283,14 +283,14 @@ class Version200 extends Listener 'class' => 'App\Reports\ProfitLoss', 'name' => trans('reports.profit_loss'), 'description' => trans('demo.reports.profit_loss'), - 'settings' => ['group' => 'category', 'period' => 'quarterly', 'basis' => 'accrual', 'chart' => '0'], + 'settings' => ['group' => 'category', 'period' => 'quarterly', 'basis' => 'accrual'], ], [ 'company_id' => $company->id, 'class' => 'App\Reports\TaxSummary', 'name' => trans('reports.summary.tax'), 'description' => trans('demo.reports.tax'), - 'settings' => ['group' => 'category', 'period' => 'quarterly', 'basis' => 'accrual', 'chart' => '0'], + 'settings' => ['group' => 'category', 'period' => 'quarterly', 'basis' => 'accrual'], ], ]; diff --git a/app/Reports/ProfitLoss.php b/app/Reports/ProfitLoss.php index 89c43e152..db373efed 100644 --- a/app/Reports/ProfitLoss.php +++ b/app/Reports/ProfitLoss.php @@ -109,4 +109,13 @@ class ProfitLoss extends Report } } } + + public function getFields() + { + return [ + $this->getGroupField(), + $this->getPeriodField(), + $this->getBasisField(), + ]; + } } diff --git a/app/Reports/TaxSummary.php b/app/Reports/TaxSummary.php index 547df5783..66c054f0b 100644 --- a/app/Reports/TaxSummary.php +++ b/app/Reports/TaxSummary.php @@ -124,4 +124,13 @@ class TaxSummary extends Report } } } + + public function getFields() + { + return [ + $this->getGroupField(), + $this->getPeriodField(), + $this->getBasisField(), + ]; + } } diff --git a/database/seeds/Reports.php b/database/seeds/Reports.php index 53e7dc7c5..0acf1ee75 100644 --- a/database/seeds/Reports.php +++ b/database/seeds/Reports.php @@ -53,14 +53,14 @@ class Reports extends Seeder 'class' => 'App\Reports\ProfitLoss', 'name' => trans('reports.profit_loss'), 'description' => trans('demo.reports.profit_loss'), - 'settings' => ['group' => 'category', 'period' => 'quarterly', 'basis' => 'accrual', 'chart' => '0'], + 'settings' => ['group' => 'category', 'period' => 'quarterly', 'basis' => 'accrual'], ], [ 'company_id' => $company_id, 'class' => 'App\Reports\TaxSummary', 'name' => trans('reports.summary.tax'), 'description' => trans('demo.reports.tax'), - 'settings' => ['group' => 'category', 'period' => 'quarterly', 'basis' => 'accrual', 'chart' => '0'], + 'settings' => ['group' => 'category', 'period' => 'quarterly', 'basis' => 'accrual'], ], ];