Merge branch 'jansa'

admin/application/controllers/Settings.php

@@ -30,7 +30,6 @@ class Settings extends CI_Controller {
  			$updateArray['site_title'] = encrypt_data($updateArray['smtp_host']);
  			$updateArray['smtp_username'] = encrypt_data($updateArray['smtp_username']);
  			$updateArray['smtp_password'] = encrypt_data($updateArray['smtp_password']);
- 			$updateArray['ipok_fee'] = encrypt_data($updateArray['ipok_fee']);
  			$result = $this->Settings_model->update_sitetitle($updateArray);
  			if($result){
  				$this->session->set_flashdata('message', array('message' => 'Successfully Changed', 'title' => 'Success !', 'class' => 'success'));

admin/application/controllers/Webservice.php

@@ -5658,14 +5658,14 @@ print_r(date('H:i',$ms));exit();*/
 
 	}
 
-/*	public function encrypt_data(){
-		$data = 'Leg fracture';
+	public function encrypt_data(){
+		$data = '20';
 		$new = encrypt_data($data);
 		$neww = decrypt_data($new);
 		print_r($new);echo"<br>";
 		print_r($neww);
 		exit();
-	}*/
+	}
 
 	public function set_prescriptions(){
 		header('Content-type: application/json');

admin/application/views/settings.php

@@ -77,7 +77,7 @@
                 <div class="row">
                 	<div class="form-group col-xs-4">
                       <br><label>IPOK Fee(in %)</label>
-                      <?php $ipok_fee =decrypt_data($data['ipok_fee']); ?>
+                      <?php $ipok_fee =$data['ipok_fee']; ?>
                       <input type="text" name="ipok_fee" class="form-control required" placeholder="Enter IPOK Fee" value="<?php echo $ipok_fee;?>">
                     </div>