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

PRO ISUUE FIXED

Browse Source
This commit is contained in:
velz 2019-02-27 16:22:44 +05:30
parent fe4ef4b9bd
commit 9a8c73e628
2 changed files with 87 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -694,11 +694,11 @@ class PD_Controller extends REST_Controller {
$logger = MYLOG::logFunction();
$logger->info("CUSTOM SPECIFIC TEMPLATE ".$pd_details['fk_pd_template_id']." CHOOSED",array('PDID' => $pd_details['pd_id']));
$logger->info("CUSTOM SPECIFIC TEMPLATE ".$pd_details['fk_pd_template_id']." CHOOSED",array('PDID' => $pd_details['pd_id'],'Pre-Status' => $res_array[0]['pd_status'],'Current_status' => $pd_details['pd_status']));
$dataToBot = array('Task Name'=>'PD Template Assign','Template Catagory'=>'SPECIFIC Template - '.$choosed_template_id[0]['fk_template_id'] ,'PDID'=> $pd_details['pd_id'],'Method' => 'UpdatePDMaster');
$dataToBot = array('Task Name'=>'PD Template Assign','Template Catagory'=>'SPECIFIC Template - '.$choosed_template_id[0]['fk_template_id'] ,'PDID'=> $pd_details['pd_id'],'Method' => 'UpdatePDMaster','Pre-Status' => $res_array[0]['pd_status'],'Current_status' => $pd_details['pd_status']);
MYHTTPCLIENT::sendPOST($dataToBot);
}
@ -724,11 +724,11 @@ class PD_Controller extends REST_Controller {
$logger = MYLOG::logFunction();
$logger->info("GENERIC TEMPLATE ".$pd_details['fk_pd_template_id']." CHOOSED",array('PDID' => $pd_details['pd_id']));
$logger->info("GENERIC TEMPLATE ".$pd_details['fk_pd_template_id']." CHOOSED",array('PDID' => $pd_details['pd_id'],'Pre-Status' => $res_array[0]['pd_status'],'Current_status' => $pd_details['pd_status']));
$dataToBot = array('Task Name'=>'PD Template Assign','Template Catagory'=>'GENERIC TEMPLATE ID - '.$pd_details['fk_pd_template_id'] ,'PDID'=> $pd_details['pd_id'],'Method' => 'UpdatePDMaster');
$dataToBot = array('Task Name'=>'PD Template Assign','Template Catagory'=>'GENERIC TEMPLATE ID - '.$pd_details['fk_pd_template_id'] ,'PDID'=> $pd_details['pd_id'],'Method' => 'UpdatePDMaster','Pre-Status' => $res_array[0]['pd_status'],'Current_status' => $pd_details['pd_status']);
MYHTTPCLIENT::sendPOST($dataToBot);
@ -2257,7 +2257,8 @@ class PD_Controller extends REST_Controller {
case 2:
$processed_json = GETPROCESSEDJSON::convertClientForm($records,$formid);
break;
case 4: $processed_json = GETPROCESSEDJSON::convertOtherAssetForm($records,$formid);
case 4:
$processed_json = GETPROCESSEDJSON::convertOtherAssetForm($records,$formid);
$processed_json = $records;
break;
case 5:

86
api/application/helpers/getprocessedjson_helper.php
View File

@ -242,7 +242,7 @@ class GETPROCESSEDJSON
}
}
return $raw_json;
return ($raw_json);
}
/*****************########## END BANKING INFO DETAILS FORM ##########**************/
@ -625,6 +625,51 @@ class GETPROCESSEDJSON
}
}
if(array_key_exists('residence_city',$family_details))
{
$CI->db->SELECT( $master_tables_field_names['CITY'] );
$CI->db->FROM(CITY);
$CI->db->WHERE('isactive',1);
$CI->db->WHERE( $master_tables_pkid['CITY'] ,$family_details['residence_city']);
$city= $CI->db->GET()->result_array();
if(count($city))
{
$city_master = $city[0][$master_tables_field_names['CITY']];
$raw_json['family_details'][$family_details_key]['residence_city_master'] = $city_master;
}
}
if(array_key_exists('residence_state',$family_details))
{
$CI->db->SELECT( $master_tables_field_names['STATE'] );
$CI->db->FROM(STATE);
$CI->db->WHERE('isactive',1);
$CI->db->WHERE( $master_tables_pkid['STATE'] ,$family_details['residence_state']);
$state= $CI->db->GET()->result_array();
if(count($state))
{
$state_master = $state[0][$master_tables_field_names['STATE']];
$raw_json['family_details'][$family_details_key]['residence_state_master'] = $state_master;
}
}
if(array_key_exists('residence_pin',$family_details))
{
$CI->db->SELECT( $master_tables_field_names['PINCODE'] );
$CI->db->FROM(PINCODE);
$CI->db->WHERE('isactive',1);
$CI->db->WHERE( $master_tables_pkid['PINCODE'] ,$family_details['residence_pin']);
$pincode= $CI->db->GET()->result_array();
if(count($pincode))
{
$pincodee_master = $pincode[0][$master_tables_field_names['PINCODE']];
$raw_json['family_details'][$family_details_key]['residence_pincode_master'] = $pincodee_master;
}
}
if(array_key_exists('residence_ownership',$family_details))
{
@ -1506,7 +1551,23 @@ class GETPROCESSEDJSON
{
$raw_json['business_assets_details'][$business_assets_detail_key]['business_details'][0]['property_type_master'] = $assest_mode_name[0][$master_tables_field_names['PROPERTIES']];
}
}
}
if($business_assets_detail['business_assets_mode'] == 3)
{
$CI->db->SELECT( $master_tables_field_names['VEHICLETYPE'] );
$CI->db->FROM(VEHICLETYPE);
$CI->db->WHERE('is_active',1);
$CI->db->WHERE( $master_tables_pkid['VEHICLETYPE'] ,$business_assets_detail['business_details'][0]['vehicle_type']);
$assest_mode_name= $CI->db->GET()->result_array();
//print_r($CI->db->last_query());
if(count($assest_mode_name))
{
$raw_json['business_assets_details'][$business_assets_detail_key]['business_details'][0]['vehicle_type_master'] = $assest_mode_name[0][$master_tables_field_names['VEHICLETYPE']];
}
}
}
}
}
@ -1564,6 +1625,22 @@ class GETPROCESSEDJSON
$raw_json['assets_details'][$assets_detail_key]['details'][0]['property_type_master'] = $assest_mode_name[0][$master_tables_field_names['PROPERTIES']];
}
}
if($assets_detail['assets_mode'] == 3)
{
$CI->db->SELECT( $master_tables_field_names['VEHICLETYPE'] );
$CI->db->FROM(VEHICLETYPE);
$CI->db->WHERE('is_active',1);
$CI->db->WHERE( $master_tables_pkid['VEHICLETYPE'] ,$assets_detail['details'][0]['vehicle_type']);
$assest_mode_name= $CI->db->GET()->result_array();
//print_r($CI->db->last_query());
if(count($assest_mode_name))
{
$raw_json['assets_details'][$assets_detail_key]['details'][0]['vehicle_type_master'] = $assest_mode_name[0][$master_tables_field_names['VEHICLETYPE']];
}
}
if($assets_detail['assets_mode'] == 7)
@ -1718,8 +1795,7 @@ class GETPROCESSEDJSON
// Handling Service_details_ subarry
if(array_key_exists('trade_details',$raw_json))
{
if(array_key_exists('service_provider_details',$raw_json))
{
@ -1761,7 +1837,7 @@ class GETPROCESSEDJSON
}
}
}
}
}