Move some service::class methods into __get(), no functional changes
This commit is contained in:
@@ -257,7 +257,7 @@ class Account extends Model implements IDs
|
||||
{
|
||||
$svs = $this
|
||||
->services_active
|
||||
->filter(fn($item)=>$item->isBilled() && $item->invoice_next)
|
||||
->filter(fn($item)=>$item->is_billed && $item->invoice_next)
|
||||
->sortBy(fn($item)=>(string)$item->invoice_next);
|
||||
|
||||
// Collect all the invoice items for our active services
|
||||
@@ -280,7 +280,7 @@ class Account extends Model implements IDs
|
||||
->flatten();
|
||||
|
||||
// Add any account charges (charges with no active service)
|
||||
foreach ($this->charges->filter(function($item) { return $item->unprocessed && ((! $this->service_id) || (! $item->service->isBilled())); }) as $oo) {
|
||||
foreach ($this->charges->filter(function($item) { return $item->unprocessed && ((! $this->service_id) || (! $item->service->is_billed)); }) as $oo) {
|
||||
$ii = new InvoiceItem;
|
||||
|
||||
$ii->active = TRUE;
|
||||
|
Reference in New Issue
Block a user