diff --git a/.gitignore b/.gitignore index a541690..2e2ead0 100644 --- a/.gitignore +++ b/.gitignore @@ -144,7 +144,8 @@ desktop.ini *.pid *.seed *.seed.php - +_ide_helper.php +_ide_helper_models.php # 모든 위치의 data 폴더 내부 파일 무시 **/data/* diff --git a/app/Http/Responses/CustomLoginResponse.php b/app/Http/Responses/CustomLoginResponse.php deleted file mode 100644 index 1ac3409..0000000 --- a/app/Http/Responses/CustomLoginResponse.php +++ /dev/null @@ -1,45 +0,0 @@ -user(); - - if (!$user) { - abort(500, '로그인 유저 정보를 가져올 수 없습니다.'); - } - - //TOKEN 설정 - $token = $user->remember_token; - if(!$token || substr($user->reg_date,0,10) < date('Y-m-d', strtotime('-15 day'))) { - $token = hash('sha256', $user->mb_id . now()->format('YmdHis')); - User::where('mb_num', $user->mb_num)->update(['remember_token' => $token]); - } - - // ✅ 세션에 유저 정보 저장 - session(['Adm' => [ - 'idx' => $user->mb_num, - 'id' => $user->mb_id, - 'name' => $user->mb_name, - 'level' => $user->mb_level, - 'tenant' => $user->tn_num, - 'type' => $user->mb_type, - 'token' => $token, - ]]); - - Session::put('user_token', $token); - Session::put('user_id', $user->mb_id); - - $redirectTo = session('redirect_to', route('dashboard')); - session()->forget('redirect_to'); - - return redirect()->to($redirectTo); - } -} diff --git a/app/Models/ApiKey.php b/app/Models/ApiKey.php index 934c15d..aecdc4c 100644 --- a/app/Models/ApiKey.php +++ b/app/Models/ApiKey.php @@ -4,6 +4,9 @@ use Illuminate\Database\Eloquent\Model; +/** + * @mixin IdeHelperApiKey + */ class ApiKey extends Model { protected $fillable = ['key', 'description', 'is_active']; diff --git a/app/Models/Boards/Board.php b/app/Models/Boards/Board.php index b72b437..d56c998 100644 --- a/app/Models/Boards/Board.php +++ b/app/Models/Boards/Board.php @@ -2,8 +2,12 @@ namespace App\Models\Boards; + use Illuminate\Database\Eloquent\Model; +/** + * @mixin IdeHelperBoard + */ class Board extends Model { protected $table = 'boards'; diff --git a/app/Models/Boards/BoardComment.php b/app/Models/Boards/BoardComment.php index 5f481c1..275d6f2 100644 --- a/app/Models/Boards/BoardComment.php +++ b/app/Models/Boards/BoardComment.php @@ -4,7 +4,11 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; +use App\Models\Members\User; +/** + * @mixin IdeHelperBoardComment + */ class BoardComment extends Model { use SoftDeletes; diff --git a/app/Models/Boards/BoardSetting.php b/app/Models/Boards/BoardSetting.php index 1a74130..0ff2976 100644 --- a/app/Models/Boards/BoardSetting.php +++ b/app/Models/Boards/BoardSetting.php @@ -4,6 +4,9 @@ use Illuminate\Database\Eloquent\Model; +/** + * @mixin IdeHelperBoardSetting + */ class BoardSetting extends Model { protected $table = 'board_settings'; diff --git a/app/Models/Boards/Post.php b/app/Models/Boards/Post.php index c21968e..3f8bfbf 100644 --- a/app/Models/Boards/Post.php +++ b/app/Models/Boards/Post.php @@ -4,7 +4,11 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; +use App\Models\Commons\File; +/** + * @mixin IdeHelperPost + */ class Post extends Model { use SoftDeletes; diff --git a/app/Models/Boards/PostCustomFieldValue.php b/app/Models/Boards/PostCustomFieldValue.php index 7cf92d9..e01c6bc 100644 --- a/app/Models/Boards/PostCustomFieldValue.php +++ b/app/Models/Boards/PostCustomFieldValue.php @@ -4,6 +4,9 @@ use Illuminate\Database\Eloquent\Model; +/** + * @mixin IdeHelperPostCustomFieldValue + */ class PostCustomFieldValue extends Model { protected $table = 'post_custom_field_values'; diff --git a/app/Models/Commons/Category.php b/app/Models/Commons/Category.php index b308ff3..8a95ef3 100644 --- a/app/Models/Commons/Category.php +++ b/app/Models/Commons/Category.php @@ -6,6 +6,9 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; +/** + * @mixin IdeHelperCategory + */ class Category extends Model { use SoftDeletes, BelongsToTenant; diff --git a/app/Models/Commons/Department.php b/app/Models/Commons/Department.php index 38fd81a..7dbe7db 100644 --- a/app/Models/Commons/Department.php +++ b/app/Models/Commons/Department.php @@ -2,11 +2,15 @@ namespace App\Models\Commons; +use App\Models\Members\User; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use App\Traits\BelongsToTenant; use App\Traits\ModelTrait; +/** + * @mixin IdeHelperDepartment + */ class Department extends Model { use SoftDeletes, BelongsToTenant, ModelTrait; @@ -33,7 +37,7 @@ public function departmentUsers() public function users() { // User 네임스페이스가 다르면 여기만 맞춰줘. - return $this->belongsToMany(\App\Models\User::class, 'department_user', 'department_id', 'user_id') + return $this->belongsToMany(User::class, 'department_user', 'department_id', 'user_id') ->withPivot(['tenant_id','is_primary','joined_at','left_at','created_at','updated_at','deleted_at']) ->withTimestamps(); } diff --git a/app/Models/Commons/DepartmentPermission.php b/app/Models/Commons/DepartmentPermission.php index 28607af..e409dcd 100644 --- a/app/Models/Commons/DepartmentPermission.php +++ b/app/Models/Commons/DepartmentPermission.php @@ -7,6 +7,9 @@ use App\Traits\BelongsToTenant; use App\Traits\ModelTrait; +/** + * @mixin IdeHelperDepartmentPermission + */ class DepartmentPermission extends Model { use SoftDeletes, BelongsToTenant, ModelTrait; diff --git a/app/Models/Commons/DepartmentUser.php b/app/Models/Commons/DepartmentUser.php index 96d4e1f..33657f8 100644 --- a/app/Models/Commons/DepartmentUser.php +++ b/app/Models/Commons/DepartmentUser.php @@ -6,7 +6,11 @@ use Illuminate\Database\Eloquent\SoftDeletes; use App\Traits\BelongsToTenant; use App\Traits\ModelTrait; +use App\Models\Members\User; +/** + * @mixin IdeHelperDepartmentUser + */ class DepartmentUser extends Model { use SoftDeletes, BelongsToTenant, ModelTrait; @@ -33,6 +37,6 @@ public function department() public function user() { // User 네임스페이스가 다르면 여기만 맞춰줘. - return $this->belongsTo(\App\Models\User::class, 'user_id'); + return $this->belongsTo(User::class, 'user_id'); } } diff --git a/app/Models/Commons/File.php b/app/Models/Commons/File.php index b1456d9..4115f03 100644 --- a/app/Models/Commons/File.php +++ b/app/Models/Commons/File.php @@ -4,7 +4,11 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; +use App\Models\Members\User; +/** + * @mixin IdeHelperFile + */ class File extends Model { use SoftDeletes; diff --git a/app/Models/Commons/Menu.php b/app/Models/Commons/Menu.php index 8dd3468..f6045e4 100644 --- a/app/Models/Commons/Menu.php +++ b/app/Models/Commons/Menu.php @@ -8,6 +8,9 @@ use App\Traits\ModelTrait; use App\Models\Scopes\TenantScope; +/** + * @mixin IdeHelperMenu + */ class Menu extends Model { use SoftDeletes, BelongsToTenant, ModelTrait; diff --git a/app/Models/Commons/Role.php b/app/Models/Commons/Role.php index e250709..3fd7022 100644 --- a/app/Models/Commons/Role.php +++ b/app/Models/Commons/Role.php @@ -6,6 +6,9 @@ use App\Models\Tenants\Tenant; use Illuminate\Database\Eloquent\Model; +/** + * @mixin IdeHelperRole + */ class Role extends Model { protected $fillable = [ diff --git a/app/Models/Commons/RoleMenuPermission.php b/app/Models/Commons/RoleMenuPermission.php index 7266b15..29d7fe4 100644 --- a/app/Models/Commons/RoleMenuPermission.php +++ b/app/Models/Commons/RoleMenuPermission.php @@ -4,6 +4,9 @@ use Illuminate\Database\Eloquent\Model; +/** + * @mixin IdeHelperRoleMenuPermission + */ class RoleMenuPermission extends Model { protected $fillable = [ diff --git a/app/Models/Commons/Tag.php b/app/Models/Commons/Tag.php index 9e47c95..8edd2b5 100644 --- a/app/Models/Commons/Tag.php +++ b/app/Models/Commons/Tag.php @@ -11,6 +11,9 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\MorphToMany; +/** + * @mixin IdeHelperTag + */ class Tag extends Model { protected $fillable = ['tenant_id', 'name']; diff --git a/app/Models/Estimates/MainRequestEstimate.php b/app/Models/Estimates/MainRequestEstimate.php index 41520f4..14c8626 100644 --- a/app/Models/Estimates/MainRequestEstimate.php +++ b/app/Models/Estimates/MainRequestEstimate.php @@ -5,6 +5,9 @@ use App\Enums\EstimateStatus; use Illuminate\Database\Eloquent\Model; +/** + * @mixin IdeHelperMainRequestEstimate + */ class MainRequestEstimate extends Model { protected $table = 'main_request_estimates'; diff --git a/app/Models/MainRequest.php b/app/Models/MainRequest.php index 726a55a..091a893 100644 --- a/app/Models/MainRequest.php +++ b/app/Models/MainRequest.php @@ -6,6 +6,9 @@ use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; +/** + * @mixin IdeHelperMainRequest + */ class MainRequest extends Model { use SoftDeletes; diff --git a/app/Models/MainRequestFlow.php b/app/Models/MainRequestFlow.php index c321d3c..000a2bb 100644 --- a/app/Models/MainRequestFlow.php +++ b/app/Models/MainRequestFlow.php @@ -3,9 +3,13 @@ namespace App\Models; use App\Models\MainRequest; +use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\MorphTo; +/** + * @mixin IdeHelperMainRequestFlow + */ class MainRequestFlow extends Model { /** diff --git a/app/Models/Materials/Material.php b/app/Models/Materials/Material.php index 7526d2f..a832e22 100644 --- a/app/Models/Materials/Material.php +++ b/app/Models/Materials/Material.php @@ -8,6 +8,9 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; +/** + * @mixin IdeHelperMaterial + */ class Material extends Model { use SoftDeletes; diff --git a/app/Models/Materials/MaterialInspection.php b/app/Models/Materials/MaterialInspection.php index 5e6af9a..b9d6b38 100644 --- a/app/Models/Materials/MaterialInspection.php +++ b/app/Models/Materials/MaterialInspection.php @@ -5,6 +5,9 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; +/** + * @mixin IdeHelperMaterialInspection + */ class MaterialInspection extends Model { use SoftDeletes; diff --git a/app/Models/Materials/MaterialInspectionItem.php b/app/Models/Materials/MaterialInspectionItem.php index 742030f..b70c4b2 100644 --- a/app/Models/Materials/MaterialInspectionItem.php +++ b/app/Models/Materials/MaterialInspectionItem.php @@ -5,6 +5,9 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; +/** + * @mixin IdeHelperMaterialInspectionItem + */ class MaterialInspectionItem extends Model { use SoftDeletes; diff --git a/app/Models/Materials/MaterialReceipt.php b/app/Models/Materials/MaterialReceipt.php index 8fee6c7..7e9c720 100644 --- a/app/Models/Materials/MaterialReceipt.php +++ b/app/Models/Materials/MaterialReceipt.php @@ -5,6 +5,9 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; +/** + * @mixin IdeHelperMaterialReceipt + */ class MaterialReceipt extends Model { use SoftDeletes; diff --git a/app/Models/Members/User.php b/app/Models/Members/User.php index 6a6474a..e821ed9 100644 --- a/app/Models/Members/User.php +++ b/app/Models/Members/User.php @@ -15,6 +15,9 @@ use Spatie\Permission\Models\Role as SpatieRole; use App\Models\Commons\Role as CommonRole; +/** + * @mixin IdeHelperUser + */ class User extends Authenticatable { use HasApiTokens, Notifiable, SoftDeletes, ModelTrait, HasRoles; @@ -60,12 +63,6 @@ public function userRoles() return $this->hasMany(UserRole::class); } - public function orgRoles() - { - return $this->belongsToMany(CommonRole::class, 'user_roles') - ->withPivot(['tenant_id', 'assigned_at']); - } - public function userTenantById($tenantId) { return $this->hasOne(UserTenant::class)->where('tenant_id', $tenantId); diff --git a/app/Models/Members/UserMenuPermission.php b/app/Models/Members/UserMenuPermission.php index 078db39..3991756 100644 --- a/app/Models/Members/UserMenuPermission.php +++ b/app/Models/Members/UserMenuPermission.php @@ -5,6 +5,9 @@ use App\Models\Commons\Menu; use Illuminate\Database\Eloquent\Model; +/** + * @mixin IdeHelperUserMenuPermission + */ class UserMenuPermission extends Model { protected $fillable = [ diff --git a/app/Models/Members/UserRole.php b/app/Models/Members/UserRole.php index e683dc1..2977412 100644 --- a/app/Models/Members/UserRole.php +++ b/app/Models/Members/UserRole.php @@ -8,6 +8,9 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; +/** + * @mixin IdeHelperUserRole + */ class UserRole extends Model { use SoftDeletes, BelongsToTenant; diff --git a/app/Models/Members/UserTenant.php b/app/Models/Members/UserTenant.php index 9858724..cdd138a 100644 --- a/app/Models/Members/UserTenant.php +++ b/app/Models/Members/UserTenant.php @@ -8,6 +8,9 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; +/** + * @mixin IdeHelperUserTenant + */ class UserTenant extends Model { use SoftDeletes, ModelTrait, BelongsToTenant; diff --git a/app/Models/Orders/Order.php b/app/Models/Orders/Order.php index b819eb0..14cade0 100644 --- a/app/Models/Orders/Order.php +++ b/app/Models/Orders/Order.php @@ -5,6 +5,9 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; +/** + * @mixin IdeHelperOrder + */ class Order extends Model { use SoftDeletes; diff --git a/app/Models/Orders/OrderHistory.php b/app/Models/Orders/OrderHistory.php index 016f3c8..209fc50 100644 --- a/app/Models/Orders/OrderHistory.php +++ b/app/Models/Orders/OrderHistory.php @@ -4,6 +4,9 @@ use Illuminate\Database\Eloquent\Model; +/** + * @mixin IdeHelperOrderHistory + */ class OrderHistory extends Model { // 이력/메모 diff --git a/app/Models/Orders/OrderItem.php b/app/Models/Orders/OrderItem.php index f8dc674..d370f9b 100644 --- a/app/Models/Orders/OrderItem.php +++ b/app/Models/Orders/OrderItem.php @@ -5,6 +5,9 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; +/** + * @mixin IdeHelperOrderItem + */ class OrderItem extends Model { use SoftDeletes; diff --git a/app/Models/Orders/OrderItemComponent.php b/app/Models/Orders/OrderItemComponent.php index aed60d2..0a19807 100644 --- a/app/Models/Orders/OrderItemComponent.php +++ b/app/Models/Orders/OrderItemComponent.php @@ -5,6 +5,9 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; +/** + * @mixin IdeHelperOrderItemComponent + */ class OrderItemComponent extends Model { use SoftDeletes; diff --git a/app/Models/Orders/OrderVersion.php b/app/Models/Orders/OrderVersion.php index 128c98c..b832ec7 100644 --- a/app/Models/Orders/OrderVersion.php +++ b/app/Models/Orders/OrderVersion.php @@ -4,6 +4,9 @@ use Illuminate\Database\Eloquent\Model; +/** + * @mixin IdeHelperOrderVersion + */ class OrderVersion extends Model { // 주문 버전관리(변경사항만 저장) diff --git a/app/Models/Products/Bom.php b/app/Models/Products/Bom.php index de61b4b..75745f4 100644 --- a/app/Models/Products/Bom.php +++ b/app/Models/Products/Bom.php @@ -7,6 +7,9 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; +/** + * @mixin IdeHelperBom + */ class Bom extends Model { use SoftDeletes; diff --git a/app/Models/Products/BomItem.php b/app/Models/Products/BomItem.php index 3ef05fa..2da83ef 100644 --- a/app/Models/Products/BomItem.php +++ b/app/Models/Products/BomItem.php @@ -5,6 +5,9 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; +/** + * @mixin IdeHelperBomItem + */ class BomItem extends Model { use SoftDeletes; diff --git a/app/Models/Products/CommonCode.php b/app/Models/Products/CommonCode.php index 1c3bc62..35e9c86 100644 --- a/app/Models/Products/CommonCode.php +++ b/app/Models/Products/CommonCode.php @@ -5,6 +5,9 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use App\Traits\BelongsToTenant; +/** + * @mixin IdeHelperCommonCode + */ class CommonCode extends Model { use SoftDeletes, BelongsToTenant; diff --git a/app/Models/Products/Part.php b/app/Models/Products/Part.php index 447c72b..c568c91 100644 --- a/app/Models/Products/Part.php +++ b/app/Models/Products/Part.php @@ -6,6 +6,9 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; +/** + * @mixin IdeHelperPart + */ class Part extends Model { use SoftDeletes; diff --git a/app/Models/Products/PriceHistory.php b/app/Models/Products/PriceHistory.php index 8eb2c3d..87e19d5 100644 --- a/app/Models/Products/PriceHistory.php +++ b/app/Models/Products/PriceHistory.php @@ -5,6 +5,9 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; +/** + * @mixin IdeHelperPriceHistory + */ class PriceHistory extends Model { use SoftDeletes; diff --git a/app/Models/Products/Product.php b/app/Models/Products/Product.php index d0b9f1e..ddd138a 100644 --- a/app/Models/Products/Product.php +++ b/app/Models/Products/Product.php @@ -7,6 +7,9 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; +/** + * @mixin IdeHelperProduct + */ class Product extends Model { use SoftDeletes; diff --git a/app/Models/Qualitys/Lot.php b/app/Models/Qualitys/Lot.php index 83dc527..773d189 100644 --- a/app/Models/Qualitys/Lot.php +++ b/app/Models/Qualitys/Lot.php @@ -6,6 +6,9 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; +/** + * @mixin IdeHelperLot + */ class Lot extends Model { use SoftDeletes; diff --git a/app/Models/Qualitys/LotSale.php b/app/Models/Qualitys/LotSale.php index 2660e26..4bd0e19 100644 --- a/app/Models/Qualitys/LotSale.php +++ b/app/Models/Qualitys/LotSale.php @@ -6,6 +6,9 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; +/** + * @mixin IdeHelperLotSale + */ class LotSale extends Model { use SoftDeletes; diff --git a/app/Models/SiteAdmin.php b/app/Models/SiteAdmin.php index 05ff5f9..7828d70 100644 --- a/app/Models/SiteAdmin.php +++ b/app/Models/SiteAdmin.php @@ -5,6 +5,9 @@ use App\Traits\UppercaseAttributes; use Illuminate\Database\Eloquent\Model; +/** + * @mixin IdeHelperSiteAdmin + */ class SiteAdmin extends Model { use UppercaseAttributes; // 테이블 컬럼명 대문자 처리 diff --git a/app/Models/Tenants/Payment.php b/app/Models/Tenants/Payment.php index 2ee4879..ef79880 100644 --- a/app/Models/Tenants/Payment.php +++ b/app/Models/Tenants/Payment.php @@ -5,6 +5,9 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; +/** + * @mixin IdeHelperPayment + */ class Payment extends Model { use SoftDeletes; diff --git a/app/Models/Tenants/Plan.php b/app/Models/Tenants/Plan.php index 5ac11bc..19e8008 100644 --- a/app/Models/Tenants/Plan.php +++ b/app/Models/Tenants/Plan.php @@ -5,6 +5,9 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; +/** + * @mixin IdeHelperPlan + */ class Plan extends Model { use SoftDeletes; diff --git a/app/Models/Tenants/SettingFieldDef.php b/app/Models/Tenants/SettingFieldDef.php index f4c400d..d89c93a 100644 --- a/app/Models/Tenants/SettingFieldDef.php +++ b/app/Models/Tenants/SettingFieldDef.php @@ -4,6 +4,9 @@ use Illuminate\Database\Eloquent\Model; +/** + * @mixin IdeHelperSettingFieldDef + */ class SettingFieldDef extends Model { protected $casts = [ diff --git a/app/Models/Tenants/Subscription.php b/app/Models/Tenants/Subscription.php index 14d22a9..4e7796b 100644 --- a/app/Models/Tenants/Subscription.php +++ b/app/Models/Tenants/Subscription.php @@ -5,6 +5,9 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; +/** + * @mixin IdeHelperSubscription + */ class Subscription extends Model { use SoftDeletes; diff --git a/app/Models/Tenants/Tenant.php b/app/Models/Tenants/Tenant.php index ab4c5b4..dd8d959 100644 --- a/app/Models/Tenants/Tenant.php +++ b/app/Models/Tenants/Tenant.php @@ -3,7 +3,7 @@ namespace App\Models\Tenants; use App\Models\Commons\Role; -use App\Models\File; +use App\Models\Commons\File; use App\Models\Members\User; use App\Models\Members\UserRole; use App\Models\Members\UserTenant; @@ -11,6 +11,9 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; +/** + * @mixin IdeHelperTenant + */ class Tenant extends Model { use SoftDeletes, ModelTrait; diff --git a/app/Models/Tenants/TenantFieldSetting.php b/app/Models/Tenants/TenantFieldSetting.php index be4b981..893d7dc 100644 --- a/app/Models/Tenants/TenantFieldSetting.php +++ b/app/Models/Tenants/TenantFieldSetting.php @@ -4,6 +4,9 @@ use Illuminate\Database\Eloquent\Model; +/** + * @mixin IdeHelperTenantFieldSetting + */ class TenantFieldSetting extends Model { public $timestamps = false; diff --git a/app/Models/Tenants/TenantOptionGroup.php b/app/Models/Tenants/TenantOptionGroup.php index 9791bea..c065a4e 100644 --- a/app/Models/Tenants/TenantOptionGroup.php +++ b/app/Models/Tenants/TenantOptionGroup.php @@ -4,6 +4,9 @@ use Illuminate\Database\Eloquent\Model; +/** + * @mixin IdeHelperTenantOptionGroup + */ class TenantOptionGroup extends Model { public $timestamps = false; diff --git a/app/Models/Tenants/TenantOptionValue.php b/app/Models/Tenants/TenantOptionValue.php index f24bba3..f7520f1 100644 --- a/app/Models/Tenants/TenantOptionValue.php +++ b/app/Models/Tenants/TenantOptionValue.php @@ -4,6 +4,9 @@ use Illuminate\Database\Eloquent\Model; +/** + * @mixin IdeHelperTenantOptionValue + */ class TenantOptionValue extends Model { public $timestamps = false; diff --git a/app/Models/Tenants/TenantUserProfile.php b/app/Models/Tenants/TenantUserProfile.php index c41c7cf..dd727a2 100644 --- a/app/Models/Tenants/TenantUserProfile.php +++ b/app/Models/Tenants/TenantUserProfile.php @@ -6,6 +6,9 @@ use App\Models\Commons\Department; use Illuminate\Database\Eloquent\Model; +/** + * @mixin IdeHelperTenantUserProfile + */ class TenantUserProfile extends Model { protected $casts = [ diff --git a/composer.json b/composer.json index 022b042..8d382e1 100644 --- a/composer.json +++ b/composer.json @@ -16,6 +16,7 @@ "spatie/laravel-permission": "^6.21" }, "require-dev": { + "barryvdh/laravel-ide-helper": "^3.6", "fakerphp/faker": "^1.23", "kitloong/laravel-migrations-generator": "^7.1", "laravel-lang/lang": "^15.22", diff --git a/composer.lock b/composer.lock index fecf57f..2091660 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6903d799627f2dbf894a5ddffaa946c2", + "content-hash": "649cb6cda3061281868e31ae3140bd69", "packages": [ { "name": "brick/math", @@ -6634,6 +6634,300 @@ }, "time": "2025-06-06T23:15:09+00:00" }, + { + "name": "barryvdh/laravel-ide-helper", + "version": "v3.6.0", + "source": { + "type": "git", + "url": "https://github.com/barryvdh/laravel-ide-helper.git", + "reference": "8d00250cba25728373e92c1d8dcebcbf64623d29" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/8d00250cba25728373e92c1d8dcebcbf64623d29", + "reference": "8d00250cba25728373e92c1d8dcebcbf64623d29", + "shasum": "" + }, + "require": { + "barryvdh/reflection-docblock": "^2.4", + "composer/class-map-generator": "^1.0", + "ext-json": "*", + "illuminate/console": "^11.15 || ^12", + "illuminate/database": "^11.15 || ^12", + "illuminate/filesystem": "^11.15 || ^12", + "illuminate/support": "^11.15 || ^12", + "php": "^8.2" + }, + "require-dev": { + "ext-pdo_sqlite": "*", + "friendsofphp/php-cs-fixer": "^3", + "illuminate/config": "^11.15 || ^12", + "illuminate/view": "^11.15 || ^12", + "mockery/mockery": "^1.4", + "orchestra/testbench": "^9.2 || ^10", + "phpunit/phpunit": "^10.5 || ^11.5.3", + "spatie/phpunit-snapshot-assertions": "^4 || ^5", + "vimeo/psalm": "^5.4", + "vlucas/phpdotenv": "^5" + }, + "suggest": { + "illuminate/events": "Required for automatic helper generation (^6|^7|^8|^9|^10|^11)." + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider" + ] + }, + "branch-alias": { + "dev-master": "3.5-dev" + } + }, + "autoload": { + "psr-4": { + "Barryvdh\\LaravelIdeHelper\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Barry vd. Heuvel", + "email": "barryvdh@gmail.com" + } + ], + "description": "Laravel IDE Helper, generates correct PHPDocs for all Facade classes, to improve auto-completion.", + "keywords": [ + "autocomplete", + "codeintel", + "dev", + "helper", + "ide", + "laravel", + "netbeans", + "phpdoc", + "phpstorm", + "sublime" + ], + "support": { + "issues": "https://github.com/barryvdh/laravel-ide-helper/issues", + "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v3.6.0" + }, + "funding": [ + { + "url": "https://fruitcake.nl", + "type": "custom" + }, + { + "url": "https://github.com/barryvdh", + "type": "github" + } + ], + "time": "2025-07-17T20:11:57+00:00" + }, + { + "name": "barryvdh/reflection-docblock", + "version": "v2.4.0", + "source": { + "type": "git", + "url": "https://github.com/barryvdh/ReflectionDocBlock.git", + "reference": "d103774cbe7e94ddee7e4870f97f727b43fe7201" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/d103774cbe7e94ddee7e4870f97f727b43fe7201", + "reference": "d103774cbe7e94ddee7e4870f97f727b43fe7201", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "require-dev": { + "phpunit/phpunit": "^8.5.14|^9" + }, + "suggest": { + "dflydev/markdown": "~1.0", + "erusev/parsedown": "~1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, + "autoload": { + "psr-0": { + "Barryvdh": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "mike.vanriel@naenius.com" + } + ], + "support": { + "source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.4.0" + }, + "time": "2025-07-17T06:07:30+00:00" + }, + { + "name": "composer/class-map-generator", + "version": "1.6.2", + "source": { + "type": "git", + "url": "https://github.com/composer/class-map-generator.git", + "reference": "ba9f089655d4cdd64e762a6044f411ccdaec0076" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/class-map-generator/zipball/ba9f089655d4cdd64e762a6044f411ccdaec0076", + "reference": "ba9f089655d4cdd64e762a6044f411ccdaec0076", + "shasum": "" + }, + "require": { + "composer/pcre": "^2.1 || ^3.1", + "php": "^7.2 || ^8.0", + "symfony/finder": "^4.4 || ^5.3 || ^6 || ^7" + }, + "require-dev": { + "phpstan/phpstan": "^1.12 || ^2", + "phpstan/phpstan-deprecation-rules": "^1 || ^2", + "phpstan/phpstan-phpunit": "^1 || ^2", + "phpstan/phpstan-strict-rules": "^1.1 || ^2", + "phpunit/phpunit": "^8", + "symfony/filesystem": "^5.4 || ^6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\ClassMapGenerator\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "https://seld.be" + } + ], + "description": "Utilities to scan PHP code and generate class maps.", + "keywords": [ + "classmap" + ], + "support": { + "issues": "https://github.com/composer/class-map-generator/issues", + "source": "https://github.com/composer/class-map-generator/tree/1.6.2" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + } + ], + "time": "2025-08-20T18:52:43+00:00" + }, + { + "name": "composer/pcre", + "version": "3.3.2", + "source": { + "type": "git", + "url": "https://github.com/composer/pcre.git", + "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/pcre/zipball/b2bed4734f0cc156ee1fe9c0da2550420d99a21e", + "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e", + "shasum": "" + }, + "require": { + "php": "^7.4 || ^8.0" + }, + "conflict": { + "phpstan/phpstan": "<1.11.10" + }, + "require-dev": { + "phpstan/phpstan": "^1.12 || ^2", + "phpstan/phpstan-strict-rules": "^1 || ^2", + "phpunit/phpunit": "^8 || ^9" + }, + "type": "library", + "extra": { + "phpstan": { + "includes": [ + "extension.neon" + ] + }, + "branch-alias": { + "dev-main": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Pcre\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "PCRE wrapping library that offers type-safe preg_* replacements.", + "keywords": [ + "PCRE", + "preg", + "regex", + "regular expression" + ], + "support": { + "issues": "https://github.com/composer/pcre/issues", + "source": "https://github.com/composer/pcre/tree/3.3.2" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2024-11-12T16:29:46+00:00" + }, { "name": "composer/semver", "version": "3.4.3",