Sineedge/sparqapi
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New Issues FIxed

Browse Source
This commit is contained in:
velz 2019-04-22 19:14:55 +05:30
parent 21bca8c4ae
commit ce43d289b3
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
api/application/controllers/PD_Controller.php
View File

@ -813,7 +813,7 @@ class PD_Controller extends REST_Controller {
// }
if( $exist_pd_details[0]['is_child'] == 0)
{
if(($pd_details['parent_pd_id'] == null || $pd_details['parent_pd_id'] == ""))
if(isset($pd_details['parent_pd_id']) && ($pd_details['parent_pd_id'] == null || $pd_details['parent_pd_id'] == ""))
{
$pd_details['parent_pd_id'] = $exist_pd_details[0]['pd_id'] != "" || $exist_pd_details[0]['pd_id'] != null ? $exist_pd_details[0]['pd_id'] : $pd_details['pd_id'];
}
@ -2255,7 +2255,7 @@ class PD_Controller extends REST_Controller {
}
$id = $this->PD_Model->updateRecords($fields,PDFORMDETAILSJSON,$where_condition_array);
/*****Call Form Specific funcitons to convert RAW JSON Data to Processed JSON DATA******/
if(PROCESSJSON == true)
@ -2360,11 +2360,12 @@ class PD_Controller extends REST_Controller {
if($id != "" || $id != null)
{
// Update form dummy entry against Additional PD common form ID to avoid every time fetch data from additional PD forms - scenarios like exist loan obligations, other family details
if($formid == 4)//other asset
{
$temp_array = array('fk_form_id'=>$formid,'company_id' => $company_id,'fk_pd_id'=>$additional_pd_id,'fk_createdby'=>$createdby,'json'=>$records,'processed_json' => $processed_json,'rental_count_id' => $rental_count_id);
$id = $this->PD_Model->saveRecords($temp_array,PDFORMDETAILSJSON);
}
// if($formid == 4)//other asset - here this should happen for only if it is additional PD.
// {
// $temp_array = array('fk_form_id'=>$formid,'company_id' => $company_id,'fk_pd_id'=>$additional_pd_id,'fk_createdby'=>$createdby,'json'=>$records,'processed_json' => $processed_json,'rental_count_id' => $rental_count_id);
// $id = $this->PD_Model->saveRecords($temp_array,PDFORMDETAILSJSON);
// }
// End Of update Additional Entry
$data['dataStatus'] = true;
@ -2458,7 +2459,7 @@ class PD_Controller extends REST_Controller {
//print_r($temp_address);
//construct address form jsn format here
$address = array();
$address[] = array('address' => $temp_address['addressline1'],'address_type' => 1,'address_type_others' => '','state'=>$temp_address['fk_state'],'city'=>$temp_address['fk_city'],'citySearch' =>'','stateSearch'=>'','citySearch'=>'','pinSearch' => '','pincode'=>$temp_address['pincode'],'pincode_others' => '','locality' => '','locality_others'=>'','pd_location' => '','comment_locality' => '','estimated_area' => '','uom' => '','uom_others'=>'');
$address[] = array('address' => $temp_address['addressline1'],'address_type' => "",'address_type_others' => '','state'=>$temp_address['fk_state'],'city'=>$temp_address['fk_city'],'citySearch' =>'','stateSearch'=>'','citySearch'=>'','pinSearch' => '','pincode'=>$temp_address['pincode'],'pincode_others' => '','locality' => '','locality_others'=>'','pd_location' => '','comment_locality' => '','estimated_area' => '','uom' => '','uom_others'=>'');
$records['addresses'] = $address;
$records['address_form_remark'] = '';
@ -2736,6 +2737,7 @@ class PD_Controller extends REST_Controller {
{
foreach($json['companies'] as $company_key => $compnay)
{
//print_r($company);
$json['companies'][$company_key]['is_company_applicant'] = false;
$json['companies'][$company_key]['business_entity_type'] = null;
$json['companies'][$company_key]['business_years'] = "";
@ -5357,10 +5359,11 @@ class PD_Controller extends REST_Controller {
}
//Get Other Assets with Loan
$fields = array('json','company_id');
$fields = array('json');
$where_condition_array = array('isactive' => 1,'fk_form_id' =>4,'fk_pd_id' => $pdid);
$other_assest = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,PDFORMDETAILSJSON);
//print_r($other_assest);die();
// print_r($this->db->last_query());
// print_r($other_assest);die();
if(count($other_assest))
{
foreach($other_assest as $key => $assest)