From 3d273055e8cfa4bd0fa11820a2577c793fe8aaa2 Mon Sep 17 00:00:00 2001
From: Nurmuhammet Allanov <nurmuhammet@mail.com>
Date: Thu, 14 Dec 2023 19:34:52 +0500
Subject: [PATCH] ok

---
 app/Models/User.php                           |  3 +--
 app/Nova/Resources/Order/Card/CardOrder.php   |  2 +-
 .../Card/Concerns/CardOrderFieldsForIndex.php | 18 ++++++++--------
 .../Resources/System/Roles/Permission.php     | 21 +++++++++++++++++--
 app/Nova/User.php                             |  4 ++++
 app/Repos/System/Nova/NovaRepo.php            |  1 -
 lang/tk.json                                  |  4 +++-
 7 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/app/Models/User.php b/app/Models/User.php
index f04e072..5c7ded8 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -10,7 +10,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
-use Laravel\Nova\Actions\Actionable;
 use Laravel\Sanctum\HasApiTokens;
 use Spatie\Permission\Traits\HasRoles;
 
@@ -151,6 +150,6 @@ class User extends Authenticatable
      */
     public function profilePage(): string
     {
-        return '/resources/users/'. $this->id;
+        return '/resources/users/'.$this->id;
     }
 }
diff --git a/app/Nova/Resources/Order/Card/CardOrder.php b/app/Nova/Resources/Order/Card/CardOrder.php
index b78ceba..089ae28 100644
--- a/app/Nova/Resources/Order/Card/CardOrder.php
+++ b/app/Nova/Resources/Order/Card/CardOrder.php
@@ -158,7 +158,7 @@ class CardOrder extends Resource
                 ->rules('required')
                 ->canSeeWhen('systemUser', $this),
 
-            Text::make(__('Note'), 'status')
+            Text::make(__('Note'), 'notes')
                 ->fullWidth()
                 ->canSeeWhen('systemUser', $this),
 
diff --git a/app/Nova/Resources/Order/Card/Concerns/CardOrderFieldsForIndex.php b/app/Nova/Resources/Order/Card/Concerns/CardOrderFieldsForIndex.php
index 2e6b8c9..06a5f06 100644
--- a/app/Nova/Resources/Order/Card/Concerns/CardOrderFieldsForIndex.php
+++ b/app/Nova/Resources/Order/Card/Concerns/CardOrderFieldsForIndex.php
@@ -48,15 +48,15 @@ class CardOrderFieldsForIndex
 
             Text::make(__('Phone'), 'phone'),
 
-            Badge::make(__('Status'), 'status')
-                ->map(OrderRepo::statusClasses())
-                ->addTypes([
-                    'primary' => 'dark:bg-gray-900 bg-gray-600 text-white',
-                ])
-                ->labels(OrderRepo::statusValues())
-                ->withIcons()
-                ->icons(OrderRepo::statusIcons())
-                ->sortable(),
+            // Badge::make(__('Status'), 'status')
+            //     ->map(OrderRepo::statusClasses())
+            //     ->addTypes([
+            //         'primary' => 'dark:bg-gray-900 bg-gray-600 text-white',
+            //     ])
+            //     ->labels(OrderRepo::statusValues())
+            //     ->withIcons()
+            //     ->icons(OrderRepo::statusIcons())
+            //     ->sortable(),
         ];
     }
 }
diff --git a/app/Nova/Resources/System/Roles/Permission.php b/app/Nova/Resources/System/Roles/Permission.php
index b265b10..8f7f9af 100644
--- a/app/Nova/Resources/System/Roles/Permission.php
+++ b/app/Nova/Resources/System/Roles/Permission.php
@@ -2,6 +2,7 @@
 
 namespace App\Nova\Resources\System\Roles;
 
+use App\Models\System\Roles\Permission as PermissionModel;
 use App\Nova\Resource;
 use Laravel\Nova\Fields\ID;
 use Laravel\Nova\Fields\Text;
@@ -12,9 +13,9 @@ class Permission extends Resource
     /**
      * The model the resource corresponds to.
      *
-     * @var class-string<\App\Models\System\Roles\Permission>
+     * @var class-string<PermissionModel>
      */
-    public static $model = \App\Models\System\Roles\Permission::class;
+    public static $model = PermissionModel::class;
 
     /**
      * The single value that should be used to represent the resource when being displayed.
@@ -32,6 +33,22 @@ class Permission extends Resource
         'id', 'name',
     ];
 
+    /**
+     * Get the displayable label of the resource.
+     */
+    public static function label(): string
+    {
+        return __('Permissions');
+    }
+
+    /**
+     * Get the displayable singular label of the resource.
+     */
+    public static function singularLabel(): string
+    {
+        return __('Permission');
+    }
+
     /**
      * Get the fields displayed by the resource.
      */
diff --git a/app/Nova/User.php b/app/Nova/User.php
index 4a52eed..d86bbe5 100644
--- a/app/Nova/User.php
+++ b/app/Nova/User.php
@@ -3,6 +3,7 @@
 namespace App\Nova;
 
 use App\Nova\Resources\Branch\Branch;
+use App\Nova\Resources\System\Roles\Permission;
 use App\Nova\Resources\System\Roles\Role;
 use Illuminate\Http\Request;
 use Illuminate\Validation\Rules;
@@ -111,6 +112,9 @@ class User extends Resource
             MorphToMany::make(__('Roles'), 'roles', Role::class)
                 ->canSeeWhen('isAdmin', $this),
 
+            MorphToMany::make(__('Permissions'), 'permissions', Permission::class)
+                ->canSeeWhen('isAdmin', $this),
+
             BelongsToMany::make(__('Branches'), 'branches', Branch::class)
                 ->canSeeWhen('isAdmin', $this),
         ];
diff --git a/app/Repos/System/Nova/NovaRepo.php b/app/Repos/System/Nova/NovaRepo.php
index bec1452..b3532a1 100644
--- a/app/Repos/System/Nova/NovaRepo.php
+++ b/app/Repos/System/Nova/NovaRepo.php
@@ -12,7 +12,6 @@ class NovaRepo
 {
     /**
      * Initial path
-     * @var string
      */
     protected static string $initialPath = '/dashboards/main';
 
diff --git a/lang/tk.json b/lang/tk.json
index 25e4b80..4e0a4a6 100644
--- a/lang/tk.json
+++ b/lang/tk.json
@@ -247,5 +247,7 @@
     "Loan department": "Karz bölümi",
     "Card department": "Kart bölümi",
     "Price": "Baha",
-    "Citizenship": "Raýatlyk"
+    "Citizenship": "Raýatlyk",
+    "Permission": "Rugsat",
+    "Permissions": "Rugsatlar"
 }