From 600514750b25b503fa0906199c0bcc4fe1d7db6c Mon Sep 17 00:00:00 2001 From: Bozhidar Slaveykov Date: Thu, 17 Feb 2022 17:14:43 +0200 Subject: [PATCH 1/2] Update ContactInformationTrait.php --- .../Http/Controllers/Traits/ContactInformationTrait.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/MicroweberPackages/Checkout/Http/Controllers/Traits/ContactInformationTrait.php b/src/MicroweberPackages/Checkout/Http/Controllers/Traits/ContactInformationTrait.php index 92e3fe3cc8d..70223e8cb2a 100644 --- a/src/MicroweberPackages/Checkout/Http/Controllers/Traits/ContactInformationTrait.php +++ b/src/MicroweberPackages/Checkout/Http/Controllers/Traits/ContactInformationTrait.php @@ -58,19 +58,19 @@ private function _validateContactInformation($inputData = []) $rules = []; if (get_option('shop_require_first_name', 'website') == 1) { - $rules['first_name'] = 'required|max:1000'; + $rules['first_name'] = 'required|max:500'; } if (get_option('shop_require_last_name', 'website') == 1) { - $rules['last_name'] = 'required|max:1000'; + $rules['last_name'] = 'required|max:500'; } if (get_option('shop_require_email', 'website') == 1) { - $rules['email'] = 'required|email|max:1000'; + $rules['email'] = 'required|email|max:500'; } if (get_option('shop_require_phone', 'website') == 1) { - $rules['phone'] = 'required|max:1000'; + $rules['phone'] = 'required|max:500'; } // $rules['phone-testing'] = 'required'; From 5a5e8292aeb87a93021e44bdc14314b0d575564a Mon Sep 17 00:00:00 2001 From: Bozhidar Slaveykov Date: Thu, 17 Feb 2022 17:16:31 +0200 Subject: [PATCH 2/2] Update ContactInformationTrait.php --- .../Traits/ContactInformationTrait.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/MicroweberPackages/Checkout/Http/Controllers/Traits/ContactInformationTrait.php b/src/MicroweberPackages/Checkout/Http/Controllers/Traits/ContactInformationTrait.php index 70223e8cb2a..626328e59db 100644 --- a/src/MicroweberPackages/Checkout/Http/Controllers/Traits/ContactInformationTrait.php +++ b/src/MicroweberPackages/Checkout/Http/Controllers/Traits/ContactInformationTrait.php @@ -57,24 +57,27 @@ private function _validateContactInformation($inputData = []) { $rules = []; + $rules['first_name'] = 'max:500'; + $rules['last_name'] = 'max:500'; + $rules['email'] = 'email|max:500'; + $rules['phone'] = 'max:500'; + if (get_option('shop_require_first_name', 'website') == 1) { - $rules['first_name'] = 'required|max:500'; + $rules['first_name'] .= '|required'; } if (get_option('shop_require_last_name', 'website') == 1) { - $rules['last_name'] = 'required|max:500'; + $rules['last_name'] .= '|required'; } if (get_option('shop_require_email', 'website') == 1) { - $rules['email'] = 'required|email|max:500'; + $rules['email'] .= '|required';; } if (get_option('shop_require_phone', 'website') == 1) { - $rules['phone'] = 'required|max:500'; + $rules['phone'] .= '|required';; } - // $rules['phone-testing'] = 'required'; - if (empty($rules)) { return ['valid'=>true]; }