From 46ba1c05f3e9386afaabdbc2dafae37ac2b8485f Mon Sep 17 00:00:00 2001 From: Nurmuhammet Allanov Date: Thu, 14 Dec 2023 20:03:45 +0500 Subject: [PATCH] WIP --- app/Models/System/Roles/Permission.php | 2 +- app/Models/User.php | 9 +++++++++ app/Nova/User.php | 7 +++++++ ...9_add_display_name_to_roles_and_permessions_table.php | 4 ++-- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/app/Models/System/Roles/Permission.php b/app/Models/System/Roles/Permission.php index 58988b4..bec3c30 100644 --- a/app/Models/System/Roles/Permission.php +++ b/app/Models/System/Roles/Permission.php @@ -8,7 +8,7 @@ use Spatie\Translatable\HasTranslations; class Permission extends SpatiePermission { use HasTranslations; - + /** * Translatable fields * diff --git a/app/Models/User.php b/app/Models/User.php index 5c7ded8..aed7c06 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -4,6 +4,7 @@ namespace App\Models; // use Illuminate\Contracts\Auth\MustVerifyEmail; use App\Models\Branch\Branch; +use App\Models\Order\Card\CardOrder; use App\Models\Order\Loan\LoanOrder; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Relations\BelongsToMany; @@ -73,6 +74,14 @@ class User extends Authenticatable return $this->hasMany(LoanOrder::class); } + /** + * Card orders user created + */ + public function cardOrders(): HasMany + { + return $this->hasMany(CardOrder::class); + } + /** * Check if user has role. */ diff --git a/app/Nova/User.php b/app/Nova/User.php index d86bbe5..50b4a4a 100644 --- a/app/Nova/User.php +++ b/app/Nova/User.php @@ -3,11 +3,14 @@ namespace App\Nova; use App\Nova\Resources\Branch\Branch; +use App\Nova\Resources\Order\Card\CardOrder; +use App\Nova\Resources\Order\Loan\LoanOrder; use App\Nova\Resources\System\Roles\Permission; use App\Nova\Resources\System\Roles\Role; use Illuminate\Http\Request; use Illuminate\Validation\Rules; use Laravel\Nova\Fields\BelongsToMany; +use Laravel\Nova\Fields\HasMany; use Laravel\Nova\Fields\ID; use Laravel\Nova\Fields\MorphToMany; use Laravel\Nova\Fields\Password; @@ -117,6 +120,10 @@ class User extends Resource BelongsToMany::make(__('Branches'), 'branches', Branch::class) ->canSeeWhen('isAdmin', $this), + + HasMany::make(__('Loan order'), 'loanOrders', LoanOrder::class), + + HasMany::make(__('Card order'), 'cardOrders', CardOrder::class), ]; } diff --git a/database/migrations/2023_12_14_194949_add_display_name_to_roles_and_permessions_table.php b/database/migrations/2023_12_14_194949_add_display_name_to_roles_and_permessions_table.php index 60e9223..f4a82e3 100644 --- a/database/migrations/2023_12_14_194949_add_display_name_to_roles_and_permessions_table.php +++ b/database/migrations/2023_12_14_194949_add_display_name_to_roles_and_permessions_table.php @@ -12,7 +12,7 @@ return new class extends Migration public function up(): void { $tableNames = config('permission.table_names'); - + Schema::table($tableNames['permissions'], function (Blueprint $table) { $table->jsonb('display_name')->nullable(); }); @@ -28,7 +28,7 @@ return new class extends Migration public function down(): void { $tableNames = config('permission.table_names'); - + Schema::table($tableNames['permissions'], function (Blueprint $table) { $table->dropColumn('display_name'); });