diff --git a/api/application/controllers/Flyhi_Controller.php b/api/application/controllers/Flyhi_Controller.php index d2c11f32..fe507e63 100644 --- a/api/application/controllers/Flyhi_Controller.php +++ b/api/application/controllers/Flyhi_Controller.php @@ -611,7 +611,7 @@ class Flyhi_Controller extends REST_Controller { //$view_name = $sales_pd_data[0]['short_name'].'_'.$sales_pd_data[0]['abbr']; $view_name = $sales_pd_data[0]['short_name']; $html_content = $this->load->view('sale_pd_templates/'.$view_name,$view_data,true); - echo $html_content;die(); + // echo $html_content;die(); $pdf_doc = $this->pdfgenerator->generate($html_content, $filename='version', $stream=false, $paper = 'A4', $orientation = "portrait"); //End of PDF Gen using DOM PDF $output_file = $this->external_path ."/sales_pd/" .$pd_id. "/temp.pdf"; @@ -674,17 +674,15 @@ class Flyhi_Controller extends REST_Controller { { $questions = json_decode($section_array['section_data'],true); return $this->processSalesPDQuestions($questions['questions'],$section_array['section_id']); - } } function processSalesPDQuestions($questions,$section_id) { - //print_r($questions);die(); $temp_array = array(); foreach ($questions as $ques_key => $question) { - //if($question['section_id']){} + if($question['is_repeatable'] == null && ($question['type'] == 1 || $question['type'] == 2 || $question['type'] == 3 || $question['type'] == 4 || $question['type'] == 6 || $question['type'] == 7 || $question['type'] == 8))//text,radio,SDD,MDD,camera,txt area, searchable dd { @@ -692,20 +690,30 @@ class Flyhi_Controller extends REST_Controller { if($question['question_key'] == 'residence_state' || $question['question_key'] == 'residence_city' || $question['question_key'] == 'residence_pincode' || $question['question_key'] == 'business_state'|| $question['question_key'] == 'business_city'|| $question['question_key'] == 'business_pincode' || $question['question_key'] == 'permanent_state' || $question['question_key'] == 'permanent_city' || $question['question_key'] == 'permanent_pincode' || - $question['question_key'] == 'officer_state' || $question['question_key'] == 'officer_city' || $question['question_key'] == 'officer_pincode') + $question['question_key'] == 'officer_state' || $question['question_key'] == 'officer_city' || $question['question_key'] == 'officer_pincode' || + $question['question_key'] == 'lender_name' || $question['question_key'] == 'branch' || $question['question_key'] == 'lender_sales_person' || $question['question_key'] == 'lender_credit_person') // $question['question_key'] == 'employer_business_state' || $question['question_key'] == 'employer_business_address_city' || $question['question_key'] == 'employer_business_pincode' || // $question['question_key'] == 'educational_institute_state' || $question['question_key'] == 'educational_institute_address_city' || $question['question_key'] == 'educational_institute_pincode' // ) { - //if($question['type'] == 4) { print_r($question['answer_value']); } - $temp_array[ $question['question_key'] ] = $this->getMasterData($question['answer_value'],$question['answers']); - // if($question['type'] == 4) { print_r($temp_array[ $question['question_key'] ]); } + $temp_array[ $question['question_key'] ] = $this->getMasterData($question['answer_value'],$question['answers']); } if(isset($question['subfield_key'])) { - $temp_array[ $question['question_key'] ] .= $question['subfield_value'].','; + } + if(isset($question['onchange_properties'])){ + for ($a = 0; $a < count($question['onchange_properties']); $a++){ + if(isset($question['onchange_properties'][$a]['form_controls'])){ + $onchange_array = $question['onchange_properties'][$a]['form_controls']; + $singleArray = []; + for ($i = 0; $i < count($onchange_array); $i++){ + $value = $this->processSalesPDQuestions($onchange_array[$i]['questions'],$section_id); + foreach ($value as $key => $val){ $temp_array[$key] = $val; } + } + } + } } // echo 'FIRST';print_r($temp_array[ $question['question_key'] ]); if(substr_count($temp_array[ $question['question_key'] ], ',')) @@ -745,7 +753,6 @@ class Flyhi_Controller extends REST_Controller { } else { -//echo "SDKJHKSJ**"; $group_temp = array(); foreach ($question['questions_group'] as $group_key => $group_value) { @@ -756,12 +763,12 @@ class Flyhi_Controller extends REST_Controller { } } } - // //print_r($temp_array);die(); // if($section_id == 2) // { // //print_r(json_decode($section_array['section_data'],true)); die(); // die(); // } + return $temp_array; } diff --git a/api/application/views/sale_pd_templates/FHFSL.php b/api/application/views/sale_pd_templates/FHFSL.php index 777c65e8..abd003f2 100644 --- a/api/application/views/sale_pd_templates/FHFSL.php +++ b/api/application/views/sale_pd_templates/FHFSL.php @@ -356,15 +356,15 @@ defined('BASEPATH') OR exit('No direct script access allowed');