diff --git a/app/Http/Controllers/PackageController.php b/app/Http/Controllers/PackageController.php index f5afd6d9..65c063a4 100644 --- a/app/Http/Controllers/PackageController.php +++ b/app/Http/Controllers/PackageController.php @@ -49,7 +49,7 @@ class PackageController extends Controller } public function store(StorePackageRequest $request) { - $UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10); + // $UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10); $PackageData = [ 'name' => $request->name, 'unique_id' => $request->unique_id, diff --git a/app/Http/Requests/StoreItemRequest.php b/app/Http/Requests/StoreItemRequest.php index ce4a7eb8..75606a13 100644 --- a/app/Http/Requests/StoreItemRequest.php +++ b/app/Http/Requests/StoreItemRequest.php @@ -37,8 +37,8 @@ class StoreItemRequest extends FormRequest case 'PATCH': { $Item = $this->route('Item'); return [ - 'name' => 'required|max:100|unique:items,id,'.$Item->id, - 'unique_id' => 'required|max:100|unique:items,id,'.$Item->id, + 'name' => 'required|max:100|unique:items,name,'.$Item->id, + 'unique_id' => 'required|max:100|unique:items,unique_id,'.$Item->id, 'size' => 'required', 'specific' => 'required', 'note' => 'nullable', diff --git a/app/Http/Requests/StoreMedicalCenterRequest.php b/app/Http/Requests/StoreMedicalCenterRequest.php index a8da55c1..31bf7c88 100644 --- a/app/Http/Requests/StoreMedicalCenterRequest.php +++ b/app/Http/Requests/StoreMedicalCenterRequest.php @@ -39,7 +39,7 @@ class StoreMedicalCenterRequest extends FormRequest case 'PATCH': { $MedicalCenter = $this->route('MedicalCenter'); return [ - 'name' => 'required|max:100|unique:medical_centers,id,'.$MedicalCenter->id, + 'name' => 'required|max:100|unique:medical_centers,name,'.$MedicalCenter->id, 'phone_number' => 'required|digits_between:10,11', 'address' => 'required', 'city_id' => 'required|max:100|exists:cities,id', diff --git a/app/Http/Requests/StorePackageRequest.php b/app/Http/Requests/StorePackageRequest.php index 02fac0ab..3e651755 100644 --- a/app/Http/Requests/StorePackageRequest.php +++ b/app/Http/Requests/StorePackageRequest.php @@ -36,8 +36,8 @@ class StorePackageRequest extends FormRequest case 'PATCH': { $Package = $this->route('Package'); return [ - 'name' => 'required|max:250|unique:packages,id,'.$Package->id, - 'unique_id' => 'required|max:250|unique:packages,id,'.$Package->id, + 'name' => 'required|max:250|unique:packages,name,'.$Package->id, + 'unique_id' => 'required|max:250|unique:packages,unique_id,'.$Package->id, 'note' => 'nullable', 'items' => 'required', ]; diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 8ab929cb..7b0fd327 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -144,6 +144,8 @@ return [ | */ - 'attributes' => [], + 'attributes' => [ + 'unique_id' => 'ID' + ], ];