diff --git a/app/Models/Service/Adsl.php b/app/Models/Service/Adsl.php index d56b503..47f246e 100644 --- a/app/Models/Service/Adsl.php +++ b/app/Models/Service/Adsl.php @@ -172,7 +172,7 @@ class Adsl extends ServiceType implements ServiceItem,ServiceUsage ->where('date','>=',$start->format('Y-m-d')) ->where('date','<=',$maxdate->date->format('Y-m-d')) ->get()->groupBy(function($item) { - return sprintf('%s-%s',$item->trafficMonthStart->format('M-d'),$item->trafficMonthEnd->format('M-d')); + return sprintf('%s->%s',$item->trafficMonthStart->format('d M'),$item->trafficMonthEnd->format('d M')); }) as $key => $o) { $result->put($key,$o->sum('total')); } diff --git a/app/Models/Service/AdslTraffic.php b/app/Models/Service/AdslTraffic.php index 016f4c1..34814da 100644 --- a/app/Models/Service/AdslTraffic.php +++ b/app/Models/Service/AdslTraffic.php @@ -24,7 +24,7 @@ class AdslTraffic extends Model public function getTrafficMonthEndAttribute() { if ($this->date->day > $this->traffic_end) { // If we are the last day of the month, we'll temporarily take 3 days since Jan 31 and addMonth() results in March. - if ($this->date->isLastOfMonth()) + if ($this->date->addMonth()->day != $this->date->day) $this->date=$this->date->subDays(3); return Carbon::createFromFormat('Y-m-d',$this->date->addMonth()->format('Y-m-').$this->traffic_end);