Skip to content

I
IPok_Web
Commit d92b5e65 by Dixon Joseph
Options

Merge branch 'jansa' into dixon

parents 815380d3 62854362
Showing with 116 additions and 74 deletions
application/controllers/Doctor.php
...@@ -701,11 +701,11 @@ public function loadrecord() ...@@ -701,11 +701,11 @@ public function loadrecord()
if(!empty($record_data)) if(!empty($record_data))
{ {
$record_data['diseases'] = json_decode($record_data['diseases']); $record_data['diseases'] = json_decode(decrypt_data($record_data['diseases']));
$record_data['prescribtions'] = json_decode($record_data['prescribtions']); $record_data['prescribtions'] = json_decode(decrypt_data($record_data['prescribtions']));
$record_data['exams'] = json_decode($record_data['exams']); $record_data['exams'] = json_decode(decrypt_data($record_data['exams']));
$record_data['budget'] = json_decode($record_data['budget']); $record_data['budget'] = json_decode(decrypt_data($record_data['budget']));
$record_data['letters'] = json_decode($record_data['letters']); $record_data['letters'] = json_decode(decrypt_data($record_data['letters']));
} }
$template['booking_details'] = $booking_details; $template['booking_details'] = $booking_details;
...@@ -1057,7 +1057,7 @@ public function save_medicalrecord_data() ...@@ -1057,7 +1057,7 @@ public function save_medicalrecord_data()
$nowin_server_addoffset = date('Y-m-d H:i:s',strtotime('-'.$offset->hour.' hour -'.$offset->minute.' minutes',strtotime($nowin_server))); $nowin_server_addoffset = date('Y-m-d H:i:s',strtotime('-'.$offset->hour.' hour -'.$offset->minute.' minutes',strtotime($nowin_server)));
} }
$insert_array['patient_review'] = $_POST['review']; $insert_array['patient_review'] = encrypt_data($_POST['review']);
$update = $this->Doctor_model->update_records($_POST['booking_id'],$insert_array); $update = $this->Doctor_model->update_records($_POST['booking_id'],$insert_array);
if($update) if($update)
......
application/controllers/Home.php
...@@ -1506,7 +1506,7 @@ class Home extends CI_Controller { ...@@ -1506,7 +1506,7 @@ class Home extends CI_Controller {
$userdata = $this->session->userdata('UserData'); $userdata = $this->session->userdata('UserData');
$_POST['msg'] = $this->encrypt->encode($_POST['msg']); $_POST['msg'] = $_POST['msg'];
$this->Home_model->update_recent_chat($_POST); $this->Home_model->update_recent_chat($_POST);
$recent = $this->Home_model->get_recent_chat($userdata['id'],$userdata['type']); $recent = $this->Home_model->get_recent_chat($userdata['id'],$userdata['type']);
......
application/controllers/Patient.php
...@@ -712,11 +712,11 @@ public function record() ...@@ -712,11 +712,11 @@ public function record()
$patient_data = $this->Patient_model->get_single_patient($booking_details['pat_id']); $patient_data = $this->Patient_model->get_single_patient($booking_details['pat_id']);
$record_data['diseases'] = json_decode($record_data['diseases']); $record_data['diseases'] = json_decode(decrypt_data($record_data['diseases']));
$record_data['prescribtions'] = json_decode($record_data['prescribtions']); $record_data['prescribtions'] = json_decode(decrypt_data($record_data['prescribtions']));
$record_data['exams'] = json_decode($record_data['exams']); $record_data['exams'] = json_decode(decrypt_data($record_data['exams']));
$record_data['budget'] = json_decode($record_data['budget']); $record_data['budget'] = json_decode(decrypt_data($record_data['budget']));
$record_data['letters'] = json_decode($record_data['letters']); $record_data['letters'] = json_decode(decrypt_data($record_data['letters']));
//print_r($record_data);die(); //print_r($record_data);die();
......
application/controllers/Printer.php
...@@ -34,10 +34,10 @@ class Printer extends CI_Controller { ...@@ -34,10 +34,10 @@ class Printer extends CI_Controller {
$doctor_data = $this->Doctor_model->get_single_doctor($record_data['doctor_id']); $doctor_data = $this->Doctor_model->get_single_doctor($record_data['doctor_id']);
$booking_data = $this->Patient_model->get_Booking($record_data['booking_id']); $booking_data = $this->Patient_model->get_Booking($record_data['booking_id']);
// /print_r($record_data);die(); // /print_r($record_data);die();
$diseases = json_decode($record_data['diseases']); $diseases = json_decode(decrypt_data($record_data['diseases']));
$prescription = json_decode($record_data['prescribtions']); $prescription = json_decode(decrypt_data($record_data['prescribtions']));
$exams = json_decode($record_data['exams']); $exams = json_decode(decrypt_data($record_data['exams']));
$budget = json_decode($record_data['budget']); $budget = json_decode(decrypt_data($record_data['budget']));
//print_r($budget);die(); //print_r($budget);die();
...@@ -59,7 +59,7 @@ class Printer extends CI_Controller { ...@@ -59,7 +59,7 @@ class Printer extends CI_Controller {
<tbody> <tbody>
<tr> <tr>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Name</b></td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Name</b></td>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;">'.$patient_data['pt_name'].'</td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;">'.decrypt_data($patient_data['pt_name']).'</td>
</tr> </tr>
<tr> <tr>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Vist Date</b></td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Vist Date</b></td>
...@@ -84,7 +84,7 @@ class Printer extends CI_Controller { ...@@ -84,7 +84,7 @@ class Printer extends CI_Controller {
<tbody> <tbody>
<tr> <tr>
<td style="padding:5px;font-size: 15px;padding-left: 0px;"> <td style="padding:5px;font-size: 15px;padding-left: 0px;">
<p style="margin:0px;padding-top: 10px;"><b>'.$record_data['main_complaint'].'</b></p> <p style="margin:0px;padding-top: 10px;"><b>'.decrypt_data($record_data['main_complaint']).'</b></p>
</td> </td>
</tr>'; </tr>';
if(!empty($record_data['description'])) if(!empty($record_data['description']))
...@@ -92,7 +92,7 @@ class Printer extends CI_Controller { ...@@ -92,7 +92,7 @@ class Printer extends CI_Controller {
$html = $html.'<tr> $html = $html.'<tr>
<td style="padding:8px;padding-left: 0px;"> <td style="padding:8px;padding-left: 0px;">
<h5 style="margin:0px;font-size: 14px;"><b>Description</b></h5> <h5 style="margin:0px;font-size: 14px;"><b>Description</b></h5>
<p style="margin:0px;padding-top: 10px;padding-bottom:10px;font-size: 13px;">'.$record_data['description'].'</p> <p style="margin:0px;padding-top: 10px;padding-bottom:10px;font-size: 13px;">'.decrypt_data($record_data['description']).'</p>
</td> </td>
</tr>'; </tr>';
} }
...@@ -222,7 +222,7 @@ class Printer extends CI_Controller { ...@@ -222,7 +222,7 @@ class Printer extends CI_Controller {
<td style="padding:8px;padding-left: 0px;"> <td style="padding:8px;padding-left: 0px;">
<p style="margin:0px;padding-top: 10px;padding-bottom:10px;font-size: 13px;"> <p style="margin:0px;padding-top: 10px;padding-bottom:10px;font-size: 13px;">
'.$record_data['letters'].' '.decrypt_data($record_data['letters']).'
</p> </p>
</td> </td>
</tr> </tr>
...@@ -288,7 +288,7 @@ class Printer extends CI_Controller { ...@@ -288,7 +288,7 @@ class Printer extends CI_Controller {
<tr> <tr>
<td style="padding:8px;padding-left: 0px;"> <td style="padding:8px;padding-left: 0px;">
<p style="margin:0px;padding-top: 10px;padding-bottom:10px;font-size: 13px;"> <p style="margin:0px;padding-top: 10px;padding-bottom:10px;font-size: 13px;">
'.$record_data['patient_review'].' '.decrypt_data($record_data['patient_review']).'
</p> </p>
</td> </td>
</tr> </tr>
...@@ -331,7 +331,7 @@ class Printer extends CI_Controller { ...@@ -331,7 +331,7 @@ class Printer extends CI_Controller {
$booking_data = $this->Patient_model->get_Booking($record_data['booking_id']); $booking_data = $this->Patient_model->get_Booking($record_data['booking_id']);
// /print_r($record_data);die(); // /print_r($record_data);die();
$prescription = json_decode($record_data['prescribtions']); $prescription = json_decode(decrypt_data($record_data['prescribtions']));
// Set some content to print // Set some content to print
$html = ' $html = '
...@@ -349,7 +349,7 @@ class Printer extends CI_Controller { ...@@ -349,7 +349,7 @@ class Printer extends CI_Controller {
<tbody> <tbody>
<tr> <tr>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Name</b></td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Name</b></td>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;">'.$patient_data['pt_name'].'</td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;">'.decrypt_data($patient_data['pt_name']).'</td>
</tr> </tr>
<tr> <tr>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Vist Date</b></td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Vist Date</b></td>
...@@ -431,7 +431,7 @@ class Printer extends CI_Controller { ...@@ -431,7 +431,7 @@ class Printer extends CI_Controller {
// /print_r($record_data);die(); // /print_r($record_data);die();
$exams = json_decode($record_data['exams']); $exams = json_decode(decrypt_data($record_data['exams']));
// Set some content to print // Set some content to print
$html = ' $html = '
...@@ -449,7 +449,7 @@ class Printer extends CI_Controller { ...@@ -449,7 +449,7 @@ class Printer extends CI_Controller {
<tbody> <tbody>
<tr> <tr>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Name</b></td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Name</b></td>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;">'.$patient_data['pt_name'].'</td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;">'.decrypt_data($patient_data['pt_name']).'</td>
</tr> </tr>
<tr> <tr>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Vist Date</b></td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Vist Date</b></td>
...@@ -522,7 +522,7 @@ class Printer extends CI_Controller { ...@@ -522,7 +522,7 @@ class Printer extends CI_Controller {
$booking_data = $this->Patient_model->get_Booking($record_data['booking_id']); $booking_data = $this->Patient_model->get_Booking($record_data['booking_id']);
// /print_r($record_data);die(); // /print_r($record_data);die();
$budget = json_decode($record_data['budget']); $budget = json_decode(decrypt_data($record_data['budget']));
// Set some content to print // Set some content to print
$html = ' $html = '
...@@ -540,7 +540,7 @@ class Printer extends CI_Controller { ...@@ -540,7 +540,7 @@ class Printer extends CI_Controller {
<tbody> <tbody>
<tr> <tr>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Name</b></td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Name</b></td>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;">'.$patient_data['pt_name'].'</td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;">'.decrypt_data($patient_data['pt_name']).'</td>
</tr> </tr>
<tr> <tr>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Vist Date</b></td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Vist Date</b></td>
...@@ -644,7 +644,7 @@ class Printer extends CI_Controller { ...@@ -644,7 +644,7 @@ class Printer extends CI_Controller {
<tbody> <tbody>
<tr> <tr>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Name</b></td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Name</b></td>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;">'.$patient_data['pt_name'].'</td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;">'.decrypt_data($patient_data['pt_name']).'</td>
</tr> </tr>
<tr> <tr>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Vist Date</b></td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Vist Date</b></td>
...@@ -679,7 +679,7 @@ class Printer extends CI_Controller { ...@@ -679,7 +679,7 @@ class Printer extends CI_Controller {
<td style="padding:8px;padding-left: 0px;"> <td style="padding:8px;padding-left: 0px;">
<p style="margin:0px;padding-top: 10px;padding-bottom:10px;font-size: 13px;"> <p style="margin:0px;padding-top: 10px;padding-bottom:10px;font-size: 13px;">
'.$record_data['letters'].' '.decrypt_data($record_data['letters']).'
</p> </p>
</td> </td>
</tr> </tr>
......
application/controllers/Sentmail.php
...@@ -34,10 +34,10 @@ class Sentmail extends CI_Controller { ...@@ -34,10 +34,10 @@ class Sentmail extends CI_Controller {
$doctor_data = $this->Doctor_model->get_single_doctor($record_data['doctor_id']); $doctor_data = $this->Doctor_model->get_single_doctor($record_data['doctor_id']);
$booking_data = $this->Patient_model->get_Booking($record_data['booking_id']); $booking_data = $this->Patient_model->get_Booking($record_data['booking_id']);
// /print_r($record_data);die(); // /print_r($record_data);die();
$diseases = json_decode($record_data['diseases']); $diseases = json_decode(decrypt_data($record_data['diseases']));
$prescription = json_decode($record_data['prescribtions']); $prescription = json_decode(decrypt_data($record_data['prescribtions']));
$exams = json_decode($record_data['exams']); $exams = json_decode(decrypt_data($record_data['exams']));
$budget = json_decode($record_data['budget']); $budget = json_decode(decrypt_data($record_data['budget']));
//print_r($budget);die(); //print_r($budget);die();
...@@ -59,7 +59,7 @@ class Sentmail extends CI_Controller { ...@@ -59,7 +59,7 @@ class Sentmail extends CI_Controller {
<tbody> <tbody>
<tr> <tr>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Name</b></td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Name</b></td>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;">'.$patient_data['pt_name'].'</td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;">'.decrypt_data($patient_data['pt_name']).'</td>
</tr> </tr>
<tr> <tr>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Vist Date</b></td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Vist Date</b></td>
...@@ -84,7 +84,7 @@ class Sentmail extends CI_Controller { ...@@ -84,7 +84,7 @@ class Sentmail extends CI_Controller {
<tbody> <tbody>
<tr> <tr>
<td style="padding:5px;font-size: 15px;padding-left: 0px;"> <td style="padding:5px;font-size: 15px;padding-left: 0px;">
<p style="margin:0px;padding-top: 10px;"><b>'.$record_data['main_complaint'].'</b></p> <p style="margin:0px;padding-top: 10px;"><b>'.decrypt_data($record_data['main_complaint']).'</b></p>
</td> </td>
</tr>'; </tr>';
if(!empty($record_data['description'])) if(!empty($record_data['description']))
...@@ -92,7 +92,7 @@ class Sentmail extends CI_Controller { ...@@ -92,7 +92,7 @@ class Sentmail extends CI_Controller {
$html = $html.'<tr> $html = $html.'<tr>
<td style="padding:8px;padding-left: 0px;"> <td style="padding:8px;padding-left: 0px;">
<h5 style="margin:0px;font-size: 14px;"><b>Description</b></h5> <h5 style="margin:0px;font-size: 14px;"><b>Description</b></h5>
<p style="margin:0px;padding-top: 10px;padding-bottom:10px;font-size: 13px;">'.$record_data['description'].'</p> <p style="margin:0px;padding-top: 10px;padding-bottom:10px;font-size: 13px;">'.decrypt_data($record_data['description']).'</p>
</td> </td>
</tr>'; </tr>';
} }
...@@ -220,7 +220,7 @@ class Sentmail extends CI_Controller { ...@@ -220,7 +220,7 @@ class Sentmail extends CI_Controller {
<tr> <tr>
<td style="padding:8px;padding-left: 0px;"> <td style="padding:8px;padding-left: 0px;">
<p style="margin:0px;padding-top: 10px;padding-bottom:10px;font-size: 13px;"> <p style="margin:0px;padding-top: 10px;padding-bottom:10px;font-size: 13px;">
'.$record_data['letters'].' '.decrypt_data($record_data['letters']).'
</p> </p>
</td> </td>
</tr> </tr>
...@@ -285,7 +285,7 @@ class Sentmail extends CI_Controller { ...@@ -285,7 +285,7 @@ class Sentmail extends CI_Controller {
<tr> <tr>
<td style="padding:8px;padding-left: 0px;"> <td style="padding:8px;padding-left: 0px;">
<p style="margin:0px;padding-top: 10px;padding-bottom:10px;font-size: 13px;"> <p style="margin:0px;padding-top: 10px;padding-bottom:10px;font-size: 13px;">
'.$record_data['patient_review'].' '.decrypt_data($record_data['patient_review']).'
</p> </p>
</td> </td>
</tr> </tr>
...@@ -333,7 +333,7 @@ class Sentmail extends CI_Controller { ...@@ -333,7 +333,7 @@ class Sentmail extends CI_Controller {
$booking_data = $this->Patient_model->get_Booking($record_data['booking_id']); $booking_data = $this->Patient_model->get_Booking($record_data['booking_id']);
// /print_r($record_data);die(); // /print_r($record_data);die();
$prescription = json_decode($record_data['prescribtions']); $prescription = json_decode(decrypt_data($record_data['prescribtions']));
// Set some content to print // Set some content to print
$html = ' $html = '
...@@ -351,7 +351,7 @@ class Sentmail extends CI_Controller { ...@@ -351,7 +351,7 @@ class Sentmail extends CI_Controller {
<tbody> <tbody>
<tr> <tr>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Name</b></td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Name</b></td>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;">'.$patient_data['pt_name'].'</td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;">'.decrypt_data($patient_data['pt_name']).'</td>
</tr> </tr>
<tr> <tr>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Vist Date</b></td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Vist Date</b></td>
...@@ -444,7 +444,7 @@ class Sentmail extends CI_Controller { ...@@ -444,7 +444,7 @@ class Sentmail extends CI_Controller {
// /print_r($record_data);die(); // /print_r($record_data);die();
$exams = json_decode($record_data['exams']); $exams = json_decode(decrypt_data($record_data['exams']));
// Set some content to print // Set some content to print
$html = ' $html = '
...@@ -462,7 +462,7 @@ class Sentmail extends CI_Controller { ...@@ -462,7 +462,7 @@ class Sentmail extends CI_Controller {
<tbody> <tbody>
<tr> <tr>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Name</b></td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Name</b></td>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;">'.$patient_data['pt_name'].'</td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;">'.decrypt_data($patient_data['pt_name']).'</td>
</tr> </tr>
<tr> <tr>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Vist Date</b></td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Vist Date</b></td>
...@@ -543,7 +543,7 @@ class Sentmail extends CI_Controller { ...@@ -543,7 +543,7 @@ class Sentmail extends CI_Controller {
$booking_data = $this->Patient_model->get_Booking($record_data['booking_id']); $booking_data = $this->Patient_model->get_Booking($record_data['booking_id']);
// /print_r($record_data);die(); // /print_r($record_data);die();
$budget = json_decode($record_data['budget']); $budget = json_decode(decrypt_data($record_data['budget']));
// Set some content to print // Set some content to print
$html = ' $html = '
...@@ -561,7 +561,7 @@ class Sentmail extends CI_Controller { ...@@ -561,7 +561,7 @@ class Sentmail extends CI_Controller {
<tbody> <tbody>
<tr> <tr>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Name</b></td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Name</b></td>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;">'.$patient_data['pt_name'].'</td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;">'.decrypt_data($patient_data['pt_name']).'</td>
</tr> </tr>
<tr> <tr>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Vist Date</b></td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Vist Date</b></td>
...@@ -671,7 +671,7 @@ class Sentmail extends CI_Controller { ...@@ -671,7 +671,7 @@ class Sentmail extends CI_Controller {
<tbody> <tbody>
<tr> <tr>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Name</b></td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Name</b></td>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;">'.$patient_data['pt_name'].'</td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;">'.decrypt_data($patient_data['pt_name']).'</td>
</tr> </tr>
<tr> <tr>
<td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Vist Date</b></td> <td style="border-bottom:1px solid #a8a8a8;padding:8px;font-size: 14px;padding-left: 0px;"><b>Vist Date</b></td>
...@@ -704,7 +704,7 @@ class Sentmail extends CI_Controller { ...@@ -704,7 +704,7 @@ class Sentmail extends CI_Controller {
<td style="padding:8px;padding-left: 0px;"> <td style="padding:8px;padding-left: 0px;">
<p style="margin:0px;padding-top: 10px;padding-bottom:10px;font-size: 13px;"> <p style="margin:0px;padding-top: 10px;padding-bottom:10px;font-size: 13px;">
'.$record_data['letters'].' '.decrypt_data($record_data['letters']).'
</p> </p>
</td> </td>
</tr> </tr>
......
application/models/Search_doctor_model.php
...@@ -96,6 +96,25 @@ public function doctor_search($post_data) ...@@ -96,6 +96,25 @@ public function doctor_search($post_data)
public function get_single_doctor_clinic($dctr_id,$clinic_id) public function get_single_doctor_clinic($dctr_id,$clinic_id)
{ {
// $this->db->select("tbl_doctors.id as doctorid,
// tbl_doctors.name as dr_name,
// tbl_doctors.profile_pic as dr_pic,
// tbl_doctors.email as dr_email,
// tbl_doctors.dob as dr_dob,
// tbl_doctors.about as dr_bio,
// tbl_doctors.price as dr_price,
// tbl_specialization.specialization_name AS dr_specialization,
// tbl_clinic.id AS clinic_id,
// tbl_clinic.name AS clinic_name,
// tbl_clinic.street_address AS clinic_street_address,
// tbl_clinic.locality AS clinic_locality,
// tbl_clinic.cep clinic_cep,
// tbl_clinic.number AS clinic_number,
// tbl_clinic.location_lattitude AS clinic_lat,
// tbl_clinic.location_longitude AS clinic_lng
// ");
$this->db->select("tbl_doctors.id as doctorid, $this->db->select("tbl_doctors.id as doctorid,
tbl_doctors.name as dr_name, tbl_doctors.name as dr_name,
tbl_doctors.profile_pic as dr_pic, tbl_doctors.profile_pic as dr_pic,
...@@ -106,12 +125,13 @@ public function get_single_doctor_clinic($dctr_id,$clinic_id) ...@@ -106,12 +125,13 @@ public function get_single_doctor_clinic($dctr_id,$clinic_id)
tbl_specialization.specialization_name AS dr_specialization, tbl_specialization.specialization_name AS dr_specialization,
tbl_clinic.id AS clinic_id, tbl_clinic.id AS clinic_id,
tbl_clinic.name AS clinic_name, tbl_clinic.name AS clinic_name,
tbl_clinic.street_address AS clinic_street_address, case when tbl_clinic_doctors.clinic_id != '0' then tbl_clinic.street_address else tbl_doctors.street_address end AS clinic_street_address,
tbl_clinic.locality AS clinic_locality, case when tbl_clinic_doctors.clinic_id != '0' then tbl_clinic.cep else tbl_doctors.cep end AS clinic_cep,
tbl_clinic.cep clinic_cep, case when tbl_clinic_doctors.clinic_id != '0' then tbl_clinic.locality else tbl_doctors.locality end AS clinic_locality,
tbl_clinic.number AS clinic_number, case when tbl_clinic_doctors.clinic_id != '0' then tbl_clinic.number else tbl_doctors.number end AS clinic_number,
tbl_clinic.location_lattitude AS clinic_lat, case when tbl_clinic_doctors.clinic_id != '0' then tbl_clinic.location_lattitude else tbl_doctors.default_latitude end AS clinic_lat,
tbl_clinic.location_longitude AS clinic_lng case when tbl_clinic_doctors.clinic_id != '0' then tbl_clinic.location_longitude else tbl_doctors.default_longitude end AS clinic_lng
"); ");
$this->db->from('tbl_doctors'); $this->db->from('tbl_doctors');
......
application/views/doctor_dash_start_service_summary.php
...@@ -272,7 +272,7 @@ ...@@ -272,7 +272,7 @@
</div> </div>
<div class="ip_profile_tab_name_detail"> <div class="ip_profile_tab_name_detail">
<p><strong> <p><strong>
<?php if(!empty($record_data['patient_review'])) {echo $record_data['patient_review']; } ?> <?php if(!empty($record_data['patient_review'])) {echo decrypt_data($record_data['patient_review']); } ?>
</strong></p> </strong></p>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
......
application/views/doctor_editprofile.php
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<p class="ip_row_p"><?php load_language('date_of_birth');?></p> <p class="ip_row_p"><?php load_language('date_of_birth');?></p>
<div class="ip_bank_detail_frame" id="edit-doctor"> <div class="ip_bank_detail_frame" id="edit-doctor">
<!-- <input class="ip_reg_form_input" type="text" form-control" placeholder=""> --> <!-- <input class="ip_reg_form_input" type="text" form-control" placeholder=""> -->
<input name="dob" readonly class="ip_reg_form_input form-control reset-form-custom background_transparent" data-parsley-required="true"> <input name="dob" readonly class="ip_reg_form_input form-control reset-form-custom background_transparent" data-parsley-required="true" value="<?php echo $doctor_data['dr_dob']?>">
</div> </div>
</div> </div>
</div> </div>
......
application/views/home.php
<?php if($this->session->userdata('UserData')) <?php if($this->session->userdata('UserData'))
{$userdata = $this->session->userdata('UserData');} {
$userdata = $this->session->userdata('UserData');
}
//echo "<pre>";print_r($userdata);
if(auto_logout("user_time")) if(auto_logout("user_time"))
{ {
$this->session->set_userdata('user_time', time()); $this->session->set_userdata('user_time', time());
......
application/views/patient_dash.php
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
</li> </li>
<li> <li>
<div class="child1"><?php load_language('complement');?> :</div> <div class="child1"><?php load_language('complement');?> :</div>
<div class="child2"><?php echo decrypt_data($patient_data['pt_complement'])?></div> <div class="child2"><?php echo decrypt_data($patient_data['pt_complement']);?></div>
<div class="clear"></div> <div class="clear"></div>
</li> </li>
......
application/views/patient_dash_service_summary.php
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<div id="record" class="tab-pane fade in active"> <div id="record" class="tab-pane fade in active">
<div class="ip_profile_tab_detail"> <div class="ip_profile_tab_detail">
<?php if(!empty($record_data['description']))echo $record_data['description'];?> <?php if(!empty($record_data['description']))echo decrypt_data($record_data['description']);?>
<br> <br>
<div class="ip_prescription_div"> <div class="ip_prescription_div">
<ul> <ul>
...@@ -256,7 +256,7 @@ ...@@ -256,7 +256,7 @@
<img src="<?php echo base_url();echo $patient_data['pt_pic']?>"> <img src="<?php echo base_url();echo $patient_data['pt_pic']?>">
</div> </div>
<div class="ip_profile_tab_name"> <div class="ip_profile_tab_name">
<h3><?php echo $patient_data['pt_name']?></h3> <h3><?php echo decrypt_data($patient_data['pt_name'])?></h3>
<!-- <form id="ip_user_rating_form"> <!-- <form id="ip_user_rating_form">
<div id="ip_selected_rating" class="ip_selected_rating floatLeft">5.0</div> <div id="ip_selected_rating" class="ip_selected_rating floatLeft">5.0</div>
<span class="ip_user_rating floatLeft"> <span class="ip_user_rating floatLeft">
...@@ -274,7 +274,7 @@ ...@@ -274,7 +274,7 @@
<input type="hidden" name="booking_id" value="<?php echo $booking_details['book_id'];?>"> <input type="hidden" name="booking_id" value="<?php echo $booking_details['book_id'];?>">
<input type="hidden" name="section" value="review"> <input type="hidden" name="section" value="review">
<div class="ip_bank_detail_frame heightAuto bg_white"> <div class="ip_bank_detail_frame heightAuto bg_white">
<textarea class="ip_bank_input" rows="4" data-parsley-required="" name="review" ><?php if(!empty($record_data['patient_review'])) {echo $record_data['patient_review']; } ?></textarea> <textarea class="ip_bank_input" rows="4" data-parsley-required="" name="review" ><?php if(!empty($record_data['patient_review'])) {echo decrypt_data($record_data['patient_review']); } ?></textarea>
</div> </div>
<br> <br>
......
application/views/patient_editprofile.php
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</div> </div>
<div class="ip_edit_row"> <div class="ip_edit_row">
<div class="ip_bank_detail_frame"> <div class="ip_bank_detail_frame">
<input class="ip_bank_input" disabled placeholder="<?php load_language('email');?>" value="<?php echo decrypt_data($patient_data['pt_email']);?>"> <input class="ip_bank_input" disabled placeholder="<?php load_language('email');?>" value="<?php echo $patient_data['pt_email'];?>">
</div> </div>
</div> </div>
<div class="ip_edit_row"> <div class="ip_edit_row">
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<div class="col-md-6"> <div class="col-md-6">
<p class="ip_row_p"><?php load_language('date_of_birth');?></p> <p class="ip_row_p"><?php load_language('date_of_birth');?></p>
<div class="ip_bank_detail_frame" id="edit-patient"> <div class="ip_bank_detail_frame" id="edit-patient">
<input name="dob" readonly class="ip_bank_input" placeholder="" data-parsley-required="true" > <input name="dob" readonly class="ip_bank_input" placeholder="" data-parsley-required="true" value="<?php echo $patient_data['pt_dob'];?>">
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
......
application/views/search_doctor_complete_profile.php
...@@ -35,14 +35,21 @@ ...@@ -35,14 +35,21 @@
<div class="ip_profile_details_listing"> <div class="ip_profile_details_listing">
<li><?php load_language('email');?>:<strong><?php echo $doctor_data['dr_email'];?></strong></li> <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>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 class="clear"></div>
</div> </div>
<hr> <hr>
<div class="ip_profile_bio"> <div class="ip_profile_bio">
<h6 class="uppercase"><?php load_language('biography');?></h6> <h6 class="uppercase"><?php load_language('biography');?></h6>
<p><?php echo $doctor_data['dr_bio'];?></p> <p><?php echo decrypt_data($doctor_data['dr_bio']);?></p>
</div> </div>
<div class="ip_profile_others"> <div class="ip_profile_others">
......
application/views/search_doctor_confirm_booking.php
...@@ -36,7 +36,13 @@ if($this->session->userdata('language') == 'en'){ ...@@ -36,7 +36,13 @@ if($this->session->userdata('language') == 'en'){
</div> </div>
<h5><strong><?php echo $doctor_data['dr_name']?></strong></h5> <h5><strong><?php echo $doctor_data['dr_name']?></strong></h5>
<p><?php echo $doctor_data['dr_specialization']?></p> <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"> <div class="ip_profile_ratting">
<!-- <fieldset class="ip_rating"> <!-- <fieldset class="ip_rating">
<input type="radio" id="star5" name="rating" value="5" /><label class = "full" for="star5" title="Awesome - 5 stars"></label> <input type="radio" id="star5" name="rating" value="5" /><label class = "full" for="star5" title="Awesome - 5 stars"></label>
...@@ -251,9 +257,15 @@ if($this->session->userdata('language') == 'en'){ ...@@ -251,9 +257,15 @@ if($this->session->userdata('language') == 'en'){
<h6><?php echo $doctor_data['dr_specialization']?></h6> <h6><?php echo $doctor_data['dr_specialization']?></h6>
<p class="ip_booking_confirm_detail"> <p class="ip_booking_confirm_detail">
<?php echo $doctor_data['clinic_name']?><br> <?php echo $doctor_data['clinic_name']?><br>
<?php echo $doctor_data['clinic_street_address']?>, <?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'])?><br>
<br>
<?php }else{?>
<?php echo $doctor_data['clinic_street_address']?>,
<?php echo $doctor_data['clinic_locality']?>-<?php echo $doctor_data['clinic_cep']?><br> <?php echo $doctor_data['clinic_locality']?>-<?php echo $doctor_data['clinic_cep']?><br>
<br> <br>
<?php } ?>
<span id="book-date-show"> </span><br><span id="book-time-show"> </span> <span id="book-date-show"> </span><br><span id="book-time-show"> </span>
</p> </p>
<br> <br>
......
application/views/search_doctor_result.php
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<div class="ip_detailed_tab_content"> <div class="ip_detailed_tab_content">
<div class="tab-content"> <div class="tab-content">
<div id="biography<?php echo $key?>" class="tab-pane fade in active"> <div id="biography<?php echo $key?>" class="tab-pane fade in active">
<p><?php echo $value['biography']?></p> <p><?php echo decrypt_data($value['biography'])?></p>
<!-- <p>Lorem Ipsum is simply dummy text of the printing and <!-- <p>Lorem Ipsum is simply dummy text of the printing and
typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer</p> --> typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer</p> -->
......
assets/js/custom.js
...@@ -1745,11 +1745,11 @@ $('#money_cash').click(function(){ ...@@ -1745,11 +1745,11 @@ $('#money_cash').click(function(){
var result = post_ajax(base_url+'Searchdoctor/markpayment',data); var result = post_ajax(base_url+'Searchdoctor/markpayment',data);
var items = JSON.parse(result); var items = JSON.parse(result);
console.log(items); console.log(items);
if(items == 'true'){ //if(items == 'true'){
$('.confirm-tab-1').removeClass('active'); $('.confirm-tab-1').removeClass('active');
$('#btnTrigger-confirmation').click(); $('#btnTrigger-confirmation').click();
$('.confirm-tab-4').addClass('active'); $('.confirm-tab-4').addClass('active');
} // }
// } // }
// else //Paid Consulation -> goto Payment Page // else //Paid Consulation -> goto Payment Page
// { // {
...@@ -1768,12 +1768,12 @@ $('#credit_card_cash').click(function(){ ...@@ -1768,12 +1768,12 @@ $('#credit_card_cash').click(function(){
var result = post_ajax(base_url+'Searchdoctor/markpayment_viacredit',data); var result = post_ajax(base_url+'Searchdoctor/markpayment_viacredit',data);
var items = JSON.parse(result); var items = JSON.parse(result);
//console.log(items); //console.log(items);
if(items== 'true'){ // if(items== 'true'){
$('#select_cash_mode').modal('hide'); $('#select_cash_mode').modal('hide');
$('.confirm-tab-1').removeClass('active'); $('.confirm-tab-1').removeClass('active');
$('#btnTrigger-payment').click(); $('#btnTrigger-payment').click();
$('.confirm-tab-3').addClass('active'); $('.confirm-tab-3').addClass('active');
} //}
}) })
$('#enter_waiting_list_btn').click(function() $('#enter_waiting_list_btn').click(function()
...@@ -2256,14 +2256,14 @@ $("#login_submit_doctor").click(function() ...@@ -2256,14 +2256,14 @@ $("#login_submit_doctor").click(function()
if(items.status=="error"&&items.error=="Login Failed") if(items.status=="error"&&items.error=="Login Failed")
{ {
$("#loading3").hide(); $("#loading3").hide();
$("#err-login").html(items.message); $("#err-login2").html(items.message);
$('#err-login').removeClass('hidden'); $('#err-login2').removeClass('hidden');
} }
else if(items.status=="error"&&items.error=="Location Update Failed") else if(items.status=="error"&&items.error=="Location Update Failed")
{ {
$("#loading3").hide(); $("#loading3").hide();
$("#err-login").html(items.message); $("#err-login2").html(items.message);
$('#err-login').removeClass('hidden'); $('#err-login2').removeClass('hidden');
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment