mirror of
https://git.meshkee.com/cssd/cssd-back.git
synced 2026-10-10 19:31:07 +03:30
change StatusTypeEnum::SUSPENDING to StatusTypeEnum::PENDING
This commit is contained in:
@@ -6,5 +6,5 @@ class StatusTypeEnum
|
|||||||
{
|
{
|
||||||
const APPROVED = "approved";
|
const APPROVED = "approved";
|
||||||
const REJECTED = "rejected";
|
const REJECTED = "rejected";
|
||||||
const SUSPENDED = "suspended";
|
const PENDING = "pending";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -161,7 +161,7 @@ class ItemController extends Controller
|
|||||||
'specific' => $request->specific ,
|
'specific' => $request->specific ,
|
||||||
'note' => $request->note ,
|
'note' => $request->note ,
|
||||||
'udi' => $request->udi ,
|
'udi' => $request->udi ,
|
||||||
'status' => StatusTypeEnum::SUSPENDED ,
|
'status' => StatusTypeEnum::PENDING ,
|
||||||
'user_id' => auth( 'api' )->user()->id ,
|
'user_id' => auth( 'api' )->user()->id ,
|
||||||
'creator_id' => auth( 'api' )->user()->id
|
'creator_id' => auth( 'api' )->user()->id
|
||||||
] );
|
] );
|
||||||
|
|||||||
@@ -115,7 +115,7 @@ class PackageController extends Controller
|
|||||||
$PackageData = [
|
$PackageData = [
|
||||||
'name' => $request->name,
|
'name' => $request->name,
|
||||||
'note' => $request->note,
|
'note' => $request->note,
|
||||||
'status' => StatusTypeEnum::SUSPENDED,
|
'status' => StatusTypeEnum::PENDING,
|
||||||
'user_id' => auth('api')->user()->id,
|
'user_id' => auth('api')->user()->id,
|
||||||
'creator_id' => auth('api')->user()->id
|
'creator_id' => auth('api')->user()->id
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ class TransferItemController extends Controller
|
|||||||
{
|
{
|
||||||
$data = Transfer::query()
|
$data = Transfer::query()
|
||||||
->whereHasMorph( 'transferable' , [ Item::class ] )
|
->whereHasMorph( 'transferable' , [ Item::class ] )
|
||||||
->where( "status" , StatusTypeEnum::SUSPENDED )
|
->where( "status" , StatusTypeEnum::PENDING )
|
||||||
->with( [ "user" , "transferable" , "transferable.user" ] );
|
->with( [ "user" , "transferable" , "transferable.user" ] );
|
||||||
|
|
||||||
$user = auth( 'api' )->user();
|
$user = auth( 'api' )->user();
|
||||||
@@ -41,7 +41,7 @@ class TransferItemController extends Controller
|
|||||||
if ( auth( 'api' )->user()->cant( 'changeStatus' , [ Transfer::class , $Transfer ] ) ) {
|
if ( auth( 'api' )->user()->cant( 'changeStatus' , [ Transfer::class , $Transfer ] ) ) {
|
||||||
return MessageResponse::error( trans( 'messages.access_denied' ) );
|
return MessageResponse::error( trans( 'messages.access_denied' ) );
|
||||||
}
|
}
|
||||||
if ( $Transfer->status == StatusTypeEnum::SUSPENDED ) {
|
if ( $Transfer->status == StatusTypeEnum::PENDING ) {
|
||||||
if ( $request->status == StatusTypeEnum::APPROVED ) {
|
if ( $request->status == StatusTypeEnum::APPROVED ) {
|
||||||
$item = $Transfer->transferable;
|
$item = $Transfer->transferable;
|
||||||
if ( $item->transferActive ) $item->transferActive()->update( [ "to_date" => Carbon::now() ] );
|
if ( $item->transferActive ) $item->transferActive()->update( [ "to_date" => Carbon::now() ] );
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ class TransferPackageController extends Controller
|
|||||||
{
|
{
|
||||||
$data = Transfer::query()
|
$data = Transfer::query()
|
||||||
->whereHasMorph( 'transferable' , [ Package::class ] )
|
->whereHasMorph( 'transferable' , [ Package::class ] )
|
||||||
->where( "status" , StatusTypeEnum::SUSPENDED )
|
->where( "status" , StatusTypeEnum::PENDING )
|
||||||
->with( [ "user" , "transferable" , "transferable.user" ] );
|
->with( [ "user" , "transferable" , "transferable.user" ] );
|
||||||
|
|
||||||
$user = auth( 'api' )->user();
|
$user = auth( 'api' )->user();
|
||||||
@@ -41,7 +41,7 @@ class TransferPackageController extends Controller
|
|||||||
if ( auth( 'api' )->user()->cant( 'changeStatus' , [ Transfer::class , $Transfer ] ) ) {
|
if ( auth( 'api' )->user()->cant( 'changeStatus' , [ Transfer::class , $Transfer ] ) ) {
|
||||||
return MessageResponse::error( trans( 'messages.access_denied' ) );
|
return MessageResponse::error( trans( 'messages.access_denied' ) );
|
||||||
}
|
}
|
||||||
if ( $Transfer->status == StatusTypeEnum::SUSPENDED ) {
|
if ( $Transfer->status == StatusTypeEnum::PENDING ) {
|
||||||
if ( $request->status == StatusTypeEnum::APPROVED ) {
|
if ( $request->status == StatusTypeEnum::APPROVED ) {
|
||||||
$package = $Transfer->transferable;
|
$package = $Transfer->transferable;
|
||||||
if ( $package->transferActive ) $package->transferActive()->update( [ "to_date" => Carbon::now() ] );
|
if ( $package->transferActive ) $package->transferActive()->update( [ "to_date" => Carbon::now() ] );
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ class CreateTransfersTable extends Migration
|
|||||||
$table->foreign('user_id')->references('id')->on('users');
|
$table->foreign('user_id')->references('id')->on('users');
|
||||||
$table->dateTime('from_date')->nullable();
|
$table->dateTime('from_date')->nullable();
|
||||||
$table->dateTime('to_date')->nullable();
|
$table->dateTime('to_date')->nullable();
|
||||||
$table->enum( 'status' , [ StatusTypeEnum::APPROVED , StatusTypeEnum::REJECTED , StatusTypeEnum::SUSPENDED ] )->default( StatusTypeEnum::SUSPENDED );
|
$table->enum( 'status' , [ StatusTypeEnum::APPROVED , StatusTypeEnum::REJECTED , StatusTypeEnum::PENDING ] )->default( StatusTypeEnum::PENDING );
|
||||||
$table->timestamps();
|
$table->timestamps();
|
||||||
$table->softDeletes();
|
$table->softDeletes();
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ class AddStatusToItemsTable extends Migration
|
|||||||
$table->dropColumn( 'status' );
|
$table->dropColumn( 'status' );
|
||||||
} );
|
} );
|
||||||
Schema::table( 'items' , function ( Blueprint $table ) {
|
Schema::table( 'items' , function ( Blueprint $table ) {
|
||||||
$table->enum( 'status' , [ StatusTypeEnum::APPROVED , StatusTypeEnum::REJECTED , StatusTypeEnum::SUSPENDED ] )->default( StatusTypeEnum::SUSPENDED );
|
$table->enum( 'status' , [ StatusTypeEnum::APPROVED , StatusTypeEnum::REJECTED , StatusTypeEnum::PENDING ] )->default( StatusTypeEnum::PENDING );
|
||||||
} );
|
} );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ class AddStatusToPackagesTable extends Migration
|
|||||||
$table->dropColumn( 'verified' );
|
$table->dropColumn( 'verified' );
|
||||||
} );
|
} );
|
||||||
Schema::table( 'packages' , function ( Blueprint $table ) {
|
Schema::table( 'packages' , function ( Blueprint $table ) {
|
||||||
$table->enum( 'status' , [ StatusTypeEnum::APPROVED , StatusTypeEnum::REJECTED , StatusTypeEnum::SUSPENDED ] )->default( StatusTypeEnum::SUSPENDED );
|
$table->enum( 'status' , [ StatusTypeEnum::APPROVED , StatusTypeEnum::REJECTED , StatusTypeEnum::PENDING ] )->default( StatusTypeEnum::PENDING );
|
||||||
} );
|
} );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user