cssd-doc/cssd-back
1
0
Fork 0
mirror of https://git.meshkee.com/cssd/cssd-back.git synced 2026-10-11 15:21:06 +03:30
Code Issues Packages Projects Releases Wiki Activity

update cycle

Browse Source
This commit is contained in:
Fayyazi
2019-09-17 12:01:30 +04:30
parent a14ee80603
commit 2a83f7931b
5 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/PackController.php
+2 -7
View File
@@ -16,9 +16,6 @@ class PackController extends Controller
->when($request->has('sterilizer_id') && $request->sterilizer_id != '', function($query) use($request){
$query->where('sterilizer_id', $request->sterilizer_id);
})
->when($request->has('unique_id') && $request->unique_id != '', function($query) use($request){
$query->where('unique_id', $request->unique_id);
})
->when($request->has('cycle_number') && $request->cycle_number != '', function($query) use($request){
$query->where('cycle_number', $request->cycle_number);
})
@@ -33,7 +30,7 @@ class PackController extends Controller
$query->where('medical_center_id', $request->medical_center_id);
});
})
->with('user')->paginate(10);
->with('user', 'user.medical_center')->paginate(10);
return \MessageResponse::data($Packs);
}
public function create()
@@ -42,15 +39,13 @@ class PackController extends Controller
}
public function show(Pack $Pack)
{
$Pack->load('user', 'packages');
$Pack->load('user', 'packages', 'user.medical_center');
return \MessageResponse::data($Pack);
}
public function store(StorePackRequest $request)
{
$UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10);
$PackData = [
'name' => $request->name,
'unique_id' => $UniqueID,
'sterile_date' => $request->sterile_date,
'expire_date' => $request->expire_date,
'sterilizer_id' => $request->sterilizer_id,