Merge branch 'master' into 'dev_production'

application/models/Api_model.php

@@ -42,14 +42,14 @@ class Api_model extends CI_Model {
 
  	function register($data) {
  		try{
+ 			$data['phone_code'] = '966';
  			$email = $data['email_id'];
  			$phone = preg_replace('/\D/', '', $data['phone']);
  			$phone_code = preg_replace('/\D/', '', $data['phone_code']);
 
  			$sql = "SELECT * FROM customer 
 				    INNER JOIN `users` ON users.id=customer.customer_id 
-				    WHERE users.status!='2' AND (customer.email = '$email' OR 
-				  		  (customer.phone_code='$phone_code' AND customer.phone LIKE '%$phone'))";
+				    WHERE users.status!='2' AND (customer.email = '$email' OR customer.phone LIKE '%$phone')";
  			$res_count = $this->db->query($sql)->row();
 
  			if(count($res_count) > 0) {

application/models/Validation_model.php

@@ -47,13 +47,14 @@ class Validation_model extends CI_Model {
 					'code' => 'ER04',
 					'message' => 'Password is null or empty'
 				) ,
-			) ,
-			'phone_code' => array(
-				'required' => array(
-					'code' => 'ER05',
-					'message' => 'ISD Code is null or empty'
-				) ,
-			)
+			) 
+			// ,
+			// 'phone_code' => array(
+			// 	'required' => array(
+			// 		'code' => 'ER05',
+			// 		'message' => 'ISD Code is null or empty'
+			// 	) ,
+			// )
 		) ,
 		'forgot' => array(
 			'email_id' => array(