diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php index c59836a6..b669bd3a 100644 --- a/app/Http/Controllers/ItemController.php +++ b/app/Http/Controllers/ItemController.php @@ -117,7 +117,7 @@ class ItemController extends Controller $Items = Item::where( "status" , StatusTypeEnum::APPROVED ) ->where( "package_id" , null ) - ->where('creator_id', $userId) + ->where('user_id', $userId) ->orderByDesc( 'id' ) ->isNotRepaired() ->get(); diff --git a/app/Http/Controllers/PackageController.php b/app/Http/Controllers/PackageController.php index 679c8f9c..5fa4cfa9 100644 --- a/app/Http/Controllers/PackageController.php +++ b/app/Http/Controllers/PackageController.php @@ -77,6 +77,7 @@ class PackageController extends Controller public function getPackages() { $Packages = Package::where("status", StatusTypeEnum::APPROVED) + ->where("user_id", auth('api')->id()) ->orderByDesc('id') ->get(); return PackageResource::collection($Packages); diff --git a/app/Repositories/CycleRepository.php b/app/Repositories/CycleRepository.php index 01628c61..9ec61bb4 100644 --- a/app/Repositories/CycleRepository.php +++ b/app/Repositories/CycleRepository.php @@ -41,7 +41,6 @@ class CycleRepository implements CycleRepositoryInterface ->whereHas('user', function ($query) use ($user) { $query->where('medical_center_id', $user->medical_center_id); }) - ->where("user_id", $user->id) ->orderByDesc('id') ->paginate(10); } diff --git a/app/Repositories/LabelRepository.php b/app/Repositories/LabelRepository.php index cce2b680..22f58313 100644 --- a/app/Repositories/LabelRepository.php +++ b/app/Repositories/LabelRepository.php @@ -40,7 +40,6 @@ class LabelRepository implements LabelRepositoryInterface ->whereHas('user', function ($query) use ($user) { $query->where('medical_center_id', $user->medical_center_id); }) - ->where("user_id", $user->id) ->orderByDesc('id') ->paginate(10); } diff --git a/app/Repositories/PackageRepository.php b/app/Repositories/PackageRepository.php index ce074fac..a4255d94 100644 --- a/app/Repositories/PackageRepository.php +++ b/app/Repositories/PackageRepository.php @@ -30,7 +30,6 @@ class PackageRepository implements PackageRepositoryInterface ->whereHas('user', function ($query) use ($user) { $query->where('medical_center_id', $user->medical_center_id); }) - ->where("user_id", $user->id) ->orWhere("status", StatusTypeEnum::APPROVED) ->orderByDesc('id') ->paginate(10);