cssd-doc/cssd-back
1
0
Fork 0
mirror of https://git.meshkee.com/cssd/cssd-back.git synced 2026-10-11 13:11:07 +03:30
Code Issues Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
mahdi purHosseini
2024-09-02 12:31:14 +03:30
parent fd59106db8 4fbe7bc3bf
commit 325d7ed759
11 changed files with 112 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ItemController.php
+9
View File
@@ -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,13 @@ class ItemController extends Controller
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 )
->where( "package_id" , null )
->whereIn('creator_id', $userIds)
->orderByDesc( 'id' )
->isNotRepaired()
->get();
@@ -134,6 +140,9 @@ class ItemController extends Controller
} ,
'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' , 'address' , 'phone_number' );
},
'userTransfer' => function ($query) {
$query->select('id','name','cell_number');
}
] );
}
app/Http/Controllers/PackageController.php
+4
View File
@@ -98,10 +98,14 @@ class PackageController extends Controller
},
'user.medical_center' => function ($query) {
$query->select('id', 'name', 'address', 'phone_number');
},
'userTransfer' => function ($query) {
$query->select('id','name','cell_number');
}
]);
}
]);
return PackageResource::make($Package);
}
app/Http/Controllers/TransferItemController.php
+1
View File
@@ -63,6 +63,7 @@ class TransferItemController extends Controller
}
if ( $Item->user_id != $request->user_id ) {
$Item->transfers()->create( [
"user_transfer_id" => auth()->user()->id,
"user_id" => $request->user_id ,
"from_date" => Carbon::now() ,
"status" => StatusTypeEnum::APPROVED
app/Http/Controllers/TransferPackageController.php
+1
View File
@@ -70,6 +70,7 @@ class TransferPackageController extends Controller
//create transfer for the Package
$Package->transfers()->create( [
"user_transfer_id" => auth()->user()->id,
"user_id" => $request->user_id ,
"from_date" => Carbon::now() ,
"status" => StatusTypeEnum::APPROVED
app/Http/Controllers/UserController.php
+44 -26
View File
@@ -26,26 +26,30 @@ class UserController extends Controller
$medical_center_id = null;
}
$Users = User::when( $request->has( 'name' ) && $request->name , function ( $query ) use ( $request ) {
$query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
} )
->when( ( $request->has( 'fromPicker' ) && $request->fromPicker ) || ( $request->has( 'upToPicker' ) && $request->upToPicker ) , function ( $query ) use ( $request ) {
$from = ( $request->fromPicker ) ? date( $request->fromPicker . ' 00:00:00' ) : date( '2010-01-01' . ' 00:00:00' );
$upTo = ( $request->upToPicker ) ? date( $request->upToPicker . ' 23:59:59' ) : date( 'Y-m-d' . ' 23:59:59' );
return $query->whereBetween( 'created_at' , [ $from , $upTo ] );
} )
->when( $request->has( 'cell_number' ) && $request->cell_number , function ( $query ) use ( $request ) {
$query->where( 'cell_number' , 'LIKE' , '%' . $request->cell_number . '%' );
} )
->when( $request->has( 'role' ) && $request->role , function ( $query ) use ( $request ) {
$query->role( $request->role );
} )
->when( $medical_center_id , function ( $query ) use ( $medical_center_id ) {
$query->where( 'medical_center_id' , $medical_center_id );
} )
->with( [ 'medical_center' , 'roles' ] )->paginate( 10 );
$Users = User::when($request->has('name') && $request->name, function ($query) use ($request) {
$query->where('name', 'LIKE', '%' . $request->name . '%');
})
->when(($request->has('fromPicker') && $request->fromPicker) || ($request->has('upToPicker') && $request->upToPicker), function ($query) use ($request) {
$from = ($request->fromPicker) ? date($request->fromPicker . ' 00:00:00') : date('2010-01-01' . ' 00:00:00');
$upTo = ($request->upToPicker) ? date($request->upToPicker . ' 23:59:59') : date('Y-m-d' . ' 23:59:59');
return $query->whereBetween('created_at', [$from, $upTo]);
})
->when($request->has('cell_number') && $request->cell_number, function ($query) use ($request) {
$query->where('cell_number', 'LIKE', '%' . $request->cell_number . '%');
})
->when($request->has('role') && $request->role, function ($query) use ($request) {
$query->role($request->role);
})
->when($medical_center_id, function ($query) use ($medical_center_id) {
$query->where('medical_center_id', $medical_center_id);
})
->whereDoesntHave('roles', function ($roleQuery) {
$roleQuery->where('name', 'Admin');
})
->with(['medical_center', 'roles'])->paginate(10);
return MessageResponse::data($Users);
return MessageResponse::data( $Users );
}
public function store( StoreUserRequest $request )
@@ -162,16 +166,30 @@ class UserController extends Controller
public function getByMedicalCenter( MedicalCenter $MedicalCenter )
{
$user = auth( 'api' )->user();
if ( auth( 'api' )->user()->cant( 'getByMedicalCenter' , $MedicalCenter ) ) {
return MessageResponse::error( trans( 'messages.failed' ) );
}
$MedicalCenter = $MedicalCenter->load( [ 'users' => function ( $query ) use ( $user ) {
if ( $user->hasRole( 'User' ) ) {
return $query->select( [ 'id' , 'medical_center_id' , 'name' , 'cell_number' , 'status' ] )->where( 'id' , $user->id );
} else {
return $query->select( [ 'id' , 'medical_center_id' , 'name' , 'cell_number' , 'status' ] );
}
} , 'users.roles' ] );
if ($user->hasRole('Admin')){
$MedicalCenter = MedicalCenter::with(['users' => function ($query) {
$query->select('id', 'medical_center_id', 'name', 'cell_number', 'status')
->whereDoesntHave('roles', function ($roleQuery) {
$roleQuery->where('name', 'Admin');
});
}, 'users.roles'])->get();
}else{
$MedicalCenter = $MedicalCenter->load( [ 'users' => function ( $query ) use ( $user ) {
if ( $user->hasRole( 'User' ) ) {
return $query->select( [ 'id' , 'medical_center_id' , 'name' , 'cell_number' , 'status' ] )->where( 'id' , $user->id );
} else {
return $query->select( [ 'id' , 'medical_center_id' , 'name' , 'cell_number' , 'status' ] )
->whereDoesntHave('roles', function ($roleQuery) {
$roleQuery->where('name', 'Admin');
});
}
} , 'users.roles' ] );
}
return MessageResponse::data( $MedicalCenter );
}