diff --git a/app/Models/Service.php b/app/Models/Service.php index 3075f7d..6c6c7b3 100644 --- a/app/Models/Service.php +++ b/app/Models/Service.php @@ -944,6 +944,9 @@ class Service extends Model implements IDs { $max = max($date,$this->getCancelDateAttribute())->clone(); + if (! $this->getPaidToAttribute()) + return $this->account->taxed($this->getContractTermAttribute()*$this->getBillingChargeNormalisedAttribute()); + if ($this->getPaidToAttribute()->lessThan($max)) { $d = $this->getPaidToAttribute()->diffInDays($max); @@ -981,6 +984,9 @@ class Service extends Model implements IDs { $max = max($date,$this->getCancelDateAttribute())->clone(); + if (! $this->getInvoicedToAttribute()) + return $this->account->taxed($this->getContractTermAttribute()*$this->getBillingChargeNormalisedAttribute()); + if ($this->getInvoicedToAttribute()->lessThan($max)) { $d = $this->getInvoicedToAttribute()->diffInDays($max); diff --git a/resources/views/theme/backend/adminlte/service/widget/internal.blade.php b/resources/views/theme/backend/adminlte/service/widget/internal.blade.php index a5f2c5f..fe6668c 100644 --- a/resources/views/theme/backend/adminlte/service/widget/internal.blade.php +++ b/resources/views/theme/backend/adminlte/service/widget/internal.blade.php @@ -130,8 +130,8 @@