diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index d11a98c2..3513326b 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -9519,16 +9519,16 @@ public function getCompaniesListsFromGeneralFormRawJSON_post() { $img_array['image'] = $records['image']; $img_array['Name'] = $records['name']; - $current_doc_title = $records['name']; + $current_doc_title = $records['image_key']; } else { $img_array['image'] = $records['image']; - $img_array['Name'] = $records['name']; - $current_doc_title = $records['name']; + $img_array['Name'] = $records['image_key']; + $current_doc_title = $records['image_key']; } - // echo $current_doc_title;die(); + //echo $current_doc_title;die(); //de activate previous one $this->PD_Model->updateRecords(array('isactive' => 0),PDDOCUMENTS,array('fk_pd_id' => $records['fk_pd_id'],'fk_form_id' => $records['fk_form_id'],'pd_document_title' => $current_doc_title)); // print_r($this->db->last_query()); @@ -9632,17 +9632,21 @@ public function getCompaniesListsFromGeneralFormRawJSON_post() $final_data = array(); $common_images = array(); - //print_r(($this->existing_imges));die(); + // print_r(($this->existing_imges));//die(); if(count($this->existing_imges)) { foreach ($this->photo_names as $key => $value) { $temp = $this->photoMapping($key,$value); - $final_data[] = is_array($temp) ? $temp : array('img_key' =>$key,'img_name' => $value[0],'img_url' => '','fk_form_id' => $value[1]);; + $final_data[] = is_array($temp) ? $temp : array('img_key' =>$key,'img_name' => $value[0],'img_url' => '','fk_form_id' => $value[1]); - - //unset($this->photo_names[$key]); - + foreach ($this->existing_imges as $key => $value) + { + if(!$value['fk_form_id'] && ($value['pd_document_title'] != 'satellite')) + { + $final_data[] = array('img_key' =>'common_image','img_name' => $value['pd_document_title'],'img_url' => $value['doc_url'],'fk_form_id' => null); + } + } } } else