CLIX AND ISSUES FIXED

This commit is contained in:
Velz2020 2019-09-26 20:07:04 +05:30
parent 5b3563f118
commit dd8c6b3be8
6 changed files with 142 additions and 4708 deletions

View File

@ -384,23 +384,26 @@ class PD_Controller extends REST_Controller {
}
else // CHOOSE GENERIC TEMPLATE//
{
if( !strcasecmp($pd_details['fk_customer_segment'],'SAL-CASH') || !strcasecmp($pd_details['fk_customer_segment'],'SAL-CHQ'))
//get customer segment abbrvations
$customer_segment_abbr = $this->PD_Model->selectCustomRecords(array('*'),array('customer_segment_id' => $pd_details['fk_customer_segment'],'isactive' => 1),CUSTOMERSEGMENT);
$customer_segment_abbr = $customer_segment_abbr[0]['customer_segment_abbr'];
if( !strcasecmp($customer_segment_abbr,'SAL-CASH') || !strcasecmp($customer_segment_abbr,'SAL-CHQ'))
{
//SAL - (CASH/CHQ)
$pd_details['fk_pd_template_id'] = 1;
}
else if( !strcasecmp($pd_details['fk_customer_segment'],'SE-DI') || !strcasecmp($pd_details['fk_customer_segment'],'SEP-DI') || !strcasecmp($pd_details['fk_customer_segment'],'SEP_INDV'))
else if( !strcasecmp($customer_segment_abbr,'SE-DI') || !strcasecmp($customer_segment_abbr,'SEP-DI') || !strcasecmp($customer_segment_abbr,'SEP_INDV'))
{
//* SENP/SEP - (DI)
$pd_details['fk_pd_template_id'] = 2;
}
else if( !strcasecmp($pd_details['fk_customer_segment'],'SE-AI') || !strcasecmp($pd_details['fk_customer_segment'],'SEP-AI') )
else if( !strcasecmp($customer_segment_abbr,'SE-AI') || !strcasecmp($customer_segment_abbr,'SEP-AI') )
{
//* SENP/SEP - (DI)
$pd_details['fk_pd_template_id'] = 3;
}
else if( !strcasecmp($pd_details['fk_customer_segment'],'SE-RI'))
else if( !strcasecmp($customer_segment_abbr,'SE-RI'))
{
//* SENP/SEP - (RI)
$pd_details['fk_pd_template_id'] = 4;
@ -408,6 +411,7 @@ class PD_Controller extends REST_Controller {
}
}
/***********************PD ALLOCATION TYPE PROCESS **********/
@ -1083,13 +1087,15 @@ public function assignPDTempalate($data)
{
//print_r($data);
$customer_segment_abbr = '';
if(!is_array($data))
{
$logger = MYLOG::logFunction(null,$data);
$logger->info("TEMPLATE ASSIGN FUNCTIONALTIY CALLED",array('ENV'=>ENVIRONMENT,'DATA' => $data));
$fields = array('fk_lender_id','fk_product_id','fk_customer_segment','pd_status');
$where_condition_array = array('pd_id' => $data);
$res_array = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,PDTRIGGER);
// $fields = array('fk_lender_id','fk_product_id','fk_customer_segment','pd_status');
// $where_condition_array = array('pd_id' => $data);
$res_array = $this->PD_Model->getPDMasterDetails($data);
$customer_segment_abbr = $res_array[0]['customer_segment_abbr'];
}
$templateid = null;
@ -1099,6 +1105,9 @@ public function assignPDTempalate($data)
if(!is_array($data))
{
$where_condition_array = array('fk_lender_id'=>$res_array[0]['fk_lender_id'] ,'fk_product_id'=> $res_array[0]['fk_product_id'],'fk_customer_segment'=> $res_array[0]['fk_customer_segment'],'isactive' => 1);
$customer_segment_abbr = $this->PD_Model->selectCustomRecords(array('*'),array('customer_segment_id' => $res_array[0]['fk_customer_segment'], 'isactive' => 1),CUSTOMERSEGMENT);
$customer_segment_abbr = $customer_segment_abbr[0]['name'];
}
else
{
@ -1121,30 +1130,27 @@ public function assignPDTempalate($data)
else // CHOOSE GENERIC TEMPLATE//
{
//echo "CHOOSE GENERIC ";
$customer_segment = isset($res_array[0]['fk_customer_segment']) ? $res_array[0]['fk_customer_segment'] : $data['customer_segment'];
if($customer_segment == 1 || $customer_segment == 2)
{
//SAL - (CASH/CHQ)
$templateid = 1;
}
else if($customer_segment == 3 || $customer_segment == 5)
{
//* SENP/SEP - (DI)
$templateid = 2;
}
else if($customer_segment == 4 || $customer_segment == 6)
{
//* SENP/SEP - (AI)
$templateid = 3;
}
else if($customer_segment == 8)
{
//* SENP/SEP - (RI)
$templateid = 4;
}
if( !strcasecmp($customer_segment_abbr,'SAL-CASH') || !strcasecmp($customer_segment_abbr,'SAL-CHQ'))
{
//SAL - (CASH/CHQ)
$pd_details['fk_pd_template_id'] = 1;
}
else if( !strcasecmp($customer_segment_abbr,'SE-DI') || !strcasecmp($customer_segment_abbr,'SEP-DI') || !strcasecmp($customer_segment_abbr,'SEP_INDV'))
{
//* SENP/SEP - (DI)
$pd_details['fk_pd_template_id'] = 2;
}
else if( !strcasecmp($customer_segment_abbr,'SE-AI') || !strcasecmp($customer_segment_abbr,'SEP-AI') )
{
//* SENP/SEP - (DI)
$pd_details['fk_pd_template_id'] = 3;
}
else if( !strcasecmp($customer_segment_abbr,'SE-RI'))
{
//* SENP/SEP - (RI)
$pd_details['fk_pd_template_id'] = 4;
}
}
return $templateid;
@ -4763,7 +4769,7 @@ public function getPDFormDetailsJSON_post()
}
else if($data['pd_master_details'][0]['customer_segment_abbr'] == 'SE-DI' || $data['pd_master_details'][0]['customer_segment_abbr'] == 'SE-AI')
{
$temp = $this->load->view('report_templates/JSONTOREPORT',$data,true);
$temp = $this->load->view('report_templates/JSONTOREPORT_DI_AI',$data,true);
}
@ -5769,11 +5775,19 @@ public function getPDFormDetailsJSON_post()
mkdir($this->external_path.'/pd_reports/'.$pdid,0761);
}
//$this->load->helper('DIFFCHECK');
// $this->load->helper('DIFFCHECK');
// $old_version = $this->external_path.'/pd_reports/'.$pdid.'/a.html';
// $new_version = $this->external_path.'/pd_reports/'.$pdid.'/b.html';
// DIFFCHECK::checkDiff($old_version,$new_version);
// $file_one = fopen($old_version, 'r');
// $file_two = fopen($new_version, 'r');
// while( !feof($file_one))
// {
// echo fgets($fp). "<br>";
// }
//DIFFCHECK::checkDiff($old_version,$new_version);
//xdiff_file_diff($old_version, $new_version, $this->external_path.'/pd_reports/'.$pdid.'/my_script.diff', 2);
//die();
@ -5846,6 +5860,9 @@ public function getPDFormDetailsJSON_post()
$is_regenerate = 1;
}
//print_r($records);
$add_on_pd = $this->PD_Model->selectCustomRecords(array('pd_id'),array('parent_pd_id' => $pdid,'is_child' => 1),PDTRIGGER);
$data['pd_master_details'] = $this->PD_Model->getPDMasterDetails($pdid);
$data['applicants_details'] = $this->PD_Model->getApplicantsDetails($pdid);
//print_r($data['pd_master_details']);die();
@ -5920,7 +5937,36 @@ public function getPDFormDetailsJSON_post()
//print_r($data['pd_images']);//die(); //print_r(json_decode($data['pd_processed_forms'][14][0]['processed_json'],true));
// die();
//echo "*******************************************";
//get add on forms and images
if(count($add_on_pd))
{
$data['add_on_pd_forms'] = array();
$data['add_on_pd_images'] = array();
$data['add_on_pd_master_details'] = array();
$add_on_forms = array(18,5,19,1,2,22,23,1,11);
foreach ($add_on_pd as $add_on_pd_key => $add_on_pd_value)
{
foreach ($add_on_forms as $add_on_forms_key => $add_on_forms_value)
{
$fields = array('processed_json');
$where_condition_array = array('isactive' => 1,'fk_pd_id'=>$add_on_pd_value['pd_id'],'fk_form_id' => $add_on_forms_value);
$data['add_on_pd_forms'][$add_on_pd_value['pd_id']][$add_on_forms_value] = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,PDFORMDETAILSJSON,array(),'','company_id','ASC');
$fields2 = array('*');
$data['add_on_pd_images'][$add_on_pd_value['pd_id']][$add_on_forms_value] = $this->PD_Model->getSignedPDDocsURL($add_on_pd_value['pd_id'],$add_on_forms_value,null,null,null,'report');
$data['add_on_pd_master_details'][$add_on_pd_value['pd_id']] = $this->PD_Model->getPDMasterDetails($pdid);
}
}
}
// print_r($data['add_on_pd_forms']);
// die();
if($data['pd_master_details'][0]['lender_short_name'] == 'CLIX')
{
$t = $this->load->view('report_templates/JSONTOREPORT_CLIX',$data,true);
@ -5929,9 +5975,9 @@ public function getPDFormDetailsJSON_post()
{
$t = $this->load->view('report_templates/JSONTOREPORT_RI',$data,true);
}
else if($data['pd_master_details'][0]['customer_segment_abbr'] == 'SE-DI' || $data['pd_master_details'][0]['customer_segment_abbr'] == 'SE-AI')
else if($data['pd_master_details'][0]['customer_segment_abbr'] == 'SE-DI' || $data['pd_master_details'][0]['customer_segment_abbr'] == 'SE-AI' || $data['pd_master_details'][0]['customer_segment_abbr'] == 'SEP_INDV')
{
$t = $this->load->view('report_templates/JSONTOREPORT',$data,true);
$t = $this->load->view('report_templates/JSONTOREPORT_DI_AI',$data,true);
}
//$t = $this->load->view('temp_html.html',null,true);
@ -5952,7 +5998,7 @@ public function getPDFormDetailsJSON_post()
$t = substr_replace($t,'',strpos($t,'<span class="tooltip">'),(strlen('<span class="tooltip">')));
}
echo $t;
//echo $t;
//$t = file_get_contents($this->external_path ."/pd_reports/" . $pdid . "/sample.html");
// $start_pos = strpos($t,'</script>');
@ -6125,10 +6171,6 @@ public function getCompaniesListsFromGeneralFormRawJSON_post()
$form_array[] = array('form_id' => 13,'form_name' => 'About Business');
if(!strcasecmp($lender_short_name, 'CLIX'))
{
$form_array[] = array('form_id' => 23,'form_name' => 'Future Plans & Business Environments');
}
$form_array[] = array('form_id' => 22,'form_name' => 'Business Assets');
$form_array[] = array('form_id' => 21,'form_name' => 'Business Banking');
@ -6136,16 +6178,16 @@ public function getCompaniesListsFromGeneralFormRawJSON_post()
$form_array[] = array('form_id' => 1,'form_name' => 'Supplier Details');
$form_array[] = array('form_id' => 2,'form_name' => 'Client Details');
$form_array[] = array('form_id' => 11,'form_name' => 'Stock Details');
if(!strcasecmp($lender_short_name, 'CLIX'))
{
$form_array[] = array('form_id' => 23,'form_name' => 'Future Plans & Business Environments');
}
}
else // AI Case
{
$form_array[] = array('form_id' => 13,'form_name' => 'About Business');
if(!strcasecmp($lender_short_name, 'CLIX'))
{
$form_array[] = array('form_id' => 23,'form_name' => 'Future Plans & Business Environments');
}
$form_array[] = array('form_id' => 22,'form_name' => 'Business Assets');
$form_array[] = array('form_id' => 21,'form_name' => 'Business Banking');
$form_array[] = array('form_id' => 14,'form_name' => 'Financial Information');
@ -6153,6 +6195,10 @@ public function getCompaniesListsFromGeneralFormRawJSON_post()
$form_array[] = array('form_id' => 2,'form_name' => 'Client Details');
$form_array[] = array('form_id' => 11,'form_name' => 'Stock Details');
$form_array[] = array('form_id' => 16,'form_name' => 'Assessed Income');
if(!strcasecmp($lender_short_name, 'CLIX'))
{
$form_array[] = array('form_id' => 23,'form_name' => 'Future Plans & Business Environments');
}
}
@ -8691,7 +8737,7 @@ public function getCompaniesListsFromGeneralFormRawJSON_post()
$records = $this->post('records');
$pd_details = $this->PD_Model->getPDMasterDetails($records['fk_pd_id']);
if(isset($records['isactive']) && $records['isactive'] == 0)//de activate the image
if(isset($records['isactive']) && ($records['isactive'] == 0 || $records['isactive'] == 1))//de activate the image
{
unset($records['image']);
$where_condition_array = array('pd_document_id' => $records['pd_document_id']);
@ -8747,7 +8793,7 @@ public function getCompaniesListsFromGeneralFormRawJSON_post()
{
$data['dataStatus'] = false;
$data['status'] = REST_Controller::HTTP_NOT_MODIFIED;
$data['msg'] = 'Something Went Wrong! Try Later';
$data['msg'] = 'Something Went Wrong! Try later';
$this->response($data,REST_Controller::HTTP_OK);
}
}

