From 228a6c51ca93d26d54bf4c10ec3a694c8fd01d5a Mon Sep 17 00:00:00 2001 From: denisdulici Date: Wed, 29 Jan 2020 17:58:43 +0300 Subject: [PATCH] fixed tax summary --- app/Reports/TaxSummary.php | 11 ----------- .../reports/tax_summary/content/footer.blade.php | 16 +--------------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/app/Reports/TaxSummary.php b/app/Reports/TaxSummary.php index 1e3668930..af71fef56 100644 --- a/app/Reports/TaxSummary.php +++ b/app/Reports/TaxSummary.php @@ -68,17 +68,6 @@ class TaxSummary extends Report break; } - - // TODO: move to views - foreach ($this->footer_totals as $table => $dates) { - foreach ($dates as $date => $total) { - if (!isset($this->net_profit[$date])) { - $this->net_profit[$date] = 0; - } - - $this->net_profit[$date] += $total; - } - } } public function setTotals($items, $date_field, $check_type = false, $table = 'default') diff --git a/resources/views/reports/tax_summary/content/footer.blade.php b/resources/views/reports/tax_summary/content/footer.blade.php index 8f96b92a7..e6b2eb47b 100644 --- a/resources/views/reports/tax_summary/content/footer.blade.php +++ b/resources/views/reports/tax_summary/content/footer.blade.php @@ -1,15 +1 @@ -
- - - - - @foreach($class->net_profit as $profit) - - @endforeach - - - -
{{ trans('reports.net_profit') }}@money($profit, setting('default.currency'), true) - @money(array_sum($class->net_profit), setting('default.currency'), true) -
-
+