Merge branch 'jansa'

admin/application/models/Webservice_model.php

@@ -2269,10 +2269,10 @@ CASE when tbl_doctors.gender='0' then 'MALE' when tbl_doctors.gender='1' then 'F
 			$doctors = explode(',',$query->doctor_id);
 			$new_array = array();
 			foreach ($doctors as $key => $value) {
-				$this->db->select("tbl_doctors.name as doctor_name,
+				$this->db->select("DISTINCT(tbl_clinic_doctors.clinic_id),tbl_doctors.name as doctor_name,
 					tbl_doctors.price as fee,
 					tbl_doctors.id as doctor_id,
-					tbl_doctors.online_status as status,tbl_clinic_doctors.clinic_id,
+					tbl_doctors.online_status as status,
 					tbl_doctors.profile_pic as doctor_image,
 					tbl_specialization.specialization_name as doctor_speciality,case when tbl_clinic_doctors.clinic_id != '0' then 
 					ROUND(( 6371 * acos( cos( radians({$lat}) ) * cos( radians( `tbl_clinic`.`location_lattitude` ) ) * cos( radians( `tbl_clinic`.`location_longitude` ) - radians({$lng}) ) + sin( radians({$lat}) ) * sin( radians( `tbl_clinic`.`location_lattitude` ) ) ) )) else ROUND(( 6371 * acos( cos( radians({$lat}) ) * cos( radians( `tbl_doctors`.`default_latitude` ) ) * cos( radians( `tbl_doctors`.`default_longitude` ) - radians({$lng}) ) + sin( radians({$lat}) ) * sin( radians( `tbl_doctors`.`default_latitude` ) ) ) )) end AS distance");

application/views/contactus.php

@@ -63,7 +63,7 @@
           <!--   <?php
                 }
               ?> -->
-            <li><a class="uppercase" href="<?php echo base_url()?>Home/contact"><?php load_language('contact_us');?></a></li> 
+           <!--  <li><a class="uppercase" href="<?php echo base_url()?>Home/contact"><?php load_language('contact_us');?></a></li>  -->
           </ul>
 
           <ul class="nav navbar-right ip_nav_bar_right">