Address input fixes, region_id/host_id must not be null, address constraints changes
This commit is contained in:
@@ -4,13 +4,14 @@ namespace App\Models;
|
||||
|
||||
use Exception;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\SoftDeletes;
|
||||
|
||||
use App\Http\Controllers\DomainController;
|
||||
use App\Traits\ScopeActive;
|
||||
|
||||
class Address extends Model
|
||||
{
|
||||
use ScopeActive;
|
||||
use ScopeActive,SoftDeletes;
|
||||
|
||||
/* SCOPES */
|
||||
|
||||
@@ -18,7 +19,7 @@ class Address extends Model
|
||||
{
|
||||
return $query
|
||||
->orderBy('region_id')
|
||||
->orderByRaw('host_id NULLS FIRST')
|
||||
->orderBy('host_id')
|
||||
->orderBy('node_id')
|
||||
->orderBy('point_id');
|
||||
}
|
||||
|
@@ -15,6 +15,7 @@ class Zone extends Model
|
||||
public function scopeDomainZoneOrder($query)
|
||||
{
|
||||
return $query
|
||||
->select('zones.*')
|
||||
->join('domains',['domains.id'=>'zones.domain_id'])
|
||||
->orderBy('domains.name')
|
||||
->orderBy('zone_id');
|
||||
|
Reference in New Issue
Block a user