diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 32cdbecd..6d271479 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -2298,7 +2298,7 @@ class PD_Controller extends REST_Controller { } } - // die(); + //die(); /*****End of Form Specific funcitons to convert RAW JSON Data to Processed JSON DATA*******/ unset($records['pdid']); diff --git a/api/application/helpers/getprocessedjson_helper.php b/api/application/helpers/getprocessedjson_helper.php index e8a8ee91..f1e7b5ab 100644 --- a/api/application/helpers/getprocessedjson_helper.php +++ b/api/application/helpers/getprocessedjson_helper.php @@ -25,6 +25,10 @@ class GETPROCESSEDJSON { // Handling manufacturing_details subarry + //print_r($raw_json['manufacturing_details']); + if(count($raw_json['manufacturing_details']) && $raw_json['manufacturing_details'][0] != null) + { + foreach($raw_json['manufacturing_details'][0]['main_raw_materials'] as $manufacturing_details_key => $manufacturing_details) { foreach($manufacturing_details as $key => $value) @@ -59,9 +63,12 @@ class GETPROCESSEDJSON } + } // Handling trading_products subarry + if(count($raw_json['trade_details']) && $raw_json['trade_details'][0] != null) + { foreach($raw_json['trade_details'][0]['trading_products'] as $trading_products_key => $trading_products) { foreach($trading_products as $key => $value) @@ -95,6 +102,7 @@ class GETPROCESSEDJSON } } } + } return $raw_json; } @@ -119,7 +127,8 @@ class GETPROCESSEDJSON if(!empty($raw_json) && !empty($master_keys)) { - + if(array_key_exists('loan_details',$raw_json)) + { foreach($raw_json['loan_details'] as $loan_key => $loan) { // if( $loan['loan_taken_by']['group_id'] == 1 ) @@ -165,6 +174,7 @@ class GETPROCESSEDJSON // print_r($loan); } + } } return $raw_json; @@ -210,7 +220,10 @@ class GETPROCESSEDJSON $temp_fields = array($master_tables_field_names[$master_value['master_name']].' as name'); $where_condition_array = array($master_tables_pkid[$master_value['master_name']] => $value); - + if($key == 'applicant_name') + { + $where_condition_array = array($master_tables_pkid[$master_value['master_name']] => $value['id']); + } $result_data = $CI->PD_Model->selectCustomRecords($temp_fields,$where_condition_array,$table); if(count($result_data)) { @@ -1704,8 +1717,12 @@ class GETPROCESSEDJSON // Handling Service_details_ subarry + if(array_key_exists('trade_details',$raw_json)) { + if(array_key_exists('service_provider_details',$raw_json)) + { + if(array_key_exists('service_products',$raw_json['service_provider_details'][0])) { foreach($raw_json['service_provider_details'][0]['service_products'] as $service_provider_details_key => $manufacturing_details) @@ -1743,6 +1760,7 @@ class GETPROCESSEDJSON } } + } } }