diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index a27f955c..b9a52997 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -5034,7 +5034,7 @@ class PD_Controller extends REST_Controller { $records = $this->post('records'); $pdid = $records['pd_id']; - ini_set('max_execution_time', 300); + //ini_set('max_execution_time', 300); //PDALERTS::pdnotification($pdid);die(); $is_regenerate = 0; if(isset($records['regenerate'])) diff --git a/api/application/helpers/businessform_helper.php b/api/application/helpers/businessform_helper.php index 0b6c5c5f..14301785 100644 --- a/api/application/helpers/businessform_helper.php +++ b/api/application/helpers/businessform_helper.php @@ -33,7 +33,8 @@ public static function getFamilyMemberDetails($values){ foreach($values as $parRow){ if($parRow['family_member_name'] != "" || $parRow['family_member_name'] != null) { - $temp_family = array('name' => $parRow['family_member_salutation_master'].' '.$parRow['family_member_name'],'individual_relation' => $parRow['other_family_relationship_id_master'] .' of ','relation_to' => $parRow['relation_to_id_master'],'relation_to_company' => substr($parRow['relationship_with_company_id_master'],0,-2),'started_business' => $parRow['started_business']); + $company_relationship = strpos($parRow['relationship_with_company_id_master'], 'of') ? substr($parRow['relationship_with_company_id_master'],0,-2): $parRow['relationship_with_company_id_master']; + $temp_family = array('name' => $parRow['family_member_salutation_master'].' '.$parRow['family_member_name'],'individual_relation' => $parRow['other_family_relationship_id_master'] .' of ','relation_to' => $parRow['relation_to_id_master'],'relation_to_company' => $company_relationship,'started_business' => $parRow['started_business']); array_push($getFamilyMembers,$temp_family); } diff --git a/api/application/views/report_templates/JSONTOREPORT.php b/api/application/views/report_templates/JSONTOREPORT.php index 751b5419..3ed7d009 100644 --- a/api/application/views/report_templates/JSONTOREPORT.php +++ b/api/application/views/report_templates/JSONTOREPORT.php @@ -797,7 +797,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $answer = null; $per = $business_score['attributed_score'] > 0 && $business_score['max_score'] > 0 ? ( ($business_score['attributed_score'] / $business_score['max_score']) * 100) : 0; - $class = ( $per >= 80 ? 'rcorners_green' : ($per >= 70 && $per < 80 ? 'rcorners_light_green' : ($per >= 60 && $per < 70 ? 'rcorners_amber' : 'rcorners_red'))); + $class = ( $per >= 80 ? 'rcorners_green' : ($per >= 65 && $per < 80 ? 'rcorners_light_green' : ($per >= 50 && $per < 65 ? 'rcorners_amber' : 'rcorners_red'))); // if($bsk == 'business_seasonality') // { @@ -843,7 +843,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $class = null; $per = $general_score['attributed_score'] > 0 && $general_score['max_score'] > 0 ? ( ($general_score['attributed_score'] / $general_score['max_score']) * 100) : 0; - $class = ( $per >= 80 ? 'rcorners_green' : $per >= 70 && $per < 80 ? 'rcorners_light_green' : $per >= 60 && $per < 70 ? 'rcorners_amber' : 'rcorners_red'); + $class = ( $per >= 80 ? 'rcorners_green' : ($per >= 65 && $per < 80 ? 'rcorners_light_green' : ($per >= 50 && $per < 65 ? 'rcorners_amber' : 'rcorners_red'))); + $answer = ucfirst($general_score['answer']); if($gsk == 'value_of_other_assets') @@ -906,6 +907,25 @@ defined('BASEPATH') OR exit('No direct script access allowed'); break; } } + + $name_board_seen_img_url = ''; + if(isset($pd_processed_forms[13][0])) + { + + $first_business_form = json_decode($pd_processed_forms[13][0]['processed_json'],true); + if($first_business_form['was_the_company_name_board_sighted']=='yes') + { + //echo 'YES';die(); + foreach ($pd_images[13] as $image_key => $image_value) { + if($image_value['pd_document_title'] == 'Name Board Seen') + { + $name_board_seen_img_url = $image_value['doc_url']; + break; + } + } + } + } + //echo $name_board_seen_img_url;die(); //print_r($address_images);die(); ?>
@@ -948,9 +968,10 @@ defined('BASEPATH') OR exit('No direct script access allowed'); PD Location Approach Name Board of Business + - Name Board + Name Board '.$pd_location_approach_img_date; ?> @@ -1029,7 +1050,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); if(strpos(strval($enduse), 'Others') === false) { $end_use.= $enduse.' and ';}else{ $end_use.=$loan_form['end_use_other'].' and'; } } $end_use = substr_replace($end_use, '', strrpos($end_use, 'and'),strlen($end_use)); - + $end_use = 'For '.$end_use; $loan_table_dispaly_rows[] = array('particulars' => 'Loan Purpose','details' => $end_use); if(strcasecmp($loan_form['is_transfer'],'no'))