From 2c0e96f3515ae50b6877ea50aa5128b942427102 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20Duli=C3=A7i?= <denisdulici@gmail.com>
Date: Fri, 16 Jul 2021 02:35:42 +0300
Subject: [PATCH] allow reports without money

---
 app/Abstracts/Listeners/Report.php                      | 4 ++--
 app/Abstracts/Report.php                                | 4 +++-
 resources/views/partials/reports/table/footer.blade.php | 4 ++--
 resources/views/partials/reports/table/rows.blade.php   | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/Abstracts/Listeners/Report.php b/app/Abstracts/Listeners/Report.php
index f7290c6f7..eb678a292 100644
--- a/app/Abstracts/Listeners/Report.php
+++ b/app/Abstracts/Listeners/Report.php
@@ -8,7 +8,7 @@ use App\Models\Setting\Category;
 use App\Traits\Contacts;
 use App\Traits\DateTime;
 use App\Traits\SearchString;
-use Date;
+use App\Utilities\Date;
 
 abstract class Report
 {
@@ -208,7 +208,7 @@ abstract class Report
 
                     $start = $quarter->getStartDate()->format($this->getQuarterlyDateFormat($event->class->model->year));
                     $end = $quarter->getEndDate()->format($this->getQuarterlyDateFormat($event->class->model->year));
-                    
+
                     $formatted_date = $start . '-' . $end;
                 }
 
diff --git a/app/Abstracts/Report.php b/app/Abstracts/Report.php
index 800189f22..aeae249a8 100644
--- a/app/Abstracts/Report.php
+++ b/app/Abstracts/Report.php
@@ -32,6 +32,8 @@ abstract class Report
 
     public $icon = 'fa fa-chart-pie';
 
+    public $has_money = true;
+
     public $year;
 
     public $views = [];
@@ -142,7 +144,7 @@ abstract class Report
                 $sum += is_array($total) ? array_sum($total) : $total;
             }
 
-            $total = money($sum, setting('default.currency'), true)->format();
+            $total = $this->has_money ? money($sum, setting('default.currency'), true)->format() : $sum;
         } else {
             $total = trans('general.na');
         }
diff --git a/resources/views/partials/reports/table/footer.blade.php b/resources/views/partials/reports/table/footer.blade.php
index 26c39de50..5c9c097bb 100644
--- a/resources/views/partials/reports/table/footer.blade.php
+++ b/resources/views/partials/reports/table/footer.blade.php
@@ -4,8 +4,8 @@
     <tr class="row rp-border-top-1 font-size-unset px-3">
         <th class="{{ $class->column_name_width }} text-uppercase text-left">{{ trans_choice('general.totals', 1) }}</th>
         @foreach($class->footer_totals[$table] as $total)
-            <th class="{{ $class->column_value_width }} text-right px-0">@money($total, setting('default.currency'), true)</th>
+            <th class="{{ $class->column_value_width }} text-right px-0">{{ $class->has_money ? money($total, setting('default.currency'), true) : $total }}</th>
         @endforeach
-        <th class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($grand_total, setting('default.currency'), true)</th>
+        <th class="{{ $class->column_name_width }} text-right pl-0 pr-4">{{ $class->has_money ? money($grand_total, setting('default.currency'), true) : $grand_total }}</th>
     </tr>
 </tfoot>
diff --git a/resources/views/partials/reports/table/rows.blade.php b/resources/views/partials/reports/table/rows.blade.php
index 85f4a91b6..53010668b 100644
--- a/resources/views/partials/reports/table/rows.blade.php
+++ b/resources/views/partials/reports/table/rows.blade.php
@@ -2,8 +2,8 @@
     <tr class="row rp-border-top-1 font-size-unset">
         <td class="{{ $class->column_name_width }} long-texts pr-0" title="{{ $class->row_names[$table][$id] }}">{{ $class->row_names[$table][$id] }}</td>
         @foreach($rows as $row)
-            <td class="{{ $class->column_value_width }} text-right px-0">@money($row, setting('default.currency'), true)</td>
+            <td class="{{ $class->column_value_width }} text-right px-0">{{ $class->has_money ? money($row, setting('default.currency'), true) : $row }}</td>
         @endforeach
-        <td class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($row_total, setting('default.currency'), true)</td>
+        <td class="{{ $class->column_name_width }} text-right pl-0 pr-4">{{ $class->has_money ? money($row_total, setting('default.currency'), true) : $row }}</td>
     </tr>
 @endif