Merge branch 'jansa'

admin/application/models/Webservice_model.php

@@ -3240,6 +3240,7 @@ class Webservice_model extends CI_Model {
 		//$this->db->select('id,type,message,read_status');
 		//SELECT IIF(Obsolete = 'N' or InStock = 'Y', 1, 0) as Saleable, * FROM Product
 		$this->db->select("read_status,id,type,message");
+		$this->db->order_by('tbl_doctor_notifications.id','DESC');
 		$this->db->limit($per_page,$start);
 		$result = $this->db->get_where('tbl_doctor_notifications',array('doctor_id'=>$doctorid))->result();
 		//echo $this->db->last_query();exit();

application/controllers/Printer.php

@@ -259,7 +259,7 @@ class Printer extends CI_Controller {
 							<h5 style="margin:0px;font-size: 14px;"><b>'.$bud_quantity.' - '.$bud_procedure.'</b></h5>
 						</td>
 						<td style="padding:15px;padding-left: 0px;border-bottom:1px solid #a8a8a8;">
-							<h5 style="margin:0px;font-size: 14px;text-align: right;"><b>R$'.$bud_amount.'</b></h5>
+							<h5 style="margin:0px;font-size: 14px;text-align: right;"><b>R$ '.$bud_amount.'</b></h5>
 
 						</td>
 					</tr>';

application/models/Doctor_model.php

@@ -838,12 +838,15 @@ public function get_wallet_for_doctor($doc_id)
 	$this->db->from('tbl_wallet_details');
 	$this->db->where('doctor_id',$doc_id);
 	$query = $this->db->get();
+	$query['reedem_earn'] = decrypt_data($query['reedem_earn']);
+	$query['future_earn'] = decrypt_data($query['future_earn']);
+	$query['total_earn'] = decrypt_data($query['total_earn']);
 	return $query->row_array();
 }
 
 public function update_wallet($id,$data)
 {
-	$sql = $this->db->insert_string('tbl_wallet_details', array("doctor_id"=>$id,"reedem_earn"=>$data['reedem_earn'],"future_earn"=>$data['future_earn'],"total_earn"=>$data['total_earn'])) . ' ON DUPLICATE KEY UPDATE doctor_id = ' .$id.',reedem_earn ='.'"' .$data['reedem_earn'].'"'.',future_earn='.$data['future_earn'].',total_earn='.$data['total_earn'];
+	$sql = $this->db->insert_string('tbl_wallet_details', array("doctor_id"=>$id,"reedem_earn"=>encrypt_data($data['reedem_earn']),"future_earn"=>encrypt_data($data['future_earn']),"total_earn"=>encrypt_data($data['total_earn']))) . ' ON DUPLICATE KEY UPDATE doctor_id = ' .$id.',reedem_earn ='.'"' .encrypt_data($data['reedem_earn']).'"'.',future_earn='.'"' .encrypt_data($data['future_earn']).'"' .',total_earn='. '"' .$data['total_earn'].'"';
 		//print_r($this->db->last_sqlquery());die();
 		if($this->db->query($sql)){
 			$return_array = array('status'=>'success');