diff --git a/api/application/controllers/SMC_Credit_PD_Controller.php b/api/application/controllers/SMC_Credit_PD_Controller.php index e155a704..bd362038 100644 --- a/api/application/controllers/SMC_Credit_PD_Controller.php +++ b/api/application/controllers/SMC_Credit_PD_Controller.php @@ -1667,17 +1667,18 @@ public function filterSalesPDList_post() { // $CETAPP_creditPD_data[5]['key_stakeholders'] = $temp_arr; }// ### LFMP key_stakeholders ends // log_message('ERROR',"SUSEEN".json_encode($CETAPP_creditPD_data));die(); - if((in_array(1,$filter_form_id)) && (in_array(4,$filter_form_id))) - // && (in_array(21,$filter_form_id))) + if((in_array(1,$filter_form_id)) && (in_array(21,$filter_form_id))) + // && (in_array(4,$filter_form_id))) { - $officer_id = $view_data['pd_master_details'][0]['fk_updatedby']; - $visit_date = $view_data['pd_master_details'][0]['pd_visit_date']; - - $officer_details = $this->SMC_Credit_PD_Model->selectCustomRecords(array('userid as officer_id', 'email','mobile_no','concat(first_name," ",last_name) as officer'),array('userid' => $officer_id),USERPROFILE); - if(!empty($officer_details)){ - foreach($officer_details as $key=>$value) { - $CETAPP_creditPD_data['Officer Details'] = $value; - $CETAPP_creditPD_data['Officer Details']['pd_visit_date'] = $visit_date; + $officer_id = isset($view_data['pd_master_details'][0]['fk_updatedby']) ? $view_data['pd_master_details'][0]['fk_updatedby'] : ''; + $visit_date = isset($view_data['pd_master_details'][0]['pd_visit_date']) ? $view_data['pd_master_details'][0]['pd_visit_date'] : ''; + if(!empty($officer_id)){ + $officer_details = $this->SMC_Credit_PD_Model->selectCustomRecords(array('userid as officer_id', 'email','mobile_no','concat(first_name," ",last_name) as officer'),array('userid' => $officer_id),USERPROFILE); + if(!empty($officer_details)){ + foreach($officer_details as $key=>$value) { + $CETAPP_creditPD_data['Officer Details'] = $value; + $CETAPP_creditPD_data['Officer Details']['pd_visit_date'] = $visit_date; + } } } } diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php index 970cfd31..c391e5da 100644 --- a/api/application/controllers/Sales_PD_Controller.php +++ b/api/application/controllers/Sales_PD_Controller.php @@ -240,7 +240,18 @@ class Sales_PD_Controller extends REST_Controller { // } //} } - cet_salespd::pushwithcetsalespdapi($common_fields,$section_fields,1); + // cet_salespd::pushwithcetsalespdapi($common_fields,$section_fields,1); + $CETAPP_salesPD_data = $section_fields; + $officer_name = isset($CETAPP_salesPD_data['section8']['name_of_sales_team_member']) ? $CETAPP_salesPD_data['section8']['name_of_sales_team_member'] : ''; + if(!empty($officer_name)){ + $officer_details = $this->Sales_PD_Model->selectCustomRecords(array('userid as officer_id', 'email','mobile_no','concat(first_name," ",last_name) as officer_full_name'),array('first_name' => $officer_name),USERPROFILE); + if(!empty($officer_details)){ + foreach($officer_details as $key=>$value) { + $CETAPP_salesPD_data['section8'] = array_merge($section_fields['section8'],$value); + } + } + } + cet_salespd::pushwithcetsalespdapi($common_fields,$CETAPP_salesPD_data,1); $view_data['satellite_image'] = $this->Sales_PD_Model->selectCustomRecords(array('*'),array('fk_sales_pd_id' => $sales_pd_id,'img_name' => 'satellite','isactive' => 1),SALEPD_DOCS); if(!empty($view_data['satellite_image'])){ $stt_fields = $common_fields;