diff --git a/app/Http/Controllers/PackageController.php b/app/Http/Controllers/PackageController.php index 6bf83159..756adbc7 100644 --- a/app/Http/Controllers/PackageController.php +++ b/app/Http/Controllers/PackageController.php @@ -47,7 +47,8 @@ class PackageController extends Controller } public function create() - {} + { + } public function show( Package $Package ) { @@ -57,7 +58,13 @@ class PackageController extends Controller 'user.medical_center' => function ( $query ) { $query->select( 'id' , 'name' ); } , - 'items' ] ); + 'items' , + "transfers" => function ( $query ) { + $query->with( [ 'user' => function ( $query ) { + $query->select( 'id' , 'name' , 'cell_number' , 'medical_center_id' ); + } ] ); + } + ] ); return \MessageResponse::data( $Package ); } @@ -187,7 +194,7 @@ class PackageController extends Controller 'user.medical_center' => function ( $query ) { $query->select( 'id' , 'name' ); } , - 'items', + 'items' , "transfers" => function ( $query ) { $query->with( [ 'user' => function ( $query ) { $query->select( 'id' , 'name' , 'cell_number' , 'medical_center_id' ); diff --git a/app/Http/Controllers/UploadController.php b/app/Http/Controllers/UploadController.php index 66762921..bc1a46ec 100644 --- a/app/Http/Controllers/UploadController.php +++ b/app/Http/Controllers/UploadController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; +use Illuminate\Support\Str; use Intervention\Image\ImageManager; use Illuminate\Support\Facades\Storage; use App\Media; @@ -13,7 +14,9 @@ class UploadController extends Controller { $FileType = 'image'; $rules = [ - "file" => "required|mimes:pdf,jpeg,png,jpg,doc,docx|max:2048" + "file" => "required|mimes:pdf,jpeg,png,jpg,doc,docx|max:2048", + "batch_id" => "required", + "model_type" => "required|string", ]; $this->validate($request, $rules); @@ -21,8 +24,9 @@ class UploadController extends Controller $FileType = 'document'; } + $modelType = Str::ucfirst($request->model_type); if ($request->model_id !== null && is_numeric($request->model_id)) { - $Model = 'App\\'.$request->model_type; + $Model = 'App\\'.$modelType; $Object = $Model::findOrFail($request->model_id); if ($Object) { if($FileType == 'image'){ @@ -49,7 +53,7 @@ class UploadController extends Controller $MediaData = [ 'model_id' => $Object->id, 'batch_id' => $request->batch_id, - 'model_type' => 'App\\'.$request->model_type, + 'model_type' => 'App\\'.$modelType, 'path' => $Path, 'user_id' => auth('api')->user()->id, 'file_name' => $FileName, @@ -83,7 +87,7 @@ class UploadController extends Controller $MediaData = [ 'model_id' => null, 'batch_id' => $request->batch_id, - 'model_type' => 'App\\'.$request->model_type, + 'model_type' => 'App\\'.$modelType, 'path' => $Path, 'user_id' => auth('api')->user()->id, 'file_name' => $FileName,