diff --git a/admin/application/controllers/Webservice.php b/admin/application/controllers/Webservice.php index b2cf691..b5c779b 100644 --- a/admin/application/controllers/Webservice.php +++ b/admin/application/controllers/Webservice.php @@ -2008,7 +2008,7 @@ print_r(date('H:i',$ms));exit();*/ if((isset($data['doctor_id'])) && strlen($data['doctor_id']) && isset($data['review']) && strlen($data['review']) && isset($data['medical_record_id']) && strlen($data['medical_record_id'])){ $result = $this->Webservice_model->doctor_review($data,$headers['Auth']); if($result['status'] == 'success'){ - $res = array("status"=> "success"); + $res = array("status"=> "success",'data'=>$result['data']); }else{ $res = array( "status"=> "error", diff --git a/admin/application/models/Webservice_model.php b/admin/application/models/Webservice_model.php index cb5a187..b71686d 100644 --- a/admin/application/models/Webservice_model.php +++ b/admin/application/models/Webservice_model.php @@ -1879,6 +1879,7 @@ class Webservice_model extends CI_Model { } unset($data['medical_record_id']); if($this->db->insert('tbl_review',$data)){ + $insertid = $this->db->insert_id(); $this->db->insert('tbl_doctor_notifications',array('doctor_id'=>$data['doctor_id'],'type'=>'1','message'=>$msg,'time'=>$data['date'],'read_status'=>'0')); $doctor_insert_id = $this->db->insert_id(); $fcm_doctor = $this->db->get_where('tbl_authtoken_doctors',array('doctor_id'=>$data['doctor_id']))->row(); @@ -1890,7 +1891,7 @@ class Webservice_model extends CI_Model { $doctor_type = '2'; $doctor_push = $this->push_sent($news,$doctor_type); - $res = array("status"=>"success","msg" =>"Insertion Success"); + $res = array("status"=>"success","msg" =>"Insertion Success",'data'=>array('id'=>$insertid,'review'=>$data['review'])); }else{ $res = array("status"=>"failed","msg" =>"Insertion failed"); } @@ -2590,7 +2591,7 @@ class Webservice_model extends CI_Model { }else{ foreach ($budget as $key => $value) { $bud[$key]['service_name'] = $value->procedure; - $bud[$key]['service_charge'] = $value->amount; + $bud[$key]['service_charge'] = $value->amount * $value->quantity; } $result['services'] = $bud; }