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 @@