Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 340-cmb-walk-in-customer-form

This commit is contained in:
Korina Cordero 2020-02-14 03:09:57 +00:00
commit 6a944eeb16

View file

@ -320,7 +320,9 @@ class CMBCustomerHandler implements CustomerHandlerInterface
$nerror_array = [];
$verror_array = [];
// TODO: validate mobile numbers
if (!($this->validateMobileNumber($req->request->get('phone_mobile'))))
$error_array['phone_mobile'] = 'Invalid mobile phone number.';
// TODO: validate vehicles
// custom validation for vehicles
@ -685,6 +687,18 @@ class CMBCustomerHandler implements CustomerHandlerInterface
}
}
protected function validateMobileNumber($mobile_number)
{
if (empty($mobile_number))
return true;
if (strlen($mobile_number) != 9)
return false;
if(preg_match('/^\d+$/',$mobile_number))
return true;
return false;
}
// check if datatable filter is present and append to query
protected function setQueryFilters($datatable, &$query) {
if (isset($datatable['query']['data-rows-search']) && !empty($datatable['query']['data-rows-search'])) {