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

LIVE ISSUES RESLOVED

Browse Source
This commit is contained in:
Velz2020 2019-08-24 21:03:47 +05:30
parent 9103f4ad0e
commit 7d70080401
6 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/application/controllers/PD_Controller.php
View File

@ -5589,7 +5589,7 @@ public function getPDFormDetailsJSON_post()
// print_r($data['assessed_income_details']);
// echo "**************************";
//$data['dsc_cards'] = $this->getDetailedScoreCardChart( $data['pd_score'] );
if($data['pd_master_details'][0]['is_score_card_enabled'] != 0)
if($data['pd_master_details'][0]['is_score_card_enabled'] = 0)
{
$data['pd_score'] = $this->calculateScore($pdid);
$score_for_chart = $data['pd_score']['score_summary']['overall_score']['final_score'] ? round($data['pd_score']['score_summary']['overall_score']['final_score'],1) : 0;

18
api/application/helpers/businessform_helper.php
View File

@ -6,12 +6,18 @@ class Businessform
public static function getPartnerDetails($values){
$getPartner=array();
foreach($values as $parRow){
$getPartner = array_map(function($tag) {
$con_business_run = $tag['current_business_experiance_year'] >0 ? $tag['current_business_experiance_year'] :"";
$con_business_run .= ($tag['current_business_experiance_year'] == 1) ? " Year" : (($tag['current_business_experiance_year'] > 1) ? " Years" : "");
$con_business_run.=' ';
$con_business_run .=$tag['current_business_experiance_month'] >0 ? 'and ' . $tag['current_business_experiance_month'] : "";
$con_business_run .=($tag['current_business_experiance_month'] == 1) ? " Month" : (($tag['current_business_experiance_month'] > 1) ? " Months" : "");
$getPartner = array_map(function($tag) {
$con_business_run = '';
if($tag['current_business_experiance_year'] != '' && $tag['current_business_experiance_month'] != '')
{
$con_business_run = $tag['current_business_experiance_year'].' Year(s) and ' . $tag['current_business_experiance_month'].' Month(s)';
}
else
{
$con_business_run = ($tag['current_business_experiance_year'] != '' ? $tag['current_business_experiance_year'] .' Year(s)' : ($tag['current_business_experiance_month'] != '' ? $tag['current_business_experiance_month'].' Month(s)':''));
}
return array(
'name' => array_key_exists('partner_other_name',$tag) ? $tag['partner_other_name'] : $tag['partner_name_master'],
'share_holding' => $tag['shareholding'].'%',

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

@ -113,8 +113,8 @@ class MYUTIL
$data['partners_title_name'] = "Trustee Details";
break;
}
$data['year_and_month']= $value['business_years'] . ' Years';
$data['year_and_month'] .= isset($value['business_month']) && $value['business_month'] != "" ? ' and '.$value['business_month'] . ' Months': '';
$data['year_and_month']= $value['business_years'] . ' Year(s)';
$data['year_and_month'] .= isset($value['business_month']) && $value['business_month'] != "" ? ' and '.$value['business_month'] . ' Month(s)': '';
$data['formed_on'] = $value['business_date_object'] ? date("d-m-Y", strtotime($value['business_date_object'])) : null;

41
api/application/models/PD_Model.php
View File

@ -836,13 +836,13 @@ class PD_Model extends SPARQ_Model {
if($result_array[0]['lender_applicant_id'] == "" || $result_array[0]['lender_applicant_id'] == null){ $mandatory_fields[] = 'lender_applicant_id'; }
if($result_array[0]['fk_product_id'] == "" || $result_array[0]['fk_product_id'] == null){ $mandatory_fields[] = 'fk_product_id'; }
if($result_array[0]['fk_product_id'] == "" || $result_array[0]['fk_product_id'] == null || $result_array[0]['fk_product_id'] == 0){ $mandatory_fields[] = 'fk_product_id'; }
//if($result_array[0]['fk_subproduct_id'] == "" || $result_array[0]['fk_subproduct_id'] == null){ $mandatory_fields[] = 'fk_subproduct_id'; }
if($result_array[0]['fk_subproduct_id'] == "" || $result_array[0]['fk_subproduct_id'] == null || $result_array[0]['fk_subproduct_id'] == 0){ $mandatory_fields[] = 'fk_subproduct_id'; }
if($result_array[0]['fk_pd_type'] == "" || $result_array[0]['fk_pd_type'] == null){ $mandatory_fields[] = 'fk_pd_type'; }
if($result_array[0]['fk_pd_type'] == "" || $result_array[0]['fk_pd_type'] == null || $result_array[0]['fk_pd_type'] == 0){ $mandatory_fields[] = 'fk_pd_type'; }
if($result_array[0]['fk_customer_segment'] == "" || $result_array[0]['fk_customer_segment'] == null){ $mandatory_fields[] = 'fk_customer_segment'; }
if($result_array[0]['fk_customer_segment'] == "" || $result_array[0]['fk_customer_segment'] == null || result_array[0]['fk_customer_segment'] == 0){ $mandatory_fields[] = 'fk_customer_segment'; }
if($result_array[0]['loan_amount'] == "" || $result_array[0]['loan_amount'] == null){ $mandatory_fields[] = 'loan_amount'; }
@ -858,34 +858,27 @@ class PD_Model extends SPARQ_Model {
if($result_array[0]['pincode'] == "" || $result_array[0]['pincode'] == null){ $mandatory_fields[] = 'pincode'; }
if($result_array[0]['lender_short_name'] != 'IMGC')
{
if($result_array[0]['pd_contact_person'] == "" || $result_array[0]['pd_contact_person'] == null){ $mandatory_fields[] = 'pd_contact_person'; }
}
if($result_array[0]['pd_contact_person'] == "" || $result_array[0]['pd_contact_person'] == null){
if($result_array[0]['lender_credit_person'] == "" || $result_array[0]['lender_credit_person'] == null)
{
$mandatory_fields[] = 'pd_contact_person';
}
}
if($result_array[0]['pd_contact_landline'] == "" || $result_array[0]['pd_contact_landline'] == null)
if($result_array[0]['pd_contact_landline'] == "" || $result_array[0]['pd_contact_landline'] == null)
{
if($result_array[0]['pd_contact_mobileno'] == "" || $result_array[0]['pd_contact_mobileno'] == null)
{
$mandatory_fields[] = 'pd_contact_landline';
$mandatory_fields[] = 'pd_contact_mobileno';
}
}
}
else
{
// if($result_array[0]['lender_sales_person'] == "" || $result_array[0]['lender_sales_person'] == null)
// {
// $mandatory_fields[] = 'lender_sales_person';
// }
if($result_array[0]['lender_credit_person'] == "" || $result_array[0]['lender_credit_person'] == null)
{
$mandatory_fields[] = 'lender_credit_person';
}
if($result_array[0]['imgc_fin_institute'] == "" || $result_array[0]['imgc_fin_institute'] == null)
{
$mandatory_fields[] = 'imgc_fin_institute';
}
}
if($result_array[0]['fk_address_id'] == "" || $result_array[0]['fk_address_id'] == null)
{

2
api/application/views/js/phantomchart.js
View File

@ -1 +1 @@
var page = require('webpage').create();page.viewportSize = { width: 600, height: 350 };page.clipRect = { top: 0, left: 0, width: 600, height: 350 };var score = 74.2;var url = 'http://localhost/AWSEC2/sparqapi/api?'+score;var image_url = 'C:/xampp/htdocs/ssa_external_data/testing/pd_reports/1244/chart.png' ;page.open(url,function() {setTimeout(function() {page.render(image_url);phantom.exit();}, 500);});
var page = require('webpage').create();page.viewportSize = { width: 600, height: 350 };page.clipRect = { top: 0, left: 0, width: 600, height: 350 };var score = 43.2;var url = 'http://localhost/AWSEC2/sparqapi/api?'+score;var image_url = 'C:/xampp/htdocs/ssa_external_data/production/pd_reports/1/chart.png' ;page.open(url,function() {setTimeout(function() {page.render(image_url);phantom.exit();}, 500);});

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

@ -638,7 +638,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
<?php
//print_r($general_form['individuals']);
//print_r($general_form);die();
foreach($general_form['individuals'] as $ind_key => $individual)
{
@ -1426,7 +1426,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
<th>Name</th>
<th>Share Holding</th>
<th>No.of Years in Current Business</th>
<th>Total Work Experience</th>
<th>Total Work Experience(Yrs)</th>
<th>Previous Experience</th>
<th>Started Business</th>
</tr>