View File

@ -136,7 +136,8 @@ class AssessedIncome
// echo $considered_net_profit_row;
// echo $considered_net_margint_row;
if($house_hold_expense_count != 0){ $house_hold_expense_row = '';$disposable_income_row = '';
$net_margin_row = substr_replace($net_margin_row,'f.',strpos($net_margin_row, 'h.'),2);}
$net_margin_row = substr_replace($net_margin_row,'f.',strpos($net_margin_row, 'h.'));
}
return array('ai_table_header_row' => $ai_table_header_row,'sale_revenue_row' => $sale_revenue_row,'purchase_row' => $purchase_row,'gross_profit_loss_row' => $gross_profit_loss_row,'business_expense_row' => $business_expense_row,'gross_profit_loss_per_row' => $gross_profit_loss_per_row,'net_profit_loss_row' => $net_profit_loss_row,'house_hold_expense_row' => $house_hold_expense_row,'disposable_income_row'=>$disposable_income_row,'net_margin_row' => $net_margin_row,'considered_sales_revenue_row' => $considered_sales_revenue_row,'considered_net_profit_row' => $considered_net_profit_row,'considered_net_margint_row' =>$considered_net_margint_row);
@ -379,12 +380,12 @@ class AssessedIncome
// }
//print_r($ai_core_details['business_expenses']);die();
if(count($ai_core_details['business_expenses']))
{
foreach($ai_core_details['business_expenses'] as $business_expense)
{
$bs_temp['expense_item'] = $business_expense['expense_item'];
$bs_temp['expense_item'] = !strcasecmp($business_expense['expense_item'],'others') ? $business_expense['other_expense_item'] : $business_expense['expense_item'];
$bs_temp['frequency_name'] = $business_expense['frequency_name'];
$bs_temp['expense_value'] = $business_expense['expense_value'];
$bs_temp['annual_expenses_value'] = $business_expense['annual_expenses_value'];

View File

@ -295,13 +295,16 @@ class PD_Model extends SPARQ_Model {
$where_condition_array['fk_form_id'] = null ;
}
$time = '+2 day';
if($api_client = 'report')
if($api_client == 'report')
{
$time = '+5 day';
$where_condition_array['isactive'] = 1;
}
//print_r($where_condition_array);die();
$where_condition_array['isactive'] = 1;
$document_lists = $this->selectRecords(PDDOCUMENTS,$where_condition_array);
// print_r($this->db->last_query());die();
if(count($document_lists))
{

File diff suppressed because it is too large Load Diff

View File

@ -1057,7 +1057,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
echo '<span contenteditable="true">The PD visit was done at </span><span class="tooltip">'. $address_type. '<span class="tooltiptext">Address Form - Type of Address </span></span><span contenteditable="true"> of the loan applicants. </span>';
echo '<span contenteditable="true">The </span><span class="tooltip">'.$address_type.'<span class="tooltiptext">Address Form - Type of Address </span></span><span contenteditable="true"> is </span><span class="tooltip">'.$property_owner_type.'<span class="tooltiptext">Business Assest Form - Owner of the Property </span></span><span contenteditable="true"> and the business has been in operation from here for the last</span> <span class="tooltip">'.$yrs_being_run.'<span class="tooltiptext">Business Assest Form - Business running Yrs in this premise </span></span><span contenteditable="true">.</span>';
echo '<br><br><span contenteditable="true">The</span> <span class="tooltip">'.$address_type.'<span class="tooltiptext">Address Form - Type of Address </span></span> <span contenteditable="true">is located in </span><span class="tooltip">'.$locality.'<span class="tooltiptext">Address Form - Locality of Address </span></span> <span contenteditable="true">.</span>';
echo '<br><br><span contenteditable="true">The PD location was </span><span class="tooltip">'. $pd_address['pd_location_master'].'<span class="tooltiptext">Address Form - Approach to PD location </span></span>. ' . '<span contenteditable="true">As Per PD Offcier, the</span> <span class="tooltip">'.$address_type .'<span class="tooltiptext">Address Form - Type of Address </span></span> <span contenteditable="true">is situated in</span><span class="tooltip"> '.$comment_locality_master .'<span class="tooltiptext">Address Form - Comment on locality </span></span> <span contenteditable="true">Locality.</span>';
echo '<br><br><span contenteditable="true">The PD location was </span><span class="tooltip">'. $pd_address['pd_location_master'].'<span class="tooltiptext">Address Form - Approach to PD location </span></span>. ' . '<span contenteditable="true">As Per PD Officer, the</span> <span class="tooltip">'.$address_type .'<span class="tooltiptext">Address Form - Type of Address </span></span> <span contenteditable="true">is situated in</span><span class="tooltip"> '.$comment_locality_master .'<span class="tooltiptext">Address Form - Comment on locality </span></span> <span contenteditable="true">Locality.</span>';
echo '<br><br><span contenteditable="true">The PD officer also made the following observations:</span>' ;
echo '<br><ul>';
@ -1867,7 +1867,41 @@ defined('BASEPATH') OR exit('No direct script access allowed');
<div class="page_break"> </div>
<!-- #################End OF Business section############################### -->
<!-- #################Start of Future Plan and Business Environment #################-->
<?php
if(isset($pd_processed_forms[23][$business_count]))
{
$future_plan_business_environment = json_decode($pd_processed_forms[23][$business_count]['processed_json'],true);?>
<h3 contenteditable="true">Future Plan and Business Environment</h3>
<table class="scorecard_table">
<thead>
<tr> <th>Particulars</th> <th>Details</th> </tr>
</thead>
<tbody>
<?php
echo '<tr><td>USP of the business (How applicants business is different from others in the business)</td><td>'.$future_plan_business_environment['usp_of_the_business'].'</td></tr>';
echo '<tr><td>Future plan for business expansion</td><td>'.$future_plan_business_environment['future_plans_for_business_expansion'].'</td></tr>';
echo '<tr><td>Impact of GST on business</td><td>'.$future_plan_business_environment['impact_of_gst_on_the_business'].'</td></tr>';
echo '<tr><td>Key competitors in the business</td><td>'.$future_plan_business_environment['key_competitors'].'</td></tr>';
echo '<tr><td>Succession Plan for business</td><td>'.$future_plan_business_environment['succession_plan'].'</td></tr>';
echo '<tr><td>Brief of other group concerns/ Business run by the applicant</td><td>'.$future_plan_business_environment['brief_of_other_group_concerns_or_businesses_run_by_the_applicants'].'</td></tr>';
?>
</tbody>
</table>
<?php
if($future_plan_business_environment['remarks'] != "")
{
echo '<br>';
echo '<p>'. $future_plan_business_environment['remarks'] .'</p>';
}
}
?>
<!-- #################End of Future Plan and Business Environment #################-->
<!-- #################start business asset #################-->
<?php
@ -3160,41 +3194,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
<!-- #################Start of Future Plan and Business Environment #################-->
<?php
if(isset($pd_processed_forms[23][$business_count]))
{
$future_plan_business_environment = json_decode($pd_processed_forms[23][$business_count]['processed_json'],true);?>
<h3 contenteditable="true">Future Plan and Business Environment</h3>
<table class="scorecard_table">
<thead>
<tr> <th>Particulars</th> <th>Details</th> </tr>
</thead>
<tbody>
<?php
echo '<tr><td>USP of the business (How applicants business is different from others in the business)</td><td>'.$future_plan_business_environment['usp_of_the_business'].'</td></tr>';
echo '<tr><td>Future plan for business expansion</td><td>'.$future_plan_business_environment['future_plans_for_business_expansion'].'</td></tr>';
echo '<tr><td>Impact of GST on business</td><td>'.$future_plan_business_environment['impact_of_gst_on_the_business'].'</td></tr>';
echo '<tr><td>Key competitors in the business</td><td>'.$future_plan_business_environment['key_competitors'].'</td></tr>';
echo '<tr><td>Succession Plan for business</td><td>'.$future_plan_business_environment['succession_plan'].'</td></tr>';
echo '<tr><td>Brief of other group concerns/ Business run by the applicant</td><td>'.$future_plan_business_environment['brief_of_other_group_concerns_or_businesses_run_by_the_applicants'].'</td></tr>';
?>
</tbody>
</table>
<?php
if($future_plan_business_environment['remarks'] != "")
{
echo '<br>';
echo '<p>'. $future_plan_business_environment['remarks'] .'</p>';
}
}
?>
<!-- #################End of Future Plan and Business Environment #################-->

View File

@ -863,7 +863,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
echo '<span contenteditable="true">The PD visit was done at </span><span class="tooltip">'. $address_type. '<span class="tooltiptext">Address Form - Type of Address </span></span><span contenteditable="true"> of the loan applicants. </span>';
//echo '<span contenteditable="true">The </span><span class="tooltip">'.$address_type.'<span class="tooltiptext">Address Form - Type of Address </span></span><span contenteditable="true"> is </span><span class="tooltip">'.$property_owner_type.'<span class="tooltiptext">Business Assest Form - Owner of the Property </span></span><span contenteditable="true"> and the business has been in operation from here for the last</span> <span class="tooltip">'.$yrs_being_run.'<span class="tooltiptext">Business Assest Form - Business running Yrs in this premise </span></span><span contenteditable="true">.</span>';
echo '<br><br><span contenteditable="true">The</span> <span class="tooltip">'.$address_type.'<span class="tooltiptext">Address Form - Type of Address </span></span> <span contenteditable="true">is located in </span><span class="tooltip">'.$locality.'<span class="tooltiptext">Address Form - Locality of Address </span></span> <span contenteditable="true">and the estimated area of the</span> <span class="tooltip">'.$address_type.'<span class="tooltiptext">Address Form - Type of Address </span></span> <span contenteditable="true">is</span> <span class="tooltip">'.$estimated_area.'<span class="tooltiptext">Address Form - Estimated Area </span></span> <span contenteditable="true">.</span>';
echo '<br><br><span contenteditable="true">The PD location was </span><span class="tooltip">'. $pd_address['pd_location_master'].'<span class="tooltiptext">Address Form - Approach to PD location </span></span>. ' . '<span contenteditable="true">As Per PD Offcier, the</span> <span class="tooltip">'.$address_type .'<span class="tooltiptext">Address Form - Type of Address </span></span> <span contenteditable="true">is situated in</span><span class="tooltip"> '.$comment_locality_master .'<span class="tooltiptext">Address Form - Comment on locality </span></span> <span contenteditable="true">Locality.</span>';
echo '<br><br><span contenteditable="true">The PD location was </span><span class="tooltip">'. $pd_address['pd_location_master'].'<span class="tooltiptext">Address Form - Approach to PD location </span></span>. ' . '<span contenteditable="true">As Per PD Officer, the</span> <span class="tooltip">'.$address_type .'<span class="tooltiptext">Address Form - Type of Address </span></span> <span contenteditable="true">is situated in</span><span class="tooltip"> '.$comment_locality_master .'<span class="tooltiptext">Address Form - Comment on locality </span></span> <span contenteditable="true">Locality.</span>';
echo '<br><br><span contenteditable="true">The PD officer also made the following observations:</span>' ;
echo '<br><ul>';