mirror of
https://git.meshkee.com/cssd/cssd-back.git
synced 2026-10-13 07:41:05 +03:30
fix some problems
This commit is contained in:
@@ -113,6 +113,7 @@ class ItemController extends Controller
|
|||||||
$Items = Item::where( "status" , StatusTypeEnum::APPROVED )
|
$Items = Item::where( "status" , StatusTypeEnum::APPROVED )
|
||||||
->where( "package_id" , null )
|
->where( "package_id" , null )
|
||||||
->orderByDesc( 'id' )
|
->orderByDesc( 'id' )
|
||||||
|
->isNotRepaired()
|
||||||
->get();
|
->get();
|
||||||
return ItemResource::collection( $Items );
|
return ItemResource::collection( $Items );
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,13 +65,29 @@ class TransferPackageController extends Controller
|
|||||||
return MessageResponse::error( trans( 'messages.access_denied' ) );
|
return MessageResponse::error( trans( 'messages.access_denied' ) );
|
||||||
}
|
}
|
||||||
if ( $Package->user_id != $request->user_id ) {
|
if ( $Package->user_id != $request->user_id ) {
|
||||||
|
|
||||||
|
$previousUserPackage = $Package->user_id;
|
||||||
|
|
||||||
|
//create transfer for the Package
|
||||||
$Package->transfers()->create( [
|
$Package->transfers()->create( [
|
||||||
"user_id" => $request->user_id ,
|
"user_id" => $request->user_id ,
|
||||||
"from_date" => Carbon::now() ,
|
"from_date" => Carbon::now() ,
|
||||||
"status" => StatusTypeEnum::APPROVED
|
"status" => StatusTypeEnum::APPROVED
|
||||||
] );
|
] );
|
||||||
|
|
||||||
|
//finishing the last transfer of the Package
|
||||||
if ( $Package->transferActive ) $Package->transferActive()->update( [ "to_date" => Carbon::now() ] );
|
if ( $Package->transferActive ) $Package->transferActive()->update( [ "to_date" => Carbon::now() ] );
|
||||||
|
|
||||||
|
//update user of Package
|
||||||
$Package->update( [ "user_id" => $request->user_id ] );
|
$Package->update( [ "user_id" => $request->user_id ] );
|
||||||
|
|
||||||
|
//update user of items of Package
|
||||||
|
foreach ( $Package->items as $item ) {
|
||||||
|
if ($item->user_id == $previousUserPackage){
|
||||||
|
$item->update( [ "user_id" => $request->user_id ] );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
return MessageResponse::error( trans( 'messages.user_denied_transfer' ) );
|
return MessageResponse::error( trans( 'messages.user_denied_transfer' ) );
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ namespace App\Policies;
|
|||||||
|
|
||||||
use App\User;
|
use App\User;
|
||||||
use App\MedicalCenter;
|
use App\MedicalCenter;
|
||||||
use Doctrine\Tests\Common\Inflector\InflectorTest;
|
|
||||||
|
|
||||||
class MedicalCenterPolicy
|
class MedicalCenterPolicy
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user