diff --git a/app/Http/Controllers/AutoController.php b/app/Http/Controllers/AutoController.php index 6efd962..bb943ec 100644 --- a/app/Http/Controllers/AutoController.php +++ b/app/Http/Controllers/AutoController.php @@ -86,17 +86,14 @@ class AutoController extends Controller } $request->validate([ - 'number' => 'required', - 'purpose_id' => 'required', - 'ordered_customer' => 'required', - 'ordered_customer_phone' => 'required', - 'customer_type' => 'required|in:physical,juridical', - 'owner_type' => 'required|in:physical,juridical', - 'car_category' => 'required', - 'car_mark' => 'required', - 'car_number' => 'required', - 'tech_passport' => 'required', - 'cost' => 'required|numeric', + 'number' => 'required', + 'purpose_id' => 'required', + 'ordered_customer' => 'required', + 'customer_type' => 'required|in:physical,juridical', + 'owner_type' => 'required|in:physical,juridical', + 'car_category' => 'required', + 'car_mark' => 'required', + 'cost' => 'required|numeric', ]); $id = DB::table('auto_orders')->insertGetId([ @@ -158,17 +155,14 @@ class AutoController extends Controller } $request->validate([ - 'number' => 'required', - 'purpose_id' => 'required', - 'ordered_customer' => 'required', - 'ordered_customer_phone' => 'required', - 'customer_type' => 'required|in:physical,juridical', - 'owner_type' => 'required|in:physical,juridical', - 'car_category' => 'required', - 'car_mark' => 'required', - 'car_number' => 'required', - 'tech_passport' => 'required', - 'cost' => 'required|numeric', + 'number' => 'required', + 'purpose_id' => 'required', + 'ordered_customer' => 'required', + 'customer_type' => 'required|in:physical,juridical', + 'owner_type' => 'required|in:physical,juridical', + 'car_category' => 'required', + 'car_mark' => 'required', + 'cost' => 'required|numeric', ]); DB::table('auto_orders')->where('id', $id)->update([ diff --git a/app/Http/Controllers/EstateController.php b/app/Http/Controllers/EstateController.php index 89b8f4d..b91b91a 100644 --- a/app/Http/Controllers/EstateController.php +++ b/app/Http/Controllers/EstateController.php @@ -59,26 +59,21 @@ class EstateController extends Controller public function store(Request $request) { - // Sanitize cost before validation if ($request->has('cost')) { - $request->merge([ - 'cost' => str_replace(',', '', $request->cost) - ]); + $request->merge(['cost' => preg_replace('/\D/', '', $request->cost)]); } $request->validate([ - 'number' => 'required', - 'purpose_id' => 'required', - 'ordered_customer' => 'required', - 'ordered_customer_phone' => 'required', - 'customer_type' => 'required|in:physical,juridical', - 'owner_type' => 'required|in:physical,juridical', - 'name_of_object' => 'required', - 'region' => 'required', - 'district' => 'required', - 'address' => 'required', - 'tech_passport' => 'required', - 'cost' => 'required|numeric', + 'number' => 'required', + 'purpose_id' => 'required', + 'ordered_customer' => 'required', + 'customer_type' => 'required|in:physical,juridical', + 'owner_type' => 'required|in:physical,juridical', + 'name_of_object' => 'required', + 'region' => 'required', + 'district' => 'required', + 'address' => 'required', + 'cost' => 'required|numeric', ]); $id = DB::table('estate_orders')->insertGetId([ @@ -134,26 +129,21 @@ class EstateController extends Controller public function update(Request $request, $id) { - // Sanitize cost before validation if ($request->has('cost')) { - $request->merge([ - 'cost' => str_replace(',', '', $request->cost) - ]); + $request->merge(['cost' => preg_replace('/\D/', '', $request->cost)]); } $request->validate([ - 'number' => 'required', - 'purpose_id' => 'required', - 'ordered_customer' => 'required', - 'ordered_customer_phone' => 'required', - 'customer_type' => 'required|in:physical,juridical', - 'owner_type' => 'required|in:physical,juridical', - 'name_of_object' => 'required', - 'region' => 'required', - 'district' => 'required', - 'address' => 'required', - 'tech_passport' => 'required', - 'cost' => 'required|numeric', + 'number' => 'required', + 'purpose_id' => 'required', + 'ordered_customer' => 'required', + 'customer_type' => 'required|in:physical,juridical', + 'owner_type' => 'required|in:physical,juridical', + 'name_of_object' => 'required', + 'region' => 'required', + 'district' => 'required', + 'address' => 'required', + 'cost' => 'required|numeric', ]); DB::table('estate_orders')->where('id', $id)->update([ diff --git a/resources/views/estate/create.blade.php b/resources/views/estate/create.blade.php index 7dd6db1..5185ff3 100755 --- a/resources/views/estate/create.blade.php +++ b/resources/views/estate/create.blade.php @@ -576,6 +576,5 @@ @section('script') - @endsection