Commit 44887934 by Jansa Jose

Merge branch 'jansa'

parents 29cb994d 0232e202
...@@ -2910,7 +2910,7 @@ class Webservice_model extends CI_Model { ...@@ -2910,7 +2910,7 @@ class Webservice_model extends CI_Model {
$this->db->where('tbl_clinic_doctors.doctor_id',$id); $this->db->where('tbl_clinic_doctors.doctor_id',$id);
$this->db->order_by('tbl_clinic.id','ASC'); $this->db->order_by('tbl_clinic.id','ASC');
$query = $this->db->get('tbl_clinic_doctors')->result(); $query = $this->db->get('tbl_clinic_doctors')->result();
if(in_array(0, array_column($usqueryerdb, 'id'))) { // search value in the array if(in_array(0, array_column($query, 'id'))) { // search value in the array
array_splice($query, 0, 1); array_splice($query, 0, 1);
}else{ }else{
$this->db->insert('tbl_clinic',array('name'=>'Default','username'=>'default','password'=>md5('default'))); $this->db->insert('tbl_clinic',array('name'=>'Default','username'=>'default','password'=>md5('default')));
...@@ -2929,6 +2929,7 @@ class Webservice_model extends CI_Model { ...@@ -2929,6 +2929,7 @@ class Webservice_model extends CI_Model {
$this->db->where('tbl_clinic_doctors.clinic_id','0'); $this->db->where('tbl_clinic_doctors.clinic_id','0');
$this->db->where('tbl_clinic_doctors.doctor_id',$id); $this->db->where('tbl_clinic_doctors.doctor_id',$id);
$query_default = $this->db->get()->result(); $query_default = $this->db->get()->result();
foreach ($query_default as $key => $value) { foreach ($query_default as $key => $value) {
$query_default[$key]->street_address = decrypt_data($value->street_address); $query_default[$key]->street_address = decrypt_data($value->street_address);
$query_default[$key]->locality = decrypt_data($value->locality); $query_default[$key]->locality = decrypt_data($value->locality);
......
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