Add more details to Service Movements

This commit is contained in:
Deon George 2018-11-21 14:37:17 +11:00
parent 72fcdab84e
commit a9f545412b
No known key found for this signature in database
GPG Key ID: 7670E8DC27415254
5 changed files with 26 additions and 2 deletions

View File

@ -25,6 +25,7 @@ class Service extends Model
'admin_service_id_url', 'admin_service_id_url',
'category', 'category',
'name', 'name',
'name_full',
'next_invoice', 'next_invoice',
'product_name', 'product_name',
'service_id', 'service_id',
@ -40,6 +41,7 @@ class Service extends Model
'data_orig', 'data_orig',
'id', 'id',
'name', 'name',
'name_full',
'next_invoice', 'next_invoice',
'product_name', 'product_name',
'service_id', 'service_id',
@ -144,6 +146,14 @@ class Service extends Model
return $this->ServicePlugin()->name; return $this->ServicePlugin()->name;
} }
public function getNameFullAttribute()
{
if (! isset($this->ServicePlugin()->full_name))
return 'Unknown';
return $this->ServicePlugin()->full_name;
}
public function getNextInvoiceAttribute() public function getNextInvoiceAttribute()
{ {
return $this->date_next_invoice ? $this->date_next_invoice->format('Y-m-d') : NULL; return $this->date_next_invoice ? $this->date_next_invoice->format('Y-m-d') : NULL;

View File

@ -12,6 +12,13 @@ class ServiceAdsl extends Model
protected $table = 'ab_service__adsl'; protected $table = 'ab_service__adsl';
public $timestamps = FALSE; public $timestamps = FALSE;
public function getFullNameAttribute()
{
return ($this->service_number AND $this->service_address)
? sprintf('%s: %s',$this->service_number, $this->service_address)
: $this->name;
}
public function getNameAttribute() public function getNameAttribute()
{ {
return $this->service_number ?: $this->service_address; return $this->service_number ?: $this->service_address;

View File

@ -11,6 +11,13 @@ class ServiceVoip extends Model
protected $table = 'ab_service__voip'; protected $table = 'ab_service__voip';
public $timestamps = FALSE; public $timestamps = FALSE;
public function getFullNameAttribute()
{
return ($this->service_number AND $this->service_address)
? sprintf('%s: %s',$this->service_number, $this->service_address)
: $this->name;
}
public function getNameAttribute() public function getNameAttribute()
{ {
return $this->service_number; return $this->service_number;

View File

@ -61,7 +61,7 @@
@endif @endif
}, },
{ data: "account_name" }, { data: "account_name" },
{ data: "name" }, { data: "name_full" },
{ data: "status" }, { data: "status" },
{ data: "product_name" } { data: "product_name" }
], ],

View File

@ -61,7 +61,7 @@
@endif @endif
}, },
{ data: "account_name" }, { data: "account_name" },
{ data: "name" }, { data: "name_full" },
{ data: "status" }, { data: "status" },
{ data: "product_name" } { data: "product_name" }
], ],