From 84fa5f65464de9b9769bd8b45ddee49f641731ab Mon Sep 17 00:00:00 2001 From: Deon George Date: Tue, 16 Mar 2021 11:30:37 +1100 Subject: [PATCH] Fix no usage_summary for services not active yet, minor improvements to traffic graph --- app/Models/Service/Adsl.php | 4 ++-- .../u/service/widgets/broadband/usagegraph.blade.php | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/Models/Service/Adsl.php b/app/Models/Service/Adsl.php index 47f246e..31a5e12 100644 --- a/app/Models/Service/Adsl.php +++ b/app/Models/Service/Adsl.php @@ -136,9 +136,9 @@ class Adsl extends ServiceType implements ServiceItem,ServiceUsage /** * Find the last date any traffic was recorded for a service * - * @return AdslTraffic + * @return AdslTraffic|null */ - private function usage_last_date(): AdslTraffic + private function usage_last_date(): ?AdslTraffic { return $this->traffic ->sortBy('date') diff --git a/resources/views/theme/backend/adminlte/u/service/widgets/broadband/usagegraph.blade.php b/resources/views/theme/backend/adminlte/u/service/widgets/broadband/usagegraph.blade.php index 07dbd2a..3acf384 100644 --- a/resources/views/theme/backend/adminlte/u/service/widgets/broadband/usagegraph.blade.php +++ b/resources/views/theme/backend/adminlte/u/service/widgets/broadband/usagegraph.blade.php @@ -10,7 +10,7 @@ Period - Traffic + Traffic (GB) @@ -41,7 +41,10 @@ Highcharts.setOptions({ global: { - timezoneOffset: timezone + timezoneOffset: timezone, + }, + lang: { + thousandsSep: ',' } });