diff --git a/app/Http/Controllers/RecruitmentController.php b/app/Http/Controllers/RecruitmentController.php index a9dd953..8b26446 100644 --- a/app/Http/Controllers/RecruitmentController.php +++ b/app/Http/Controllers/RecruitmentController.php @@ -6,17 +6,13 @@ use App\Models\Recruitment; use App\Models\Applicant; use App\Models\User; use Illuminate\Http\Request; +use App\Http\Requests\Recruitment\ApplyRequest; +use App\Http\Requests\Recruitment\VacancyRequest; class RecruitmentController extends Controller { - public function save_vacancy(Request $request){ - $this->validate(\request(),[ - 'full_name' => 'required', - 'company' => 'required', - 'email' => 'required', - 'no_of_position' => 'required', - 'entered_captcha_code' => 'required|same:displayed_captcha_code' - ]); + public function save_vacancy(VacancyRequest $request){ + $recruitment = new Recruitment(); $subject = 'Recruitment Enquiry'; @@ -55,17 +51,8 @@ class RecruitmentController extends Controller return redirect()->back()->with(['msg' => 'Thank you! Your recruitment details have been recieved.']); } - public function apply(Request $request){ - $this->validate(\request(),[ - 'full_name' => 'required', - 'phone' => 'required', - 'email' => 'required', - 'file' => 'required', - 'country' => 'required', - 'has_visa_permit' => 'required', - 'has_skill_assessed' => 'required', - 'entered_captcha_code' => 'required|same:displayed_captcha_code' - ]); + public function apply(ApplyRequest $request){ + $recruitment = new Applicant(); $subject = 'Applicant Enquiry'; diff --git a/app/Http/Requests/ContactRequest.php b/app/Http/Requests/ContactRequest.php index de125cf..b5e203c 100644 --- a/app/Http/Requests/ContactRequest.php +++ b/app/Http/Requests/ContactRequest.php @@ -13,7 +13,7 @@ class ContactRequest extends FormRequest */ public function authorize() { - return false; + return true; } /** @@ -24,21 +24,23 @@ class ContactRequest extends FormRequest public function rules() { return [ - 'fullname' => 'required', - 'phone' => 'required', - 'email' => 'required', - 'service_id' => 'required|numeric', - 'entered_captcha_code' => 'required|same:displayed_captcha_code' + 'fullname' => ['required'], + 'phone' => ['required'], + 'email' => ['required'], + 'service_id' => ['required'], + 'entered_captcha_code' => ['required','same:displayed_captcha_code'] ]; } - public function message(){ + public function messages(){ return[ 'fullname.required' => 'Full name is required.', - 'phone.required' => 'Phone is required.', + 'phone.required' => 'Phone number is required.', 'email.required' => 'Email is required.', 'service_id.required' => 'Please select a service.', + 'entered_captcha_code.required' => 'Please enter captcha.', + 'entered_captcha_code.same' => 'Captcha is incorrect.' ]; } diff --git a/app/Http/Requests/Recruitment/ApplyRequest.php b/app/Http/Requests/Recruitment/ApplyRequest.php new file mode 100644 index 0000000..ed3f895 --- /dev/null +++ b/app/Http/Requests/Recruitment/ApplyRequest.php @@ -0,0 +1,51 @@ + + */ + public function rules() + { + return [ + 'full_name' => 'required', + 'phone' => 'required', + 'email' => 'required', + 'file' => 'required', + 'country' => 'required', + 'has_visa_permit' => 'required', + 'has_skill_assessed' => 'required', + 'entered_captcha_code' => ['required','same:displayed_captcha_code'] + ]; + } + public function messages() + { + return [ + 'full_name.required' => 'Full name is required.', + 'phone.required' => 'Phone number is required.', + 'email.required' => 'Email is required.', + 'file.required' => 'Please upload your resume.', + 'country.required' => 'Please select your country.', + 'has_visa_permit.required' => 'Please specify your visa permit position.', + 'has_skill_assesed.required' => 'Please specify your TRA skill assessment.', + 'entered_captcha_code.required' => 'Please enter captcha.', + 'entered_captcha_code.same' => 'Captcha is incorrect.' + ]; + } +} diff --git a/app/Http/Requests/Recruitment/VacancyRequest.php b/app/Http/Requests/Recruitment/VacancyRequest.php new file mode 100644 index 0000000..6fc4667 --- /dev/null +++ b/app/Http/Requests/Recruitment/VacancyRequest.php @@ -0,0 +1,45 @@ + + */ + public function rules() + { + return [ + 'full_name' => 'required', + 'company' => 'required', + 'email' => 'required', + 'no_of_position' => 'required', + 'entered_captcha_code' => ['required','same:displayed_captcha_code'] + ]; + } + public function messages() + { + return [ + 'full_name.required' => 'Full name is required.', + 'company.required' => 'Your company is required.', + 'email.required' => 'Email is required.', + 'no_of_position.required' => 'Number of position is required', + 'entered_captcha_code.required' => 'Please enter captcha.', + 'entered_captcha_code.same' => 'Captcha is incorrect.' + ]; + } +} diff --git a/resources/views/contact.blade.php b/resources/views/contact.blade.php index 2912bfb..b93ea64 100644 --- a/resources/views/contact.blade.php +++ b/resources/views/contact.blade.php @@ -94,7 +94,7 @@