update item & package & label & cycle

This commit is contained in:
Fayyazi
2019-10-30 14:19:47 +03:30
parent dbd0ddc1d4
commit da3dd22ec5
19 changed files with 292 additions and 109 deletions
+23 -12
View File
@@ -11,7 +11,25 @@ class LabelController extends Controller
{
public function index(Request $request)
{
$Labels = Label::when($request->has('name') && $request->name != '', function($query) use($request){
$user = auth('api')->user();
if ($user->hasRole('Supervisor|User')) {
$medical_center_id = $user->medical_center_id;
}
elseif($request->has('medicalCenter_id') && $request->medicalCenter_id != '') {
$medical_center_id = $request->medicalCenter_id;
} else {
$medical_center_id = null;
}
$Labels = Label::
when($user->cant('showAll'), function($query) use ($user) {
if ($user->hasRole('User')) {
$query->where('user_id', $user->id);
}
})
->when($request->has('name') && $request->name != '', function($query) use($request){
$query->where('name', 'LIKE', '%'.$request->name.'%');
})
->when($request->has('sterilizer_id') && $request->sterilizer_id != '', function($query) use($request){
@@ -26,7 +44,7 @@ class LabelController extends Controller
->when($request->has('department') && $request->department != '', function($query) use($request){
$query->where('department', 'LIKE', '%'.$request->department.'%');
})
->when($request->has('medical_center_id') && $request->medical_center_id != '', function($query) use($request){
->when($medical_center_id, function($query) use($request){
$query->whereHas('user', function($query) use($request){
$query->where('medical_center_id', $request->medical_center_id);
});
@@ -40,7 +58,7 @@ class LabelController extends Controller
}
public function show(Label $Label)
{
$Label->load('user', 'packages', 'user.medical_center');
$Label->load('user', 'package', 'package.items', 'user.medical_center');
return \MessageResponse::data($Label);
}
public function store(StoreLabelRequest $request)
@@ -55,27 +73,20 @@ class LabelController extends Controller
'department' => $request->department,
'note' => $request->note,
'user_id' => auth('api')->user()->id,
'package_id' => $request->package_id
];
$LabelObj = Label::create($LabelData);
Package::find($request->package_id)->update(['label_id' => $Label->id]);
return \MessageResponse::success(trans('messages.success'));
}
public function edit(Label $Label)
{
$Label->load('package');
dd($Label);
// $Packages = $Label->packages->pluck('id')->toArray();
// unset($Label->packages);
// $Label->package_id = $Label->package->id;
return \MessageResponse::data($Label);
}
public function update(Request $request, Label $Label)
{
$Label->update($request->except(['package_id']));
Package::find($request->package_id)->update(['label_id' => $Label->id]);
// $Label->package()->save($request->package_id);
// $Label->packages()->sync($request->packages);
$Label->update($request->all());
return \MessageResponse::success(trans('messages.success'));
}
public function destroy(Label $Label)