diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 1bb9d90d..3a7a0413 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -2056,77 +2056,77 @@ class PD_Controller extends REST_Controller { { $where_condition_array = array('fk_form_id'=>$formid,'fk_pd_id'=>$pdid,'company_id' => $company_id); } - $id = $this->PD_Model->updateRecords($fields,PDFORMDETAILSJSON,$where_condition_array); + //$id = $this->PD_Model->updateRecords($fields,PDFORMDETAILSJSON,$where_condition_array); /*****Call Form Specific funcitons to convert RAW JSON Data to Processed JSON DATA******/ - switch($formid) - { - case 1: - $processed_json = GETPROCESSEDJSON::convertSupplierForm($records,$formid); - break; + // switch($formid) + // { + // case 1: + // $processed_json = GETPROCESSEDJSON::convertSupplierForm($records,$formid); + // break; - case 2: - $processed_json = $records; - break; - case 4: - $processed_json = $records; - break; - case 5: - $processed_json = $records; - break; + // case 2: + // $processed_json = $records; + // break; + // case 4: + // $processed_json = $records; + // break; + // case 5: + // $processed_json = $records; + // break; - case 6: - $processed_json = GETPROCESSEDJSON::convertOtherFamilyDetailsForm($records,$formid); - break; - case 8: - $processed_json = GETPROCESSEDJSON::convertExistingLoanDetailsForm($records,$formid); - break; - case 7: - $processed_json = GETPROCESSEDJSON::convertBankingInfoDetailsForm($records,$formid); - break; - case 9: - $processed_json = GETPROCESSEDJSON::convertOtherIncomeDetailsForm($records,$formid); - break; - case 10: - $processed_json = GETPROCESSEDJSON::convertLoanDetailsForm($records,$formid); - break; + // case 6: + // $processed_json = GETPROCESSEDJSON::convertOtherFamilyDetailsForm($records,$formid); + // break; + // case 8: + // $processed_json = GETPROCESSEDJSON::convertExistingLoanDetailsForm($records,$formid); + // break; + // case 7: + // $processed_json = GETPROCESSEDJSON::convertBankingInfoDetailsForm($records,$formid); + // break; + // case 9: + // $processed_json = GETPROCESSEDJSON::convertOtherIncomeDetailsForm($records,$formid); + // break; + // case 10: + // $processed_json = GETPROCESSEDJSON::convertLoanDetailsForm($records,$formid); + // break; - case 11: //In Stock UOM Only - also coming Text - right now No need to convert. - //$processed_json = GETPROCESSEDJSON::convertStockDetailsForm($records,$formid); - $processed_json = $records; - break; - case 12: - $processed_json = $records; - break; + // case 11: //In Stock UOM Only - also coming Text - right now No need to convert. + // //$processed_json = GETPROCESSEDJSON::convertStockDetailsForm($records,$formid); + // $processed_json = $records; + // break; + // case 12: + // $processed_json = $records; + // break; - case 14: // There is no master Data in Financial Form - $processed_json = $records; - break; + // case 14: // There is no master Data in Financial Form + // $processed_json = $records; + // break; - case 13: - $processed_json = GETPROCESSEDJSON::convertBusinessFormDetailsForm($records,$formid); - break; - case 15: - $processed_json = $records; - break; - case 17: - $processed_json = $records; - break; - case 18: - $processed_json = $records; - break; + // case 13: + // $processed_json = GETPROCESSEDJSON::convertBusinessFormDetailsForm($records,$formid); + // break; + // case 15: + // $processed_json = $records; + // break; + // case 17: + // $processed_json = $records; + // break; + // case 18: + // $processed_json = $records; + // break; - case 19: - $processed_json = GETPROCESSEDJSON::convertNeighbourDetailsForm($records,$formid); - break; - case 20: - $processed_json = $records; - break; + // case 19: + // $processed_json = GETPROCESSEDJSON::convertNeighbourDetailsForm($records,$formid); + // break; + // case 20: + // $processed_json = $records; + // break; - //default: - //echo "Something Wrong! Form ID did not match, Contact System Administrator"; - } + // //default: + // //echo "Something Wrong! Form ID did not match, Contact System Administrator"; + // } //die(); /*****End of Form Specific funcitons to convert RAW JSON Data to Processed JSON DATA*******/ @@ -2181,8 +2181,8 @@ class PD_Controller extends REST_Controller { { $data['dataStatus'] = true; $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = json_decode($rec[0]['json']); - //$data['records'] = json_decode($rec[0]['processed_json']); + //$data['records'] = json_decode($rec[0]['json']); + $data['records'] = json_decode($rec[0]['processed_json']); $this->response($data,REST_Controller::HTTP_OK); } else @@ -2272,9 +2272,24 @@ class PD_Controller extends REST_Controller { - } + } + + + } + + foreach($records['companies'] as $company_key => $company) + { + // print_r($company); + if($company['is_applicant'] == true && $company['is_new'] == true,) + { + $temp_array = array('fk_pd_id'=>$records['pdid'],'applicant_name'=>$company['company_name'],'applicant_type'=>2,'applicant_title_name'=>$company['company_messrs_name']); + $new_co_appliacant_id = $this->PD_Model->saveRecords($temp_array,PDAPPLICANTSDETAILS); + + $records['companies'][$company_key]['is_new'] = false; + } + } } return $records; @@ -4011,7 +4026,7 @@ class PD_Controller extends REST_Controller { foreach($temp_data['companies'] as $company) { - $company_list[] = array('company_order_id' => $company['company_order_id'],'company_name' => $company['company_name'],'is_active' => $company['is_active']); + $company_list[] = array('company_order_id' => $company['company_order_id'],'company_name' => $company['company_name'],'is_active' => $company['is_active'],'is_company_applicant'=>$company['is_company_applicant']); } foreach($company_list as $list_key => $company)