Merge branch 'jansa'

admin/application/controllers/Webservice.php

@@ -2875,13 +2875,14 @@ print_r(date('H:i',$ms));exit();*/
 		if(isset($headers['Auth']) && strlen($headers['Auth'])) {
 			$check_authToken = $this->Webservice_model->check_auth_token($headers['Auth']);
 			if($check_authToken){
-				if(isset($data['card_number']) && strlen(trim($data['card_number']," ")) > 0 && isset($data['card_holder_name']) && strlen(trim($data['card_holder_name']," ")) > 0 && isset($data['card_expiry_month']) && strlen(trim($data['card_expiry_month']," ")) > 0 && isset($data['card_expiry_year']) && strlen(trim($data['card_expiry_year']," ")) > 0 && isset($data['card_cvv']) && strlen(trim($data['card_cvv']," ")) > 0){
+				if(isset($data['card_number']) && strlen(trim($data['card_number']," ")) > 0 && isset($data['card_holder_name']) && strlen(trim($data['card_holder_name']," ")) > 0 && isset($data['second_name']) && strlen(trim($data['second_name']," ")) > 0 && isset($data['card_expiry_month']) && strlen(trim($data['card_expiry_month']," ")) > 0 && isset($data['card_expiry_year']) && strlen(trim($data['card_expiry_year']," ")) > 0 && isset($data['card_cvv']) && strlen(trim($data['card_cvv']," ")) > 0){
 					$auth_result = $this->Webservice_model->get_userid_frm_authtoken($headers['Auth']);
 					$data['user_id'] = $auth_result->userid;
 					$acnt_no = str_split($data['card_number'], 4);
 					$data['hash_account_numer'] = 'xxxx-xxxx-xxxx-'.$acnt_no[3];
 					$data['card_number'] = encrypt_data($data['card_number']);
 					$data['card_holder_name'] = encrypt_data($data['card_holder_name']);
+					$data['second_name'] = encrypt_data($data['second_name']);
 					$data['card_expiry_month'] = encrypt_data($data['card_expiry_month']);
 					$data['card_expiry_year'] = encrypt_data($data['card_expiry_year']);
 					$data['card_cvv'] = encrypt_data($data['card_cvv']);
@@ -5187,7 +5188,7 @@ print_r(date('H:i',$ms));exit();*/
 					$total_count = 0;
 				}
 					$notifArray = array();
-					if(count($result) > 0){
+					if($result != false){
 						$total = count($result);
 					}else{
 						$total = 0;
@@ -5971,9 +5972,13 @@ print_r(date('H:i',$ms));exit();*/
 					$new = array();
 					$authtoken = $this->Webservice_model->get_doctorid_frm_authtoken($headers['Auth']);
 					if(isset($_FILES['photo'])){
+						//echo "s";
 						if (!is_dir("./../assets/uploads/medicalrecord/booking".$data['booking_id'])) {
+							//echo "ssss";
 							mkdir("./../assets/uploads/medicalrecord/booking".$data['booking_id'], "0777",true);
 						}
+						//print_r($_FILES['photo']);
+						//exit();
 						$files = $_FILES;
 						$config = set_upload_options('./../assets/uploads/medicalrecord/booking'.$data['booking_id']); 
 						$this->load->library('upload', $config);

admin/application/models/Webservice_model.php

@@ -2453,6 +2453,7 @@ class Webservice_model extends CI_Model {
 				$new[$key]['card_holder_name'] = decrypt_data($value['card_holder_name']);
 				$new[$key]['card_validity'] = $value['validity'];
 				$new[$key]['card_number'] = decrypt_data($value['card_number']);
+				$new[$key]['second_name'] = decrypt_data($value['second_name']);
 
 			}
 			$res = array('status'=>'success','data'=>array('card_list'=>$new));