mirror of
https://git.meshkee.com/cssd/cssd-back.git
synced 2026-10-10 19:51:07 +03:30
fix some problems
This commit is contained in:
@@ -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' ) );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user