diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php index 69462c3e..743aa956 100644 --- a/app/Http/Controllers/ItemController.php +++ b/app/Http/Controllers/ItemController.php @@ -134,6 +134,9 @@ class ItemController extends Controller } , 'user.medical_center' => function ( $query ) { $query->select( 'id' , 'name' , 'address' , 'phone_number' ); + }, + 'userTransfer' => function ($query) { + $query->select('id','name','cell_number'); } ] ); } diff --git a/app/Http/Controllers/PackageController.php b/app/Http/Controllers/PackageController.php index f37cb0b7..9eb17d2e 100644 --- a/app/Http/Controllers/PackageController.php +++ b/app/Http/Controllers/PackageController.php @@ -98,10 +98,14 @@ class PackageController extends Controller }, 'user.medical_center' => function ($query) { $query->select('id', 'name', 'address', 'phone_number'); + }, + 'userTransfer' => function ($query) { + $query->select('id','name','cell_number'); } ]); } ]); + return PackageResource::make($Package); } diff --git a/app/Http/Controllers/TransferItemController.php b/app/Http/Controllers/TransferItemController.php index c0c6ce77..427045ae 100644 --- a/app/Http/Controllers/TransferItemController.php +++ b/app/Http/Controllers/TransferItemController.php @@ -63,6 +63,7 @@ class TransferItemController extends Controller } if ( $Item->user_id != $request->user_id ) { $Item->transfers()->create( [ + "user_transfer_id" => auth()->user()->id, "user_id" => $request->user_id , "from_date" => Carbon::now() , "status" => StatusTypeEnum::APPROVED diff --git a/app/Http/Controllers/TransferPackageController.php b/app/Http/Controllers/TransferPackageController.php index 93705ec2..5afa103a 100644 --- a/app/Http/Controllers/TransferPackageController.php +++ b/app/Http/Controllers/TransferPackageController.php @@ -70,6 +70,7 @@ class TransferPackageController extends Controller //create transfer for the Package $Package->transfers()->create( [ + "user_transfer_id" => auth()->user()->id, "user_id" => $request->user_id , "from_date" => Carbon::now() , "status" => StatusTypeEnum::APPROVED diff --git a/app/Http/Resources/TransferResource.php b/app/Http/Resources/TransferResource.php index f0047b4d..242904a2 100644 --- a/app/Http/Resources/TransferResource.php +++ b/app/Http/Resources/TransferResource.php @@ -22,6 +22,8 @@ class TransferResource extends JsonResource 'status' => $this->status, 'user_id' => $this->user_id, 'user' => UserResource::make($this->whenLoaded('user')), + 'user_transfer_id' => $this->user_transfer_id, + 'userTransfer' => UserResource::make($this->whenLoaded('userTransfer')), 'transferable' => $this->resourceFinder(), 'created_at' => $this->created_at, 'updated_at' => $this->updated_at diff --git a/app/Transfer.php b/app/Transfer.php index d069e1dc..d648c3d5 100644 --- a/app/Transfer.php +++ b/app/Transfer.php @@ -9,13 +9,18 @@ class Transfer extends Model { 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() { return $this->belongsTo( 'App\User' ); } + public function userTransfer() + { + return $this->belongsTo( 'App\User', 'user_transfer_id' ); + } + public function transferable() { return $this->morphTo(); diff --git a/database/migrations/2024_05_05_105944_add_user_transfer_id_to_transfers_table.php b/database/migrations/2024_05_05_105944_add_user_transfer_id_to_transfers_table.php new file mode 100644 index 00000000..394af088 --- /dev/null +++ b/database/migrations/2024_05_05_105944_add_user_transfer_id_to_transfers_table.php @@ -0,0 +1,32 @@ +unsignedBigInteger('user_transfer_id')->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('transfers', function (Blueprint $table) { + $table->dropColumn('user_transfer_id'); + }); + } +}