Skip to content

Commit 9e68497

Browse files
committed
Moved Traits into directory and modify the users to point to them
1 parent 4e74c97 commit 9e68497

File tree

12 files changed

+24
-4
lines changed

12 files changed

+24
-4
lines changed

app/Models/Accessory.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use App\Models\Traits\Acceptable;
77
use App\Models\Traits\CompanyableTrait;
88
use App\Models\Traits\HasUploads;
9+
use App\Models\Traits\Loggable;
910
use App\Models\Traits\Searchable;
1011
use App\Presenters\Presentable;
1112
use Illuminate\Database\Eloquent\Factories\HasFactory;

app/Models/Asset.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
use App\Models\Traits\Acceptable;
1010
use App\Models\Traits\CompanyableTrait;
1111
use App\Models\Traits\HasUploads;
12+
use App\Models\Traits\Loggable;
13+
use App\Models\Traits\Requestable;
1214
use App\Models\Traits\Searchable;
1315
use App\Presenters\AssetPresenter;
1416
use App\Presenters\Presentable;

app/Models/AssetModel.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,18 @@
22

33
namespace App\Models;
44

5+
use App\Http\Traits\TwoColumnUniqueUndeletedTrait;
56
use App\Models\Traits\HasUploads;
7+
use App\Models\Traits\Loggable;
8+
use App\Models\Traits\Requestable;
69
use App\Models\Traits\Searchable;
10+
use App\Presenters\AssetModelPresenter;
711
use App\Presenters\Presentable;
812
use Illuminate\Database\Eloquent\Factories\HasFactory;
913
use Illuminate\Database\Eloquent\SoftDeletes;
1014
use Illuminate\Support\Facades\Gate;
1115
use Illuminate\Support\Facades\Storage;
1216
use Watson\Validating\ValidatingTrait;
13-
use \App\Presenters\AssetModelPresenter;
14-
use App\Http\Traits\TwoColumnUniqueUndeletedTrait;
1517

1618
/**
1719
* Model for Asset Models. Asset Models contain higher level

app/Models/Component.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use App\Helpers\Helper;
66
use App\Models\Traits\CompanyableTrait;
77
use App\Models\Traits\HasUploads;
8+
use App\Models\Traits\Loggable;
89
use App\Models\Traits\Searchable;
910
use App\Presenters\Presentable;
1011
use Illuminate\Database\Eloquent\Factories\HasFactory;

app/Models/Consumable.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use App\Models\Traits\Acceptable;
77
use App\Models\Traits\CompanyableTrait;
88
use App\Models\Traits\HasUploads;
9+
use App\Models\Traits\Loggable;
910
use App\Models\Traits\Searchable;
1011
use App\Presenters\ConsumablePresenter;
1112
use App\Presenters\Presentable;

app/Models/License.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use App\Helpers\Helper;
66
use App\Models\Traits\CompanyableTrait;
77
use App\Models\Traits\HasUploads;
8+
use App\Models\Traits\Loggable;
89
use App\Models\Traits\Searchable;
910
use App\Presenters\Presentable;
1011
use Carbon\Carbon;

app/Models/LicenseSeat.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use App\Models\Traits\Acceptable;
66
use App\Models\Traits\CompanyableChildTrait;
7+
use App\Models\Traits\Loggable;
78
use App\Notifications\CheckinLicenseNotification;
89
use App\Notifications\CheckoutLicenseNotification;
910
use App\Presenters\Presentable;

app/Models/Location.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use App\Http\Traits\UniqueUndeletedTrait;
66
use App\Models\Traits\CompanyableTrait;
77
use App\Models\Traits\HasUploads;
8+
use App\Models\Traits\Loggable;
89
use App\Models\Traits\Searchable;
910
use App\Presenters\Presentable;
1011
use Illuminate\Database\Eloquent\Factories\HasFactory;

app/Models/Maintenance.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use App\Helpers\Helper;
66
use App\Models\Traits\CompanyableChildTrait;
77
use App\Models\Traits\HasUploads;
8+
use App\Models\Traits\Loggable;
89
use App\Models\Traits\Searchable;
910
use App\Presenters\Presentable;
1011
use Illuminate\Database\Eloquent\Factories\HasFactory;

app/Models/Loggable.php renamed to app/Models/Traits/Loggable.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
<?php
22

3-
namespace App\Models;
3+
namespace App\Models\Traits;
44

5+
use App\Models\Actionlog;
6+
use App\Models\Asset;
7+
use App\Models\License;
8+
use App\Models\LicenseSeat;
9+
use App\Models\Location;
510
use App\Models\Setting;
11+
use App\Models\User;
612
use App\Notifications\AuditNotification;
713
use Illuminate\Support\Facades\Auth;
814
use Illuminate\Support\Facades\Log;

0 commit comments

Comments
 (0)