Sineedge/sparqapi
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TINY ISSUES 2

Browse Source
This commit is contained in:
Velz2020 2019-08-06 19:47:59 +05:30
parent 080f920e71
commit 6eda7c94fd
4 changed files with 40 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
api/application/helpers/financialform_helper.php
View File

@ -49,8 +49,22 @@ public static function getOtherLoanDetails($values){
$setFrequencyType = ' per'; $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 ? '<td class="customtd">'.$tag['others_loan_type'].'</td>' : '<td class="customtd">'.$tag['loan_type_master'] .'</td>'; $first_row .= $tag['loan_type']==1 ? '<td class="customtd">'.$tag['others_loan_type'].'</td>' : '<td class="customtd">'.$tag['loan_type_master'] .'</td>';
@ -61,7 +75,7 @@ public static function getOtherLoanDetails($values){
$fourth_row .= $tag['lender']==1 ? '<td class="customtd">'.$tag['others_lender'].'</td>' : '<td class="customtd">'.$tag['lender_master'].'</td>'; $fourth_row .= $tag['lender']==1 ? '<td class="customtd">'.$tag['others_lender'].'</td>' : '<td class="customtd">'.$tag['lender_master'].'</td>';
$fifth_row .= $loanTaken['id']==0 ? '<td class="customtd">'.$tag['others_loan_taken'].'</td>' : '<td class="customtd">'.$loanTaken['name'].'</td>'; $fifth_row .= '<td class="customtd">'.$name_of_borrower.'</td>';
$sixth_row .= '<td class="customtd">'.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($tag['emi']).'</td>'; $sixth_row .= '<td class="customtd">'.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($tag['emi']).'</td>';
@ -70,8 +84,8 @@ public static function getOtherLoanDetails($values){
$eigth_row .= '<td class="customtd">'.$tag['original_tenure'].'</td>'; $eigth_row .= '<td class="customtd">'.$tag['original_tenure'].'</td>';
$ninth_row .= '<td class="customtd">'.$tag['elapsed_tenure'].'</td>'; $ninth_row .= '<td class="customtd">'.$tag['elapsed_tenure'].'</td>';
$bal = is_numeric($tag['original_tenure']) && is_numeric($tag['elapsed_tenure']) ? ($tag['original_tenure'] - $tag['elapsed_tenure']) : '';
$tenth_row .= '<td class="customtd">'.($tag['original_tenure'] - $tag['elapsed_tenure']).'</td>'; $tenth_row .= '<td class="customtd">'.$bal.'</td>';
} }
} }
return array( return array(

20
api/application/helpers/neighbourreferencecheckform_helper.php
View File

@ -38,27 +38,27 @@ public static function getNeighbourhoodDetails($company_name,$values,$pdMasterVa
if($owner['id'] != 0) if($owner['id'] != 0)
{ {
$title = MYUTIL::applicantTitleName($applicants_details,$owner['id']); $title = MYUTIL::applicantTitleName($applicants_details,$owner['id']);
$ownwers_list .= $title.$owner['name'].','; $ownwers_list .= $title.$owner['name'].' , ';
} }
else else
{ {
$ownwers_list .= ' '.$tag['other_organisation_owner'].','; $ownwers_list .= ' '.$tag['other_organisation_owner'].' , ';
} }
} }
//echo $ownwers_list; //echo $ownwers_list;
//$ownwers_list = substr_replace($ownwers_list,'', strrpos(-$ownwers_list,','),1); //$ownwers_list = substr_replace($ownwers_list,'', strrpos(-$ownwers_list,','),1);
//echo $ownwers_list; //echo $ownwers_list;
if(count($tag['organisation_owner']) == 1) //echo $ownwers_list;echo "**********";
{
$ownwers_list = substr_replace($ownwers_list,'', strrpos($ownwers_list,','),1); $ownwers_list = substr_replace($ownwers_list,'', strrpos($ownwers_list,','),1);
}else if($tag['organisation_owner'] > 1) if(strrpos($ownwers_list,','))
{ {
$ownwers_list = substr_replace($ownwers_list,' and ', strrpos($ownwers_list,','),1); $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'; $grammer2 = count($tag['organisation_owner']) > 1 ? 'owners': 'owner';
$ownership = 'As per '.$tag['neighbourhood_name'].' the '.$grammer2 .' of '.$company_name.$grammer1.$ownwers_list.'.'; $ownership = 'As per '.$tag['neighbourhood_name'].' the '.$grammer2 .' of '.$company_name.$grammer1.$ownwers_list.'.';

4
api/application/helpers/otherfamilyform_helper.php
View File

@ -18,7 +18,9 @@ public static function getFamilyDetails($values){
//$storeValue['residency_address'] .='.'; //$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']=($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['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['rent'] = $fetchVal['rent'];
$storeValue['no_family_members']= count($fetchVal['family_members_details']) > 0 ? count($fetchVal['family_members_details']) : '0'; $storeValue['no_family_members']= count($fetchVal['family_members_details']) > 0 ? count($fetchVal['family_members_details']) : '0';

13
api/application/views/report_templates/JSONTOREPORT.php
View File

@ -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'] ); $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'] : ''); $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 ); $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');
<!-- <p>Status of check: Could Not Verify. <br>Neighbour Check was not possible due to Could not verify</p> --> <!-- <p>Status of check: Could Not Verify. <br>Neighbour Check was not possible due to Could not verify</p> -->
<!-- <p>Neighbour Check was not possible due to Could not verify</p> --> <!-- <p>Neighbour Check was not possible due to Could not verify</p> -->
<p>Status of the check: could not verify.<p> <p>Status of the check: could not verify.<p>
<?php <?php
}
if($neighbourhood_form_common_remarks != ""){ echo '<p>'. $neighbourhood_form_common_remarks.'</p>';} if($neighbourhood_form_common_remarks != ""){ echo '<p>'. $neighbourhood_form_common_remarks.'</p>';}
}?> ?>
<!-- #################end neighbourhood/reference check #################--> <!-- #################end neighbourhood/reference check #################-->
@ -4128,7 +4133,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
<!-- #################Annexure B(RI) section start#################--> <!-- #################Annexure B(RI) section start#################-->
<?php <?php
if($GLOBALS['is_rental_available'] == 1) if(isset($GLOBALS['is_rental_available']) && $GLOBALS['is_rental_available'] == 1)
{ {
$rental_data = array(); $rental_data = array();
$first_owners_row = '<tr><td>Lessor Name / Property Owner Name</td>'; $first_owners_row = '<tr><td>Lessor Name / Property Owner Name</td>';