Merge pull request 'feauter/fix-getItem' (#14) from feauter/fix-getItem into master

Reviewed-on: https://git.willaspace.com/external-projects/cssd-back/pulls/14
This commit is contained in:
mahdi.pourhoseini
2024-06-10 18:00:23 +00:00
2 changed files with 9 additions and 3 deletions
+6
View File
@@ -8,6 +8,7 @@ use App\Http\Requests\StoreItemRequest;
use App\Http\Resources\ItemResource; use App\Http\Resources\ItemResource;
use App\Item; use App\Item;
use App\Services\Media\MediaHelper; use App\Services\Media\MediaHelper;
use App\User;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Packages\Messaging\src\Facades\MessageResponse; use Packages\Messaging\src\Facades\MessageResponse;
@@ -110,8 +111,13 @@ class ItemController extends Controller
public function getItems() public function getItems()
{ {
$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 ) $Items = Item::where( "status" , StatusTypeEnum::APPROVED )
->where( "package_id" , null ) ->where( "package_id" , null )
->whereIn('creator_id', $userIds)
->orderByDesc( 'id' ) ->orderByDesc( 'id' )
->isNotRepaired() ->isNotRepaired()
->get(); ->get();
@@ -1,8 +1,8 @@
<?php <?php
use back\vendor\laravel\framework\src\Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
use back\vendor\laravel\framework\src\Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Blueprint;
use back\vendor\laravel\framework\src\Illuminate\Database\Migrations\Migration; use Illuminate\Database\Migrations\Migration;
class AddUserTransferIdToTransfersTable extends Migration class AddUserTransferIdToTransfersTable extends Migration
{ {