Fix determining traffic usage month end
This commit is contained in:
parent
fee4b5802e
commit
45c93283fb
@ -159,7 +159,7 @@ class Adsl extends ServiceType implements ServiceItem,ServiceUsage
|
||||
|
||||
// If we are before the 15th
|
||||
if ($start->day < 15) {
|
||||
$start = Carbon::createFromFormat('Y-m-d',$start->subMonth->format('Y-m-').'15');
|
||||
$start = Carbon::createFromFormat('Y-m-d',$start->subMonth()->format('Y-m-').'15');
|
||||
} else {
|
||||
$start = $start->subDays($start->day-15);
|
||||
}
|
||||
|
@ -23,6 +23,10 @@ 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())
|
||||
$this->date=$this->date->subDays(3);
|
||||
|
||||
return Carbon::createFromFormat('Y-m-d',$this->date->addMonth()->format('Y-m-').$this->traffic_end);
|
||||
} else {
|
||||
return Carbon::createFromFormat('Y-m-d',$this->date->format('Y-m-').$this->traffic_end);
|
||||
|
Loading…
Reference in New Issue
Block a user