maket/MaketRandevu
1
1
Fork 0
Code Issues 15 Pull requests Projects Releases 4 Packages Wiki Activity

Merge branch 'fix-validation' of https://github.com/DiGitHubCap/easyappointments into DiGitHubCap-fix-validation

Browse source 
# Conflicts:
#	src/application/models/Customers_model.php
This commit is contained in:
Alex Tselegidis 2020-03-10 21:31:10 +01:00
commit 57209cf157
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/application/models/Customers_model.php
View file

@ -68,7 +68,7 @@ class Customers_Model extends CI_Model {
*/ */
public function exists($customer) public function exists($customer)
{ {
if ( ! isset($customer['email'])) if (empty($customer['email']))
{ {
throw new Exception('Customer\'s email is not provided.'); throw new Exception('Customer\'s email is not provided.');
} }
@ -163,7 +163,7 @@ class Customers_Model extends CI_Model {
*/ */
public function find_record_id($customer) public function find_record_id($customer)
{ {
if ( ! isset($customer['email'])) if (empty($customer['email']))
{ {
throw new Exception('Customer\'s email was not provided: ' throw new Exception('Customer\'s email was not provided: '
. print_r($customer, TRUE)); . print_r($customer, TRUE));
@ -216,9 +216,10 @@ class Customers_Model extends CI_Model {
$phone_number_required = $query->num_rows() > 0 ? $query->row() === '1' : false; $phone_number_required = $query->num_rows() > 0 ? $query->row() === '1' : false;
// Validate required fields // Validate required fields
if ( ! isset($customer['last_name']) if ( empty($customer['first_name'])
|| ! isset($customer['email']) || empty($customer['last_name'])
|| (!isset($customer['phone_number']) && $phone_number_required)) || empty($customer['email'])
|| (empty($customer['phone_number']) && $phone_number_required))
{ {
throw new Exception('Not all required fields are provided: ' throw new Exception('Not all required fields are provided: '
. print_r($customer, TRUE)); . print_r($customer, TRUE));