From c5473f5d9b7e5d754811e71946261cdf2cd2b598 Mon Sep 17 00:00:00 2001 From: mahdi1113 Date: Fri, 7 Jun 2024 04:27:55 +0330 Subject: [PATCH 1/2] fix getItem --- app/Http/Controllers/ItemController.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php index 743aa956..1cef2fe8 100644 --- a/app/Http/Controllers/ItemController.php +++ b/app/Http/Controllers/ItemController.php @@ -8,6 +8,7 @@ use App\Http\Requests\StoreItemRequest; use App\Http\Resources\ItemResource; use App\Item; use App\Services\Media\MediaHelper; +use App\User; use Illuminate\Http\Request; use Packages\Messaging\src\Facades\MessageResponse; @@ -110,8 +111,11 @@ class ItemController extends Controller public function getItems() { + $userIds = User::where('medical_center_id', auth()->user()->medical_center->id)->pluck('id')->toArray(); + $Items = Item::where( "status" , StatusTypeEnum::APPROVED ) ->where( "package_id" , null ) + ->whereIn('creator_id', $userIds) ->orderByDesc( 'id' ) ->isNotRepaired() ->get(); From a3b6493003d3b6d8a867a84e948611551bfb2a5e Mon Sep 17 00:00:00 2001 From: mahdi1113 Date: Mon, 10 Jun 2024 15:51:08 +0330 Subject: [PATCH 2/2] fix migration --- app/Http/Controllers/ItemController.php | 4 +++- ...05_05_105944_add_user_transfer_id_to_transfers_table.php | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php index 1cef2fe8..d1de06af 100644 --- a/app/Http/Controllers/ItemController.php +++ b/app/Http/Controllers/ItemController.php @@ -111,7 +111,9 @@ class ItemController extends Controller public function getItems() { - $userIds = User::where('medical_center_id', auth()->user()->medical_center->id)->pluck('id')->toArray(); + $user = auth()->user(); + $medicalCenterId = optional(optional($user)->medical_center)->id; + $userIds = User::where('medical_center_id', $medicalCenterId)->pluck('id')->toArray(); $Items = Item::where( "status" , StatusTypeEnum::APPROVED ) ->where( "package_id" , null ) diff --git a/database/migrations/2024_05_05_105944_add_user_transfer_id_to_transfers_table.php b/database/migrations/2024_05_05_105944_add_user_transfer_id_to_transfers_table.php index 394af088..6f6cd4c2 100644 --- a/database/migrations/2024_05_05_105944_add_user_transfer_id_to_transfers_table.php +++ b/database/migrations/2024_05_05_105944_add_user_transfer_id_to_transfers_table.php @@ -1,8 +1,8 @@