fix some problems

This commit is contained in:
mahdi purHosseini
2024-02-28 16:42:23 +03:30
parent b7d2c0b920
commit 618841cb74
4 changed files with 24 additions and 17 deletions
@@ -15,22 +15,25 @@ class TransferItemController extends Controller
{
public function getSuspendedTransfer()
{
$data = Transfer::where( "transferable_type" , "App\\Item" )
$data = Transfer::query()
->whereHasMorph( 'transferable' , [ Item::class ] )
->where( "status" , StatusTypeEnum::SUSPENDED )
->with( [ "user" , "transferable" , "transferable.user" ] );
->with( [ "user" , "transferable" , "transferable.user" ] );
$user = auth( 'api' )->user();
if ( $user->hasRole( 'User' ) ) {
$data = $data->where( "user_id" , $user->id );
} elseif ( $user->hasRole( 'Supervisor' ) ) {
$data = $data->whereHas( 'transferable.user' , function ( $query ) use ( $user ) {
$query->where( 'medical_center_id' , $user->medical_center_id );
$data = $data->whereHasMorph( 'transferable' , [ Item::class ] , function ( $query ) use ( $user ) {
$query->whereHas( 'user' , function ( $query1 ) use ( $user ) {
$query1->where( 'medical_center_id' , $user->medical_center_id );
} );
} );
}
$data = $data->get();
return TransferResource::collection($data);
return TransferResource::collection( $data );
}
public function changeStatus( ChangeStatusRequest $request , Transfer $Transfer )
@@ -62,8 +65,10 @@ class TransferItemController extends Controller
$Item->transfers()->create( [
"user_id" => $request->user_id ,
"from_date" => Carbon::now() ,
"status" => StatusTypeEnum::SUSPENDED
"status" => StatusTypeEnum::APPROVED
] );
if ( $Item->transferActive ) $Item->transferActive()->update( [ "to_date" => Carbon::now() ] );
$Item->update( [ "user_id" => $request->user_id ] );
} else {
return MessageResponse::error( trans( 'messages.user_denied_transfer' ) );
}