bukng apyment

admin/application/models/Webservice_model.php

@@ -1069,7 +1069,7 @@ class Webservice_model extends CI_Model {
 					}
 				}
 				
-				if(!$is_payment_required){
+				//if(!$is_payment_required){
 					$this->db->insert('tbl_patient_notification',array('patient_id'=>$patientid['userid'],'type'=>'0','message'=>$msg,'time'=>$conslt_time,'booking_id'=>$insert_id,'read_status'=>'0'));
 					$patient_insert_id = $this->db->insert_id();
 
@@ -1097,7 +1097,7 @@ class Webservice_model extends CI_Model {
 					$news['to'] = $fcm_doctor->fcm_token;
 					$doctor_type = '2';
 					$doctor_push = $this->push_sent($news,$doctor_type);
-				}
+				//}
 				$return_array = array('status'=>'success','data'=>array('booking_id'=>$insert_id,'is_waiting'=>false,'is_payment_required'=>$is_payment_required));
 			}
 			else{
@@ -1112,7 +1112,7 @@ class Webservice_model extends CI_Model {
 			$msg = "Your booking for doctor ".$doctr_data['name']." at time ".$data['time']." is in Waiting list";
 			if($this->db->insert('tbl_booking',array('doctor_id'=>$data['doctor_id'],'clinic_id'=>$data['clinic_id'],'patient_id'=>$patientid['userid'],'ipok_fee'=>$ipokefees,'date'=>$data['date'],'time'=>$data['time'],'booking_status'=>'0','payment_status'=>$payment_status,'free_visit_status'=>$free_visit_status,'visit_type'=>$visit,'amount'=>$data['amount'],'promo_name'=>$promo_name,'promo_amount'=>$new_amnt,'payment_type'=>$data['payment_mode'],'total_sum'=>$diff,'time_start'=>$start_time,'time_end'=>$end_time,'requested_date'=>time()))){
 				$insert_id = $this->db->insert_id();
-				if(!$is_payment_required){
+				//if(!$is_payment_required){
 					$this->db->insert('tbl_patient_notification',array('patient_id'=>$patientid['userid'],'type'=>'1','message'=>$msg,'time'=>$conslt_time,'booking_id'=>$insert_id,'read_status'=>'0'));
 					$patient_insert_id = $this->db->insert_id();
 
@@ -1129,7 +1129,7 @@ class Webservice_model extends CI_Model {
 					$new['to'] =$fcm_user->fcm_token;
 					$user_type = '3';
 	                $user_push = $this->push_sent($new,$user_type);
-				}
+				//}
 			$return_array = array('status'=>'failed','data' =>array('booking_id'=>$insert_id,'is_waiting'=>true,'is_payment_required'=>$is_payment_required));
 		}
 
@@ -2663,10 +2663,23 @@ class Webservice_model extends CI_Model {
 		$this->db->select('tbl_clinic.id,tbl_clinic.name,tbl_clinic.email,tbl_clinic.profile_photo,tbl_clinic.location_lattitude,tbl_clinic.location_longitude,tbl_clinic.street_address,tbl_clinic.locality,tbl_clinic.number,tbl_clinic.complement');
 		$this->db->join('tbl_clinic','tbl_clinic_doctors.clinic_id = tbl_clinic.id');
 		$this->db->where('tbl_clinic_doctors.doctor_id',$id);
+		$this->db->order_by('tbl_clinic.id','ASC');
 		$query = $this->db->get('tbl_clinic_doctors')->result();
+		array_splice($query, 0, 1);
+		
 
-		if(count($query) > 0){
-			foreach ($query as $key => $value) {
+		$this->db->select('tbl_clinic.id,tbl_clinic.name,tbl_clinic.email,tbl_clinic.profile_photo,tbl_doctors.default_latitude as location_lattitude,tbl_doctors.default_longitude as location_longitude,tbl_doctors.street_address,tbl_doctors.locality,tbl_doctors.number,tbl_doctors.complement');
+		$this->db->from('tbl_clinic_doctors');
+		$this->db->join('tbl_clinic','tbl_clinic_doctors.clinic_id = tbl_clinic.id');
+		$this->db->join('tbl_doctors','tbl_clinic_doctors.doctor_id = tbl_doctors.id');
+		$this->db->where('tbl_clinic_doctors.clinic_id','0');
+		$this->db->where('tbl_clinic_doctors.doctor_id',$id);
+		$query_default = $this->db->get()->result();
+		$new_query = array_merge($query_default,$query);
+
+		//echo"<pre>";print_r($new_query);exit();
+		if(count($new_query) > 0){
+			foreach ($new_query as $key => $value) {
 				$location = $value->street_address.','.$value->locality.','.$value->number.','.$value->complement;
 				$new[$key]['id'] = $value->id;
 				$new[$key]['name'] = $value->name;

application/views/doctor_editprofile.php

@@ -96,8 +96,8 @@
 							<p class="ip_row_p"><?php load_language('gender');?></p>
 									<div class="ip_bank_detail_frame">
 										<select name="gender" class="ip_bank_input" id="doc-edt-gender" data-parsley-required="true" placeholder="">
-											<option value="MALE"><?php load_language('male');?>Male</option>
-											<option value="FEMALE"><?php load_language('female');?>Female</option>
+											<option value="MALE"><?php load_language('male');?></option>
+											<option value="FEMALE"><?php load_language('female');?></option>
 											<option value="OTHERS"><?php load_language('others');?></option>
 										</select>
 									</div>