added soft delete to settings table

This commit is contained in:
Denis Duliçi
2022-03-02 12:19:46 +03:00
parent ea4a968f0f
commit 3249e7b18d
12 changed files with 164 additions and 62 deletions

View File

@ -76,7 +76,7 @@ class User extends Authenticatable implements HasLocalePreference
public function companies()
{
return $this->morphToMany('App\Models\Common\Company', 'user', 'user_companies', 'user_id', 'company_id');
return $this->belongsToMany('App\Models\Common\Company', 'App\Models\Auth\UserCompany');
}
public function contact()
@ -86,7 +86,7 @@ class User extends Authenticatable implements HasLocalePreference
public function dashboards()
{
return $this->morphToMany('App\Models\Common\Dashboard', 'user', 'user_dashboards', 'user_id', 'dashboard_id');
return $this->belongsToMany('App\Models\Common\Dashboard', 'App\Models\Auth\UserDashboard');
}
/**

View File

@ -0,0 +1,31 @@
<?php
namespace App\Models\Auth;
use App\Abstracts\Model;
class UserCompany extends Model
{
protected $table = 'user_companies';
protected $tenantable = false;
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = ['user_id', 'company_id'];
/**
* Indicates if the model should be timestamped.
*
* @var bool
*/
public $timestamps = false;
public function user()
{
return $this->belongsTo('App\Models\Auth\User');
}
}

View File

@ -0,0 +1,31 @@
<?php
namespace App\Models\Auth;
use App\Abstracts\Model;
class UserDashboard extends Model
{
protected $table = 'user_dashboards';
protected $tenantable = false;
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = ['user_id', 'company_id'];
/**
* Indicates if the model should be timestamped.
*
* @var bool
*/
public $timestamps = false;
public function user()
{
return $this->belongsTo('App\Models\Auth\User');
}
}

View File

@ -267,7 +267,7 @@ class Company extends Eloquent implements Ownable
public function users()
{
return $this->morphedByMany('App\Models\Auth\User', 'user', 'user_companies', 'company_id', 'user_id');
return $this->belongsToMany('App\Models\Auth\User', 'App\Models\Auth\UserCompany');
}
public function vendors()

View File

@ -38,7 +38,7 @@ class Dashboard extends Model
public function users()
{
return $this->morphedByMany('App\Models\Auth\User', 'user', 'user_dashboards', 'dashboard_id', 'user_id');
return $this->belongsToMany('App\Models\Auth\User', 'App\Models\Auth\UserDashboard');
}
public function widgets()

View File

@ -18,7 +18,7 @@ class Category extends Model
*
* @var array
*/
protected $fillable = ['company_id', 'name', 'type', 'color', 'enabled', 'created_from', 'created_by',];
protected $fillable = ['company_id', 'name', 'type', 'color', 'enabled', 'created_from', 'created_by'];
/**
* The attributes that should be cast.

View File

@ -2,13 +2,10 @@
namespace App\Models\Setting;
use App\Traits\Tenants;
use Illuminate\Database\Eloquent\Model as Eloquent;
use App\Abstracts\Model;
class Setting extends Eloquent
class Setting extends Model
{
use Tenants;
protected $table = 'settings';
/**
@ -18,42 +15,13 @@ class Setting extends Eloquent
*/
protected $fillable = ['company_id', 'key', 'value'];
public $allAttributes = [];
/**
* Indicates if the model should be timestamped.
*
* @var bool
*/
public $timestamps = false;
/**
* Create a new Eloquent model instance.
*
* @param array $attributes
* @return void
*/
public function __construct(array $attributes = [])
{
$this->allAttributes = $attributes;
parent::__construct($attributes);
}
/**
* Update the model in the database.
*
* @param array $attributes
* @param array $options
* @return bool
*/
public function update(array $attributes = [], array $options = [])
{
$this->allAttributes = $attributes;
return parent::update($attributes, $options);
}
public function company()
{
return $this->belongsTo('App\Models\Common\Company');
}
/**
* Scope to only include by prefix.
*
@ -66,17 +34,4 @@ class Setting extends Eloquent
{
return $query->where('key', 'like', $prefix . '.%');
}
/**
* Scope to only include company data.
*
* @param \Illuminate\Database\Eloquent\Builder $query
* @param $company_id
*
* @return \Illuminate\Database\Eloquent\Builder
*/
public function scopeCompanyId($query, $company_id)
{
return $query->where($this->qualifyColumn('company_id'), '=', $company_id);
}
}