diff --git a/app/Models/Accessory.php b/app/Models/Accessory.php index 8b461900aa7a..4a7f6f5f4006 100755 --- a/app/Models/Accessory.php +++ b/app/Models/Accessory.php @@ -6,6 +6,7 @@ use App\Models\Traits\Acceptable; use App\Models\Traits\CompanyableTrait; use App\Models\Traits\HasUploads; +use App\Models\Traits\Loggable; use App\Models\Traits\Searchable; use App\Presenters\Presentable; use Illuminate\Database\Eloquent\Factories\HasFactory; diff --git a/app/Models/Asset.php b/app/Models/Asset.php index e11c46197b0c..bad1c96bdf41 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -9,6 +9,8 @@ use App\Models\Traits\Acceptable; use App\Models\Traits\CompanyableTrait; use App\Models\Traits\HasUploads; +use App\Models\Traits\Loggable; +use App\Models\Traits\Requestable; use App\Models\Traits\Searchable; use App\Presenters\AssetPresenter; use App\Presenters\Presentable; diff --git a/app/Models/AssetModel.php b/app/Models/AssetModel.php index 0fe5160b39d5..b59484d08640 100755 --- a/app/Models/AssetModel.php +++ b/app/Models/AssetModel.php @@ -2,16 +2,18 @@ namespace App\Models; +use App\Http\Traits\TwoColumnUniqueUndeletedTrait; use App\Models\Traits\HasUploads; +use App\Models\Traits\Loggable; +use App\Models\Traits\Requestable; use App\Models\Traits\Searchable; +use App\Presenters\AssetModelPresenter; use App\Presenters\Presentable; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Storage; use Watson\Validating\ValidatingTrait; -use \App\Presenters\AssetModelPresenter; -use App\Http\Traits\TwoColumnUniqueUndeletedTrait; /** * Model for Asset Models. Asset Models contain higher level diff --git a/app/Models/Component.php b/app/Models/Component.php index fb62a872c201..2ad133d67438 100644 --- a/app/Models/Component.php +++ b/app/Models/Component.php @@ -5,6 +5,7 @@ use App\Helpers\Helper; use App\Models\Traits\CompanyableTrait; use App\Models\Traits\HasUploads; +use App\Models\Traits\Loggable; use App\Models\Traits\Searchable; use App\Presenters\Presentable; use Illuminate\Database\Eloquent\Factories\HasFactory; diff --git a/app/Models/Consumable.php b/app/Models/Consumable.php index 339b88044e17..993c37c96a91 100644 --- a/app/Models/Consumable.php +++ b/app/Models/Consumable.php @@ -6,6 +6,7 @@ use App\Models\Traits\Acceptable; use App\Models\Traits\CompanyableTrait; use App\Models\Traits\HasUploads; +use App\Models\Traits\Loggable; use App\Models\Traits\Searchable; use App\Presenters\ConsumablePresenter; use App\Presenters\Presentable; diff --git a/app/Models/License.php b/app/Models/License.php index 3fcd7e7bab11..71fa08048b6c 100755 --- a/app/Models/License.php +++ b/app/Models/License.php @@ -5,6 +5,7 @@ use App\Helpers\Helper; use App\Models\Traits\CompanyableTrait; use App\Models\Traits\HasUploads; +use App\Models\Traits\Loggable; use App\Models\Traits\Searchable; use App\Presenters\Presentable; use Carbon\Carbon; diff --git a/app/Models/LicenseSeat.php b/app/Models/LicenseSeat.php index 39cb53f9d824..1682430a9379 100755 --- a/app/Models/LicenseSeat.php +++ b/app/Models/LicenseSeat.php @@ -4,6 +4,7 @@ use App\Models\Traits\Acceptable; use App\Models\Traits\CompanyableChildTrait; +use App\Models\Traits\Loggable; use App\Notifications\CheckinLicenseNotification; use App\Notifications\CheckoutLicenseNotification; use App\Presenters\Presentable; diff --git a/app/Models/Location.php b/app/Models/Location.php index 8d7bee0cbd6b..b8729a8e94ab 100755 --- a/app/Models/Location.php +++ b/app/Models/Location.php @@ -5,6 +5,7 @@ use App\Http\Traits\UniqueUndeletedTrait; use App\Models\Traits\CompanyableTrait; use App\Models\Traits\HasUploads; +use App\Models\Traits\Loggable; use App\Models\Traits\Searchable; use App\Presenters\Presentable; use Illuminate\Database\Eloquent\Factories\HasFactory; diff --git a/app/Models/Maintenance.php b/app/Models/Maintenance.php index 40a96dcb6201..df9abddf7371 100644 --- a/app/Models/Maintenance.php +++ b/app/Models/Maintenance.php @@ -5,6 +5,7 @@ use App\Helpers\Helper; use App\Models\Traits\CompanyableChildTrait; use App\Models\Traits\HasUploads; +use App\Models\Traits\Loggable; use App\Models\Traits\Searchable; use App\Presenters\Presentable; use Illuminate\Database\Eloquent\Factories\HasFactory; diff --git a/app/Models/Loggable.php b/app/Models/Traits/Loggable.php similarity index 98% rename from app/Models/Loggable.php rename to app/Models/Traits/Loggable.php index f912d159270a..204f7b24f0f8 100644 --- a/app/Models/Loggable.php +++ b/app/Models/Traits/Loggable.php @@ -1,8 +1,14 @@ requests // $asset->isRequestedBy($user) diff --git a/app/Models/User.php b/app/Models/User.php index fda296ff9147..a33fb3a0a1b2 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -5,6 +5,7 @@ use App\Http\Traits\UniqueUndeletedTrait; use App\Models\Traits\CompanyableTrait; use App\Models\Traits\HasUploads; +use App\Models\Traits\Loggable; use App\Models\Traits\Searchable; use App\Presenters\Presentable; use App\Presenters\UserPresenter;