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