diff --git a/api/application/helpers/financialform_helper.php b/api/application/helpers/financialform_helper.php
index dc6507a1..03364583 100644
--- a/api/application/helpers/financialform_helper.php
+++ b/api/application/helpers/financialform_helper.php
@@ -49,8 +49,22 @@ public static function getOtherLoanDetails($values){
$setFrequencyType = ' per';
}
- $loanTaken=$tag['loan_taken_by'][0];
+ $name_of_borrower = '';
+ foreach ($tag['loan_taken_by'] as $l_key => $l_value) {
+ if($l_value['id'] == 0)
+ {
+ $name_of_borrower .= $tag['others_loan_taken'].' ,';
+ }
+ else
+ {
+ $name_of_borrower .= $l_value['name'] . ' , ';
+ }
+ }
+ $name_of_borrower = substr_replace($name_of_borrower,'',strrpos($name_of_borrower,','),1);
+ if(strrpos($name_of_borrower,',')) { $name_of_borrower = substr_replace($name_of_borrower,' and ',strrpos($name_of_borrower,','),1); }
+
+
$first_row .= $tag['loan_type']==1 ? '
'.$tag['others_loan_type'].' | ' : ''.$tag['loan_type_master'] .' | ';
@@ -61,7 +75,7 @@ public static function getOtherLoanDetails($values){
$fourth_row .= $tag['lender']==1 ? ''.$tag['others_lender'].' | ' : ''.$tag['lender_master'].' | ';
- $fifth_row .= $loanTaken['id']==0 ? ''.$tag['others_loan_taken'].' | ' : ''.$loanTaken['name'].' | ';
+ $fifth_row .= ''.$name_of_borrower.' | ';
$sixth_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($tag['emi']).' | ';
@@ -70,8 +84,8 @@ public static function getOtherLoanDetails($values){
$eigth_row .= ''.$tag['original_tenure'].' | ';
$ninth_row .= ''.$tag['elapsed_tenure'].' | ';
-
- $tenth_row .= ''.($tag['original_tenure'] - $tag['elapsed_tenure']).' | ';
+ $bal = is_numeric($tag['original_tenure']) && is_numeric($tag['elapsed_tenure']) ? ($tag['original_tenure'] - $tag['elapsed_tenure']) : '';
+ $tenth_row .= ''.$bal.' | ';
}
}
return array(
diff --git a/api/application/helpers/neighbourreferencecheckform_helper.php b/api/application/helpers/neighbourreferencecheckform_helper.php
index 1f8fc603..415323e0 100644
--- a/api/application/helpers/neighbourreferencecheckform_helper.php
+++ b/api/application/helpers/neighbourreferencecheckform_helper.php
@@ -38,27 +38,27 @@ public static function getNeighbourhoodDetails($company_name,$values,$pdMasterVa
if($owner['id'] != 0)
{
$title = MYUTIL::applicantTitleName($applicants_details,$owner['id']);
- $ownwers_list .= $title.$owner['name'].',';
+ $ownwers_list .= $title.$owner['name'].' , ';
}
else
{
- $ownwers_list .= ' '.$tag['other_organisation_owner'].',';
+ $ownwers_list .= ' '.$tag['other_organisation_owner'].' , ';
}
}
//echo $ownwers_list;
//$ownwers_list = substr_replace($ownwers_list,'', strrpos(-$ownwers_list,','),1);
//echo $ownwers_list;
- if(count($tag['organisation_owner']) == 1)
- {
+ //echo $ownwers_list;echo "**********";
+
$ownwers_list = substr_replace($ownwers_list,'', strrpos($ownwers_list,','),1);
- }else if($tag['organisation_owner'] > 1)
- {
- $ownwers_list = substr_replace($ownwers_list,' and ', strrpos($ownwers_list,','),1);
- }
+ if(strrpos($ownwers_list,','))
+ {
+ $ownwers_list = substr_replace($ownwers_list,' and ', strrpos($ownwers_list,','),1);
+ }
-
- $grammer1 = count($tag['organisation_owner']) > 1 ? ' are': ' is ';
+
+ $grammer1 = count($tag['organisation_owner']) > 1 ? ' are ': ' is ';
$grammer2 = count($tag['organisation_owner']) > 1 ? 'owners': 'owner';
$ownership = 'As per '.$tag['neighbourhood_name'].' the '.$grammer2 .' of '.$company_name.$grammer1.$ownwers_list.'.';
diff --git a/api/application/helpers/otherfamilyform_helper.php b/api/application/helpers/otherfamilyform_helper.php
index 869bb494..caea8854 100644
--- a/api/application/helpers/otherfamilyform_helper.php
+++ b/api/application/helpers/otherfamilyform_helper.php
@@ -18,7 +18,9 @@ public static function getFamilyDetails($values){
//$storeValue['residency_address'] .='.';
$storeValue['residence_No_of_years']=($fetchVal['residence_No_of_years'] == 1) ? $fetchVal['residence_No_of_years'].' year' :(($fetchVal['residence_No_of_years'] > 1) ? $fetchVal['residence_No_of_years'].' years' : "");
- $storeValue['residence_No_of_years'] .= isset($fetchVal['residence_No_of_months']) && $fetchVal['residence_No_of_months'] != "" ? ' and ' . $fetchVal['residence_No_of_months'] .' Month(s)' : '';
+ $storeValue['residence_No_of_years'] .= isset($fetchVal['residence_No_of_months']) && $fetchVal['residence_No_of_months'] != "" ? ( (isset($fetchVal['residence_No_of_years']) && $fetchVal['residence_No_of_years'] != 0) ? ' and ' : '' ).$fetchVal['residence_No_of_months'] .' Month(s)' : '';
+
+ // echo $storeValue['residence_No_of_years'];die();
$storeValue['residence_ownership']=($fetchVal['residence_ownership'] == 1) ? $fetchVal['ownershipOther'] :(($fetchVal['residence_ownership'] == 3) ? $fetchVal['residence_ownership_master'] : $fetchVal['residence_ownership_master']);
$storeValue['rent'] = $fetchVal['rent'];
$storeValue['no_family_members']= count($fetchVal['family_members_details']) > 0 ? count($fetchVal['family_members_details']) : '0';
diff --git a/api/application/views/report_templates/JSONTOREPORT.php b/api/application/views/report_templates/JSONTOREPORT.php
index ec8b26f1..b064ca62 100644
--- a/api/application/views/report_templates/JSONTOREPORT.php
+++ b/api/application/views/report_templates/JSONTOREPORT.php
@@ -1230,6 +1230,11 @@ defined('BASEPATH') OR exit('No direct script access allowed');
{
$loan_table_dispaly_rows[] = array('particulars' => 'Current Owner/Seller of the property','details' => $loan_form['property_seller'] );
+
+ }
+
+ if(isset($loan_form['address']) && $loan_form['address'] != '')
+ {
$address_of_owner_seller_property = $loan_form['address'] . (isset($loan_form['city_master']) ? ', '.$loan_form['city_master'] : '') . (isset($loan_form['state_master']) ? ', '.$loan_form['state_master'] : '') . (isset($loan_form['pincode_master']) ? ', '.$loan_form['pincode_master'] : '');
$loan_table_dispaly_rows[] = array('particulars' => 'Address of the property','details' => $address_of_owner_seller_property );
@@ -3833,11 +3838,11 @@ defined('BASEPATH') OR exit('No direct script access allowed');
Status of the check: could not verify.
-
+
'. $neighbourhood_form_common_remarks.'
';}
- }?>
+ ?>
@@ -4128,7 +4133,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
Lessor Name / Property Owner Name | ';