Merge branch 'jansa'

application/views/search_doctor_complete_profile.php

@@ -35,14 +35,21 @@
             <div class="ip_profile_details_listing">
                 <li><?php load_language('email');?>:<strong><?php echo $doctor_data['dr_email'];?></strong></li>
                 <!-- <li>Birthday:<strong><?php echo date('d F Y',$doctor_data["dr_dob"]);?></strong></li> -->
-                <li><?php load_language('clinic');?>:<strong><?php echo $doctor_data['clinic_name'];?>,<?php echo $doctor_data['clinic_street_address'];?> <?php echo $doctor_data['clinic_locality'];?></strong></li>
+                <li><?php load_language('clinic');?>:<strong><?php echo $doctor_data['clinic_name'];?>,
+                  <?php if($doctor_data['clinic_name'] == 'Default'){ ?>
+
+                  <?php echo decrypt_data($doctor_data['clinic_street_address']);?> <?php echo decrypt_data($doctor_data['clinic_locality']);?>
+                    <?php }else{ ?>
+                    <?php echo $doctor_data['clinic_street_address'];?> <?php echo $doctor_data['clinic_locality'];?>
+                    <?php }?>
+                  </strong></li>
                 <div class="clear"></div>
             </div>
             <hr>
             <div class="ip_profile_bio">
 
               <h6 class="uppercase"><?php load_language('biography');?></h6>
-              <p><?php echo encrypt_data($doctor_data['dr_bio']);?></p>
+              <p><?php echo decrypt_data($doctor_data['dr_bio']);?></p>
                 
             </div>
             <div class="ip_profile_others">

application/views/search_doctor_confirm_booking.php

@@ -36,7 +36,13 @@ if($this->session->userdata('language') == 'en'){
             </div>
             <h5><strong><?php echo $doctor_data['dr_name']?></strong></h5>
             <p><?php echo $doctor_data['dr_specialization']?></p>
-            <p><?php echo $doctor_data['clinic_name']?>,<?php echo $doctor_data['clinic_street_address']?>,<?php echo $doctor_data['clinic_locality']?>-<?php echo $doctor_data['clinic_cep']?></p>
+            <p><?php echo $doctor_data['clinic_name']?>,
+              <?php if($doctor_data['clinic_name'] == 'Default'){?>
+              <?php echo decrypt_data($doctor_data['clinic_street_address'])?>,<?php echo decrypt_data($doctor_data['clinic_locality'])?>-<?php echo decrypt_data($doctor_data['clinic_cep'])?>
+                <?php } else{?>
+                 <?php echo $doctor_data['clinic_street_address']?>,<?php echo $doctor_data['clinic_locality']?>-<?php echo $doctor_data['clinic_cep']?>
+                <?php }?>
+              </p>
             <div class="ip_profile_ratting">
              <!--  <fieldset class="ip_rating">
                 <input type="radio" id="star5" name="rating" value="5" /><label class = "full" for="star5" title="Awesome - 5 stars"></label>