diff --git a/api/application/helpers/getprocessedjson_helper.php b/api/application/helpers/getprocessedjson_helper.php index e8658f12..821314fc 100644 --- a/api/application/helpers/getprocessedjson_helper.php +++ b/api/application/helpers/getprocessedjson_helper.php @@ -2901,17 +2901,17 @@ class GETPROCESSEDJSON $raw_json[$raw_json_key]['uom_master'] = $uom[0][$master_tables_field_names['UOM']]; } } - } - if(isset($raw_json['is_pd_done_on_initiated_address']) && (strtoupper($raw_json['is_pd_done_on_initiated_address']) == "NO") ) - { + if(isset($address['is_pd_done_on_initiated_address']) && (strtoupper($address['is_pd_done_on_initiated_address']) == "NO") ) + { + // if(array_key_exists('State_list',$address)) - if(isset($address['State_list'])) + if(isset($address['state2'])) { //print_r($address); $CI->db->SELECT( $master_tables_field_names['STATE'] ); $CI->db->FROM(STATE); $CI->db->WHERE('isactive',1); - $CI->db->WHERE($master_tables_pkid['STATE'] ,$address['State_list']); + $CI->db->WHERE($master_tables_pkid['STATE'] ,$address['state2']); $adress_type_name= $CI->db->GET()->result_array(); //print_r($CI->db->last_query()); if(count($adress_type_name)) @@ -2951,7 +2951,7 @@ class GETPROCESSEDJSON $raw_json[$raw_json_key]['pincode2_master'] = $pincode[0][$master_tables_field_names['PINCODE']]; } } - } + }} return ($raw_json); } /*****************########## END OF FI-ADDRESS FORM DETAILS ##########**************/ diff --git a/api/application/views/report_templates/JSONTOREPORT_FI_OV_DI.php b/api/application/views/report_templates/JSONTOREPORT_FI_OV_DI.php index befd827e..6b2513cd 100644 --- a/api/application/views/report_templates/JSONTOREPORT_FI_OV_DI.php +++ b/api/application/views/report_templates/JSONTOREPORT_FI_OV_DI.php @@ -298,6 +298,7 @@ defined('BASEPATH') or exit('No direct script access allowed'); +
'; echo '