deon/osb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move charge actions to ChargeController, implemented charge delete

Browse Source
This commit is contained in:
Deon George
2024-07-26 12:33:42 +10:00
parent 756f550b43
commit 9380850395
7 changed files with 107 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Models/Charge.php
View File

@@ -70,7 +70,7 @@ class Charge extends Model
/* ATTRIBUTES */
public function getNameAttribute()
public function getNameAttribute(): string
{
return sprintf('%s %s',
$this->description,
@@ -93,4 +93,14 @@ class Charge extends Model
{
return Arr::get(InvoiceItem::type,$this->type);
}
/**
* Is this charge processable
*
* @return bool
*/
public function getUnprocessedAttribute(): bool
{
return $this->active && (! $this->processed);
}
}

2
app/Models/Service.php
View File

@@ -1275,7 +1275,7 @@ class Service extends Model implements IDs
if ((($future == TRUE) OR (($future == FALSE) AND ($this->invoice_to >= $billdate)))
AND ! $this->invoice_items->filter(function($item) { return $item->module_id == 30 AND ! $item->exists; })->count())
{
foreach ($this->charges->filter(function($item) { return ! $item->processed; }) as $oo) {
foreach ($this->charges->filter(function($item) { return $item->unprocessed; }) as $oo) {
$o = new InvoiceItem;
$o->active = TRUE;
$o->service_id = $oo->service_id;