Minor display fixes, link to old site

app/Models/Payment.php

@@ -12,12 +12,14 @@ class Payment extends Model
 
 	protected $appends = [
 		'date_paid',
+		'payment_id_url',
 		'total',
 	];
 
 	protected $visible = [
 		'date_paid',
 		'id',
+		'payment_id_url',
 		'total',
 	];
 
@@ -36,6 +38,16 @@ class Payment extends Model
 		return $this->date_payment->format('Y-m-d');
 	}
 
+	public function getPaymentIdAttribute()
+	{
+		return sprintf('%02s-%04s+%05s',$this->site_id,$this->account_id,$this->id);
+	}
+
+	public function getPaymentIdUrlAttribute()
+	{
+		return sprintf('<a href="/u/payment/view/%s">%s</a>',$this->id,$this->payment_id);
+	}
+
 	public function getTotalAttribute()
 	{
 		return sprintf('%3.'.$this->currency()->rounding.'f',$this->total_amt);

app/Models/Service.php

@@ -119,7 +119,7 @@ class Service extends Model
 
 	public function getServiceIdAttribute()
 	{
-		return sprintf('%02s-%05s',$this->site_id,$this->id);
+		return sprintf('%02s-%04s.%05s',$this->site_id,$this->account_id,$this->id);
 	}
 
 	public function getServiceIdUrlAttribute()

app/Models/ServiceAdsl.php

@@ -2,17 +2,12 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Model;
+use App\Models\Service_Model as Model;
 
 class ServiceAdsl extends Model
 {
 	protected $table = 'ab_service__adsl';
 
-	public function service()
-	{
-		return $this->belongsTo(Service::class);
-	}
-
 	public function getNameAttribute()
 	{
 		return $this->service_number;

app/Models/ServiceDomain.php

@@ -2,17 +2,12 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Model;
+use App\Models\Service_Model as Model;
 
 class ServiceDomain extends Model
 {
 	protected $table = 'ab_service__domain';
 
-	public function service()
-	{
-		return $this->belongsTo(Service::class);
-	}
-
 	public function tld()
 	{
 		return $this->belongsTo(DomainTld::class,'domain_tld_id');

app/Models/ServiceHost.php

@@ -2,17 +2,12 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Model;
+use App\Models\Service_Model as Model;
 
 class ServiceHost extends Model
 {
 	protected $table = 'ab_service__hosting';
 
-	public function service()
-	{
-		return $this->belongsTo(Service::class);
-	}
-
 	public function getNameAttribute()
 	{
 		return sprintf('%s',$this->domain_name);

app/Models/ServiceSsl.php

@@ -2,25 +2,39 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Model;
+use App\Models\Service_Model as Model;
+use App\Classes\SSL;
 
 class ServiceSsl extends Model
 {
 	protected $table = 'ab_service__ssl';
-
-	public function service()
-	{
-		return $this->belongsTo(Service::class);
-	}
+	protected $_o = NULL;
 
 	public function tld()
 	{
 		return $this->belongsTo(DomainTld::class,'domain_tld_id');
 	}
 
+	public function getSSLAttribute()
+	{
+		if (is_null($this->_o))
+		{
+			$this->_o = new SSL;
+
+			if ($this->cert)
+				$this->_o->crt($this->cert);
+			if ($this->csr)
+				$this->_o->csr($this->csr);
+			if ($this->pk)
+				$this->_o->key($this->pk);
+
+		}
+
+		return $this->_o;
+	}
+
 	public function getNameAttribute()
 	{
-		// @todo Merge in SSL functions from old site
-		return 'SSL';
+		return $this->ssl->cn;
 	}
 }

app/Models/ServiceVoip.php

@@ -2,17 +2,12 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Model;
+use App\Models\Service_Model as Model;
 
 class ServiceVoip extends Model
 {
 	protected $table = 'ab_service__voip';
 
-	public function service()
-	{
-		return $this->belongsTo(Service::class);
-	}
-
 	public function getNameAttribute()
 	{
 		return $this->service_number;

app/Models/Service_Model.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * Abstract Base Model for Services
+ */
+abstract class Service_Model extends Model
+{
+	public function service()
+	{
+		return $this->belongsTo(Service::class);
+	}
+
+	/**
+	 * The name of the server, that will appear on invoices/service displays
+	 * @return mixed
+	 */
+	abstract public function getNameAttribute();
+}