fix trasnfer

This commit is contained in:
mahdi1113
2024-05-26 02:13:27 +03:30
parent 4e48b74d0f
commit c8f5ba1105
7 changed files with 49 additions and 1 deletions
+3
View File
@@ -134,6 +134,9 @@ class ItemController extends Controller
} , } ,
'user.medical_center' => function ( $query ) { 'user.medical_center' => function ( $query ) {
$query->select( 'id' , 'name' , 'address' , 'phone_number' ); $query->select( 'id' , 'name' , 'address' , 'phone_number' );
},
'userTransfer' => function ($query) {
$query->select('id','name','cell_number');
} }
] ); ] );
} }
@@ -98,10 +98,14 @@ class PackageController extends Controller
}, },
'user.medical_center' => function ($query) { 'user.medical_center' => function ($query) {
$query->select('id', 'name', 'address', 'phone_number'); $query->select('id', 'name', 'address', 'phone_number');
},
'userTransfer' => function ($query) {
$query->select('id','name','cell_number');
} }
]); ]);
} }
]); ]);
return PackageResource::make($Package); return PackageResource::make($Package);
} }
@@ -63,6 +63,7 @@ class TransferItemController extends Controller
} }
if ( $Item->user_id != $request->user_id ) { if ( $Item->user_id != $request->user_id ) {
$Item->transfers()->create( [ $Item->transfers()->create( [
"user_transfer_id" => auth()->user()->id,
"user_id" => $request->user_id , "user_id" => $request->user_id ,
"from_date" => Carbon::now() , "from_date" => Carbon::now() ,
"status" => StatusTypeEnum::APPROVED "status" => StatusTypeEnum::APPROVED
@@ -70,6 +70,7 @@ class TransferPackageController extends Controller
//create transfer for the Package //create transfer for the Package
$Package->transfers()->create( [ $Package->transfers()->create( [
"user_transfer_id" => auth()->user()->id,
"user_id" => $request->user_id , "user_id" => $request->user_id ,
"from_date" => Carbon::now() , "from_date" => Carbon::now() ,
"status" => StatusTypeEnum::APPROVED "status" => StatusTypeEnum::APPROVED
+2
View File
@@ -22,6 +22,8 @@ class TransferResource extends JsonResource
'status' => $this->status, 'status' => $this->status,
'user_id' => $this->user_id, 'user_id' => $this->user_id,
'user' => UserResource::make($this->whenLoaded('user')), 'user' => UserResource::make($this->whenLoaded('user')),
'user_transfer_id' => $this->user_transfer_id,
'userTransfer' => UserResource::make($this->whenLoaded('userTransfer')),
'transferable' => $this->resourceFinder(), 'transferable' => $this->resourceFinder(),
'created_at' => $this->created_at, 'created_at' => $this->created_at,
'updated_at' => $this->updated_at 'updated_at' => $this->updated_at
+6 -1
View File
@@ -9,13 +9,18 @@ class Transfer extends Model
{ {
use SoftDeletes; use SoftDeletes;
public $fillable = [ 'user_id' , 'to_date' , 'from_date' , 'status' ]; public $fillable = [ 'user_id' , 'to_date' , 'from_date' , 'status' , 'user_transfer_id' ];
public function user() public function user()
{ {
return $this->belongsTo( 'App\User' ); return $this->belongsTo( 'App\User' );
} }
public function userTransfer()
{
return $this->belongsTo( 'App\User', 'user_transfer_id' );
}
public function transferable() public function transferable()
{ {
return $this->morphTo(); return $this->morphTo();
@@ -0,0 +1,32 @@
<?php
use back\vendor\laravel\framework\src\Illuminate\Support\Facades\Schema;
use back\vendor\laravel\framework\src\Illuminate\Database\Schema\Blueprint;
use back\vendor\laravel\framework\src\Illuminate\Database\Migrations\Migration;
class AddUserTransferIdToTransfersTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('transfers', function (Blueprint $table) {
$table->unsignedBigInteger('user_transfer_id')->nullable();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('transfers', function (Blueprint $table) {
$table->dropColumn('user_transfer_id');
});
}
}