| Balance Tenure (Months) | ';
+
+ foreach($values as $key => $tag)
+ {
$setFrequencyType='';
switch($tag['frequency']) {
case 1:
@@ -33,19 +47,35 @@ public static function getOtherLoanDetails($values){
}
$loanTaken=$tag['loan_taken_by'];
+
+
+
+ $first_row .= $tag['loan_type']==1 ? ''.$tag['others_loan_type'].' | ' : ''.$tag['loan_type_master'] .' | ';
+
+ $second_row .= ''.MYUTIL::customIndianNumberFormat($tag['loan_amount']).' | ';
+
+ //$third_row = ''.MYUTIL::customIndianNumberFormat($tag['loan_amount']).' | ';
+
+ $fourth_row .= $tag['lender']==1 ? ''.$tag['others_lender'].' | ' : ''.$tag['lender_master'].' | ';
+
+ $fifth_row .= $loanTaken['id']==0 ? ''.$tag['others_loan_taken'].' | ' : ''.$loanTaken['name'].' | ';
+
+ $sixth_row .= ''.MYUTIL::customIndianNumberFormat($tag['emi']).' | ';
+
+ $seventh_row .= $tag['frequency']==1 ? ''.$tag['other_frequency'].' | ' : ''.$tag['frequency_master'].' | ';
+
+ $eigth_row .= ''.$tag['original_tenure'].' | ';
+
+ $ninth_row .= ''.$tag['elapsed_tenure'].' | ';
+
+ $tenth_row .= ''.($tag['original_tenure'] - $tag['elapsed_tenure']).' | ';
+
+ }
return array(
- 'loan_type' => $tag['loan_type']==1 ? $tag['others_loan_type'] : $tag['loan_type_master'],
- 'loan_amount' => $tag['loan_amount'],
- 'frequency' => $tag['frequency']==1 ? $tag['other_frequency'] : $tag['frequency_master'],
- 'lender' => $tag['lender']==1 ? $tag['others_lender'] : $tag['lender_master'],
- 'original_tenure' => $tag['original_tenure'],
- 'current_balance_tenure' => $tag['current_balance_tenure'],
- 'elapsed_tenure' => $tag['elapsed_tenure'],
- 'emi' => $tag['emi'].$setFrequencyType,
- 'loan_taken_by' => $loanTaken['id']==0 ? $tag['others_loan_taken'] : $loanTaken['name'],
+ 'first_row' => $first_row.'
','second_row' => $second_row.'','fourth_row' => $fourth_row.'','fifth_row' => $fifth_row.'','sixth_row' => $sixth_row.'','seventh_row' => $seventh_row.'','eigth_row' => $eigth_row.'', 'ninth_row' => $ninth_row.'', 'tenth_row' => $tenth_row.''
);
- }, $values);
- return $values;
+
+ //return $values;
}
// business financial details
@@ -140,8 +170,11 @@ public static function getBusinessCustomerHeader($values){
}
}
-public static function getAvailableFacilities($array)
+public static function getAvailableFacilities($arr)
{
+ echo "@@@@@@@@@@@@@@";
+ print_r($arr);
+ die();
$word_array = array('1' => 'Others', '2' => 'Bank Guarantee', '3' => 'Cash Credit Limit','4' => 'Factoring', '5' => 'Forfaiting', '6' => 'Letter of Credit');
if(is_array($array))
{
diff --git a/api/application/helpers/getprocessedjson_helper.php b/api/application/helpers/getprocessedjson_helper.php
index 731242a8..70e3fd45 100644
--- a/api/application/helpers/getprocessedjson_helper.php
+++ b/api/application/helpers/getprocessedjson_helper.php
@@ -472,56 +472,97 @@ class GETPROCESSEDJSON
{
if(array_key_exists('manufacturing_details',$raw_json))
{
-
- if($raw_json['manufacturing_details'] != "" || $raw_json['manufacturing_details'] != null)
+ foreach($raw_json['manufacturing_details'] as $main_key =>$manufacturing_details)
{
-
- foreach($raw_json['manufacturing_details'] as $manufacturing_details_key => $manufacturing_details)
- {
-
- foreach($manufacturing_details as $manufacturing_details_key => $manufacturing_detail)
+ if($manufacturing_details != "" || $manufacturing_details != null){
+ foreach($manufacturing_details as $second_key => $details)
{
- //print_r($manufacturing_detail);
- foreach($manufacturing_detail as $key => $value)
+ if(is_array($details))
{
- if($value != "" || $value != null)
- {
- //compare with master_keys array
- foreach($master_keys as $master_key => $master_value)
- {
- if(!strcmp($key,$master_value['key']) && $master_value['ismaster'] == 1)
- {
- print_r($key);echo "\n\n";
- //GET MASASTER DATA
-
- $table = constant($master_value['master_name']);
+ foreach($details as $key => $value)
+ {
+ $uom_name = null;
+ $uom_name = isset($value['raw_uom']) ? 'raw_uom':(isset($value['goods_uom']) ? 'goods_uom' : null);
+ $uom_value = isset($value['raw_uom']) ? $value['raw_uom']:(isset($value['goods_uom']) ? $value['goods_uom'] : null);
- $temp_fields = array($master_tables_field_names[$master_value['master_name']].' as name');
-
- $where_condition_array = array($master_tables_pkid[$master_value['master_name']] => $value);
-
- $result_data = $CI->PD_Model->selectCustomRecords($temp_fields,$where_condition_array,$table);
- if(count($result_data))
+ $CI->db->SELECT( $master_tables_field_names['UOM'] );
+ $CI->db->FROM(UOM);
+ $CI->db->WHERE( $master_tables_pkid['UOM'],$uom_value);
+ $uom= $CI->db->GET()->result_array();
+
+ if(count($uom))
{
- //print_r($result_data[0]['name']);
- // $key = $key . '_master';
- // $raw_json['income_details'][$income_details_key][$key] = $result_data[0]['name'];
-
+ $uom_master = $uom[0][ $master_tables_field_names['UOM'] ];
+ $raw_json['manufacturing_details'][$main_key][$second_key][$key]['uom_master'] = $uom_master;
}
- }
- }
- }
+ }
}
}
-
-
- // print_r($loan);
+ }
}
+ }
+ //*************
+ if(array_key_exists('retail_details',$raw_json))
+ {
+ foreach($raw_json['retail_details'] as $main_key =>$retail_details)
+ {
+ if($retail_details != "" || $retail_details != null){
+ foreach($retail_details as $second_key => $details)
+ {
+ if(is_array($details))
+ {
+ foreach($details as $key => $value)
+ {
+ $CI->db->SELECT( $master_tables_field_names['UOM'] );
+ $CI->db->FROM(UOM);
+ $CI->db->WHERE( $master_tables_pkid['UOM'],$value['traded_goods_uom']);
+ $uom= $CI->db->GET()->result_array();
+
+ if(count($uom))
+ {
+ $uom_master = $uom[0][ $master_tables_field_names['UOM'] ];
+ $raw_json['retail_details'][$main_key][$second_key][$key]['uom_master'] = $uom_master;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ //*************
+ if(array_key_exists('trade_details',$raw_json))
+ {
+ foreach($raw_json['trade_details'] as $main_key =>$trade_details)
+ {
+ if($retail_details != "" || $retail_details != null){
+ foreach($trade_details as $second_key => $details)
+ {
+ if(is_array($details))
+ {
+ foreach($details as $key => $value)
+ {
+ $CI->db->SELECT( $master_tables_field_names['UOM'] );
+ $CI->db->FROM(UOM);
+ $CI->db->WHERE( $master_tables_pkid['UOM'],$value['traded_goods_uom']);
+ $uom= $CI->db->GET()->result_array();
+
+ if(count($uom))
+ {
+ $uom_master = $uom[0][ $master_tables_field_names['UOM'] ];
+ $raw_json['trade_details'][$main_key][$second_key][$key]['uom_master'] = $uom_master;
+ }
+ }
+ }
+ }
+ }
}
}
}
+
return $raw_json;
+
}
/*****************########## END STOCK DETAILS FORM ##########**************/
diff --git a/api/application/helpers/neighbourreferencecheckform_helper.php b/api/application/helpers/neighbourreferencecheckform_helper.php
index 0c9131cc..336173ff 100644
--- a/api/application/helpers/neighbourreferencecheckform_helper.php
+++ b/api/application/helpers/neighbourreferencecheckform_helper.php
@@ -2,26 +2,64 @@
class Neighbourreferencecheckform
{
-public static function getNeighbourhoodDetails($values,$pdMasterValue){
+public static function getNeighbourhoodDetails($company_name,$values,$pdMasterValue){
$applicantName=$pdMasterValue['main_applicant'];
- $values = array_map(function($tag) use ($applicantName) {
- $makeSentense='Neighbour ';
- $makeSentense.= $tag['neighbourhood_name'];
- $makeSentense.=" was met and he/she confirmed that he/she ";
- if(strtoupper($tag['do_know'])=='YES'){
+ $values = array_map(function($tag) use ($applicantName,$company_name) {
+ $neighbourhood_name='Neighbour Check was done with ';
+ $neighbourhood_name.= $tag['neighbourhood_name'].'.';
+ $neighbourhood_do_know = null;
+ $neighbourhood_business_running_yr = null;
+ $ownership = null;
+
+ if(strtoupper($tag['do_know'])=='YES'){
- $makeSentense.="knows ".$applicantName.' since ';
- $makeSentense.= ($tag['how_long_do_know_in_year'] == 1) ? $tag['how_long_do_know_in_year']." year" : (($tag['how_long_do_know_in_year'] > 1) ? $tag['how_long_do_know_in_year']." years" : "");
- $makeSentense.=' and he/she is ';
- $makeSentense.=(strtoupper($tag['is_applicant_owner']) == 'YES') ? "owner of the business." : ((strtoupper($tag['is_applicant_owner']) == 'NO') ? "not owner of the business." : "");
- }
- else if(strtoupper($tag['do_know'])=='NO'){
- $makeSentense.="does not know ".$applicantName.'.';
- }
- return $makeSentense;
+ $neighbourhood_do_know = $tag['neighbourhood_name']." knows about applicant and their business.";
+ } else if(strtoupper($tag['do_know'])=='NO'){
+ $neighbourhood_do_know = $tag['neighbourhood_name']." did not know about the applicant or their business.";
+ }
+
+ if($tag['how_long_do_know_in_year'])
+ {
+ $neighbourhood_business_running_yr = $tag['neighbourhood_name']." confirmed that the business has been in operation for ";
+ $neighbourhood_business_running_yr .= ($tag['how_long_do_know_in_year'] == 1) ? $tag['neighbourhood_name'].' '.$tag['how_long_do_know_in_year']." year" : (($tag['how_long_do_know_in_year'] > 1) ? $tag['how_long_do_know_in_year']." years" : "");
+
+ $neighbourhood_business_running_yr .= ($tag['how_long_do_know_in_month'] == 1) ? ' and '.$tag['how_long_do_know_in_month']." month" : (($tag['how_long_do_know_in_month'] > 1) ? ' and '.$tag['how_long_do_know_in_month']." months" : "");
+ $neighbourhood_business_running_yr .= '.';
+ }
+ else
+ {
+ $neighbourhood_business_running_yr = $tag['neighbourhood_name']." was not aware of how long the business is in operation.";
+ }
+ $ownwers_list = '';
+ if($tag['organisation_owner']){
+ foreach($tag['organisation_owner'] as $owner)
+ {
+ if($owner['id'] != 0)
+ {
+ $ownwers_list .= $owner['name'].',';
+ }
+ else
+ {
+ $ownwers_list .= ' '.$tag['other_organisation_owner'];
+ }
+ }
+ $ownwers_list = substr_replace($ownwers_list, ' and', strrpos($ownwers_list, ','),1);
+ $grammer1 = count($tag['organisation_owner']) > 0 ? ' are': ' is';
+ $grammer2 = count($tag['organisation_owner']) > 0 ? 'owners': 'owner';
+ $ownership = 'As per '.$tag['neighbourhood_name'].' the '.$grammer2 .' of '.$company_name.$grammer1.$ownwers_list.'.';
+ }else
+ {
+ $ownership = $tag['neighbourhood_name']." was not aware of the business ownership.";
+ }
+ //$makeSentense.=(strtoupper($tag['is_applicant_owner']) == 'YES') ? "owner of the business." : ((strtoupper($tag['is_applicant_owner']) == 'NO') ? "not owner of the business." : "");
+
+ return array('neighbourhood_name' => $neighbourhood_name,'neighbourhood_do_know' => $neighbourhood_do_know,'neighbourhood_business_running_yr' => $neighbourhood_business_running_yr,'ownership' => $ownership);
}, $values);
return $values;
}
+
+
+
public static function getReferenceDetails($values,$pdMasterValue) {
$applicantName=$pdMasterValue['main_applicant'];
$values = array_map(function($tag) use ($applicantName) {
diff --git a/api/application/helpers/otherfamilyform_helper.php b/api/application/helpers/otherfamilyform_helper.php
index 51d4c36c..429edc74 100644
--- a/api/application/helpers/otherfamilyform_helper.php
+++ b/api/application/helpers/otherfamilyform_helper.php
@@ -8,26 +8,34 @@ public static function getFamilyDetails($values){
//print_r($fetchVal);die();
$storeValue=array();
$storeValue['selected_person']= isset($fetchVal['selected_person_master']) ? $fetchVal['selected_person_master'] : $fetchVal['selected_person'];
- $storeValue['residency_address']=$fetchVal['residence_place'].','.$fetchVal['residence_city'].','.$fetchVal['residence_state'].'-';
- $storeValue['residency_address'] .=($fetchVal['residence_pin'] == 1) ? $fetchVal['residence_other_pincode'] : (($fetchVal['residence_pin'] > 1) ? $fetchVal['residence_pin'] : "");
+ $storeValue['residency_address']=$fetchVal['residence_place'].' in '.$fetchVal['residence_city_master'].','.$fetchVal['residence_state_master'].'-';
+ $storeValue['residency_address'] .=($fetchVal['residence_pin'] == 1) ? $fetchVal['residence_other_pincode'] : (($fetchVal['residence_pin'] > 1) ? $fetchVal['residence_pincode_master'] : "");
//$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_ownership']=($fetchVal['residence_ownership'] == 1) ? $fetchVal['ownershipOther'] :(($fetchVal['residence_ownership'] == 3) ? $fetchVal['residence_ownership_master'].' @ Rs.'.$fetchVal['rent'].' per month' : $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['no_family_members']= count($fetchVal['family_members_details']) > 0 ? count($fetchVal['family_members_details']) : '0';
$storeValue['family_members_details'] = array_map(function($tag) {
$getFamilyEarning='';
if($tag['family_member_earning_status']==1){
$getFamilyEarning= 'Earning ';
- $getFamilyEarning .= $tag['earning_segment_master']==1 ? $tag['earning_if_others_segment'].' with '.$tag['earning_name_of_the_employer_or_business'].' since '.$tag['earning_number_of_years_in_employment_or_business'].' years earning Rs.'.$tag['earning_gross_income_per_month'].' per month ' : $tag['earning_segment_master'].' with '.$tag['earning_name_of_the_employer_or_business'].' since '.$tag['earning_number_of_years_in_employment_or_business'].' years earning Rs.'.$tag['earning_gross_income_per_month'].' per month ';
+ $getFamilyOccupation = $tag['earning_segment']==1 ? $tag['earning_if_others_segment'].' Income of '.$tag['earning_gross_income_per_month'].' per month. ':' Income of '.$tag['earning_gross_income_per_month'].' per month.';
+ $getFamilyOccupation .= $tag['earning_name_of_the_employer_or_business'] ? ' with '.$tag['earning_name_of_the_employer_or_business'].'.' : '';
+
+ $getFamilyOccupation .= 'He has been working for '.$tag['earning_number_of_years_in_employment_or_business'].' years.';
+
+// ? .' years earning Rs.'. : $tag['earning_segment_master'].' with '.$tag['earning_name_of_the_employer_or_business'].' since '.$tag['earning_number_of_years_in_employment_or_business'].' years earning Rs.'.$tag['earning_gross_income_per_month'].' per month ';
}
else if($tag['family_member_earning_status']==2){
- $getFamilyEarning= 'Non-Earning '.$tag['non_earning_occupation_master'];
+ $getFamilyEarning = 'Non-Earning';
+ $getFamilyOccupation = $tag['non_earning_occupation_master'];
}
return array(
'name' => $tag['family_member_name'],
'family_member_relationship' => $tag['family_member_relationship_master'],
'family_member_age' => $tag['family_member_age'],
'family_member_earning' => $getFamilyEarning,
+ 'family_member_occupation' => $getFamilyOccupation,
);
}, $fetchVal['family_members_details']);
array_push($mergeResult,$storeValue);
diff --git a/api/application/helpers/otherincomeform_helper.php b/api/application/helpers/otherincomeform_helper.php
index b144cd2f..3eb4877b 100644
--- a/api/application/helpers/otherincomeform_helper.php
+++ b/api/application/helpers/otherincomeform_helper.php
@@ -6,8 +6,9 @@ public static function getIncomeDetails($values){
$values = array_map(function($tag) {
return array(
'source' => $tag['source']==1 ? $tag['others_source'] : $tag['source_master'],
- 'amount' => 'Rs.'.$tag['amount'],
+ 'amount' => $tag['amount'],
'frequency' => $tag['frequency']==1 ? $tag['others_frequency'] : $tag['frequency_master'],
+ 'earned_by' => $tag['income_earned_by'][0]['name']
);
}, $values);
return $values;
diff --git a/api/application/helpers/pdscore_helper.php b/api/application/helpers/pdscore_helper.php
index badec496..8240c7c1 100644
--- a/api/application/helpers/pdscore_helper.php
+++ b/api/application/helpers/pdscore_helper.php
@@ -81,7 +81,7 @@ class PDSCORE
$business_activity_has_seen = array('yes' => 10, 'no' => 0);
$vintage_of_business_account = array('100> to >=10' => 10,'7<= to <10' => 8,'5<= to <7' => 6,'3<= to <5' => 4,'3> to >0' => 2);
/*-------- FINAL --------------*/
- $pd_officer_recommandations = array('Positive' => 10,'Negative' => 0,'Refer to Credit' => 5);
+ $pd_officer_recommandations = array('Positive' => 10,'Negative' => 0,'Refer to Credit' => 5,'Others' => 0);
/*-----------CALCULATION PART -----------*/
diff --git a/api/application/helpers/stockform_helper.php b/api/application/helpers/stockform_helper.php
index f88cd289..a25442da 100644
--- a/api/application/helpers/stockform_helper.php
+++ b/api/application/helpers/stockform_helper.php
@@ -6,11 +6,11 @@ class Stockform
public static function getStockManufacturingDetails($rawMaterial,$goods){
$getRawMaterial=array();
$getGoods=array();
- //print_r($rawMaterial);die();
+ //print_r($goods);die();
// raw material
if(count($rawMaterial)>0){
$getRawMaterial = array_map(function($tag) {
- $getUom= $tag['raw_uom']==1 ? $tag['other_uom'] : $tag['raw_uom'];
+ $getUom= $tag['raw_uom']==1 ? $tag['other_uom'] : (isset($tag['uom_master']) ? $tag['uom_master'] : '');
return array(
@@ -26,7 +26,7 @@ public static function getStockManufacturingDetails($rawMaterial,$goods){
// goods
if(count($goods)>0){
$getGoods = array_map(function($tag) {
- $getGUom= $tag['goods_uom']==1 ? $tag['goods_other_uom'] : $tag['goods_uom'];
+ $getGUom= $tag['goods_uom']==1 ? $tag['goods_other_uom'] : (isset($tag['uom_master']) ? $tag['uom_master'] : '');
return array(
'type' => 'Finished Goods',
@@ -46,7 +46,7 @@ public static function getStockRetailDetails($goods){
// goods
if(count($goods)>0){
$goods = array_map(function($tag) {
- $getUom= $tag['traded_goods_uom']==1 ? $tag['traded_goods_other_uom'] : $tag['traded_goods_uom'];
+ $getUom= $tag['traded_goods_uom']==1 ? $tag['traded_goods_other_uom'] : (isset($tag['uom_master']) ? $tag['uom_master'] : '');
$getSufficient= (strtoupper($tag['traded_goods_observed']) =='NO') ? 'No Stock Observed' : ((strtoupper($tag['is_sufficiant_traded_goods']) =='YES') ? 'Yes, the stock of traded goods observed' : 'No, the stock of traded goods observed because of '.$tag['traded_goods_remarks']);
return array(
'name' => $tag['traded_goods_name'],
@@ -65,7 +65,7 @@ public static function getStockWholesaleDetails($goods){
// goods
if(count($goods)>0){
$goods = array_map(function($tag) {
- $getUom= $tag['traded_goods_uom']==1 ? $tag['traded_goods_other_uom'] : $tag['traded_goods_uom'];
+ $getUom= $tag['traded_goods_uom']==1 ? $tag['traded_goods_other_uom'] : (isset($tag['uom_master']) ? $tag['uom_master'] : '');
$getSufficient= (strtoupper($tag['traded_goods_observed']) =='NO') ? 'No Stock Observed' : ((strtoupper($tag['is_sufficiant_traded_goods']) =='YES') ? 'Yes, the stock of traded goods observed' : 'No, the stock of traded goods observed because of '.$tag['traded_goods_remarks']);
return array(
'name' => $tag['traded_goods_name'],
diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php
index 2df789cf..ac3a66af 100644
--- a/api/application/models/PD_Model.php
+++ b/api/application/models/PD_Model.php
@@ -744,7 +744,7 @@ class PD_Model extends SPARQ_Model {
*/
public function getPDMasterDetails($pdid)
{
- $this->db->SELECT('PDTRIGGER.pd_id, PDTRIGGER.fk_lender_id,ENTITY.full_name as lender_full_name,ENTITY.short_name as lender_short_name, PDTRIGGER.fk_entity_billing_id,ENTITYBILLING.billing_name,PDTRIGGER.lender_applicant_id, DATE_FORMAT(PDTRIGGER.pd_date_of_initiation, "%d/%m/%Y") as pd_date_of_initiation,DATE_FORMAT(PDTRIGGER.pd_report_generated_date,"%d/%m/%Y") as pd_report_generated_date,PDTRIGGER.pd_date_of_initiation as pd_date_of_initiation_sqlformat, PDTRIGGER.fk_product_id,PRODUCTS.name as product_name,PRODUCTS.abbr as product_abbr, PDTRIGGER.fk_subproduct_id,SUBPRODUCTS.name as subproduct_name,SUBPRODUCTS.abbr as subproduct_abbr, PDTRIGGER.fk_pd_type,PDTYPE.type_name as pd_type_name, PDTRIGGER.pd_status,PDTRIGGER.pd_specific_clarification, DATE_FORMAT(PDTRIGGER.createdon,"%d/%m/%Y %H:%i %p") as createdon, PDTRIGGER.fk_createdby, DATE_FORMAT(PDTRIGGER.updatedon,"%d/%m/%Y %H:%i %p") as updatedon, PDTRIGGER.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby, PDTRIGGER.fk_pd_allocation_type,,PDALLOCATIONTYPE.pd_allocation_type_name, PDTRIGGER.fk_pd_allocated_to,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name) as pd_allocated_to,PDTRIGGER.executive_id,concat(EXECUTIVE.first_name," ",EXECUTIVE.last_name) as executive_name,PDTRIGGER.central_pd_officer_id,concat(CENTRALOFFICER.first_name," ",CENTRALOFFICER.last_name) as centralofficer,PDTRIGGER.fk_pd_template_id,TEMPLATE.template_name, PDTRIGGER.fk_customer_segment,CUSTOMERSEGMENT.name as customer_segment_name,CUSTOMERSEGMENT.abbr as customer_segment_abbr, PDTRIGGER.pd_officier_final_judgement, PDTRIGGER.pd_agency_id,AGENCY.full_name as agency_name, PDTRIGGER.loan_amount,PDTRIGGER.addressline1,PDTRIGGER.addressline2,PDTRIGGER.addressline3,PDTRIGGER.fk_city,CITY.name as city_name,PDTRIGGER.fk_state,STATE.name as state_name,PINCODE.pincode,PDTRIGGER.pincode as pincode_id,PDTRIGGER.pd_contact_person,PDTRIGGER.pd_contact_mobileno,DATE_FORMAT(PDTRIGGER.scheduled_on,"%d/%m/%Y %h:%i %p") as scheduled_on,PDTRIGGER.scheduled_on as scheduled_on_for_validation,DATE_FORMAT(PDTRIGGER.scheduled_on,"%dth %b %Y ") as scheduled_date_for_log,DATE_FORMAT(PDTRIGGER.scheduled_on,"%h:%i %p") as scheduled_time_for_log,DATE_FORMAT(PDTRIGGER.completed_on,"%d/%m/%Y %h:%i:%s %p") as completed_on,PDTRIGGER.remarks,PDTRIGGER.bounce_reason,PDTRIGGER.bounce_reason_others,BOUNCEMASTER.bounce_reason_name,PDTRIGGER.is_original_report_created,PDTRIGGER.pd_report_latest_version,PDAPPLICANTSDETAILS.applicant_name as main_applicant,PDTRIGGER.pd_branch_id,ENTITYLENDERBRANCH.branch_name,PDTRIGGER.qc_feedback,PDTRIGGER.qc_rating,PDTRIGGER.qc_remarks,PDTRIGGER.lender_rating,PDTRIGGER.lender_feedback,PDAPPLICANTSDETAILS.applicant_title_name,TITLES.name as title_name,PDTRIGGER.pd_contact_landline,PDTRIGGER.other_pincode,PDTRIGGER.is_otp_done,PDTRIGGER.encrypted_url,PDTRIGGER.is_child,PDTRIGGER.parent_pd_id,PDTRIGGER.fk_primary_address_id,PDTRIGGER.fk_address_id,PDTRIGGER.start_location');
+ $this->db->SELECT('PDTRIGGER.pd_id, PDTRIGGER.fk_lender_id,ENTITY.full_name as lender_full_name,ENTITY.short_name as lender_short_name, PDTRIGGER.fk_entity_billing_id,ENTITYBILLING.billing_name,PDTRIGGER.lender_applicant_id, DATE_FORMAT(PDTRIGGER.pd_date_of_initiation, "%d/%m/%Y") as pd_date_of_initiation,DATE_FORMAT(PDTRIGGER.pd_report_generated_date,"%d/%m/%Y") as pd_report_generated_date,PDTRIGGER.pd_date_of_initiation as pd_date_of_initiation_sqlformat, PDTRIGGER.fk_product_id,PRODUCTS.name as product_name,PRODUCTS.abbr as product_abbr, PDTRIGGER.fk_subproduct_id,SUBPRODUCTS.name as subproduct_name,SUBPRODUCTS.abbr as subproduct_abbr, PDTRIGGER.fk_pd_type,PDTYPE.type_name as pd_type_name, PDTRIGGER.pd_status,PDTRIGGER.pd_specific_clarification, DATE_FORMAT(PDTRIGGER.createdon,"%d/%m/%Y %H:%i %p") as createdon, PDTRIGGER.fk_createdby, DATE_FORMAT(PDTRIGGER.updatedon,"%d/%m/%Y %H:%i %p") as updatedon, PDTRIGGER.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby, PDTRIGGER.fk_pd_allocation_type,,PDALLOCATIONTYPE.pd_allocation_type_name, PDTRIGGER.fk_pd_allocated_to,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name) as pd_allocated_to,PDTRIGGER.executive_id,concat(EXECUTIVE.first_name," ",EXECUTIVE.last_name) as executive_name,PDTRIGGER.central_pd_officer_id,concat(CENTRALOFFICER.first_name," ",CENTRALOFFICER.last_name) as centralofficer,PDTRIGGER.fk_pd_template_id,TEMPLATE.template_name, PDTRIGGER.fk_customer_segment,CUSTOMERSEGMENT.name as customer_segment_name,CUSTOMERSEGMENT.abbr as customer_segment_abbr, PDTRIGGER.pd_officier_final_judgement, PDTRIGGER.pd_agency_id,AGENCY.full_name as agency_name, PDTRIGGER.loan_amount,PDTRIGGER.addressline1,PDTRIGGER.addressline2,PDTRIGGER.addressline3,PDTRIGGER.fk_city,CITY.name as city_name,PDTRIGGER.fk_state,STATE.name as state_name,PINCODE.pincode,PDTRIGGER.pincode as pincode_id,PDTRIGGER.pd_contact_person,PDTRIGGER.pd_contact_mobileno,DATE_FORMAT(PDTRIGGER.scheduled_on,"%d/%m/%Y %h:%i %p") as scheduled_on,PDTRIGGER.scheduled_on as scheduled_on_for_validation,DATE_FORMAT(PDTRIGGER.scheduled_on,"%dth %b %Y ") as scheduled_date_for_log,DATE_FORMAT(PDTRIGGER.scheduled_on,"%h:%i %p") as scheduled_time_for_log,DATE_FORMAT(PDTRIGGER.completed_on,"%d/%m/%Y %h:%i:%s %p") as completed_on,PDTRIGGER.remarks,PDTRIGGER.bounce_reason,PDTRIGGER.bounce_reason_others,BOUNCEMASTER.bounce_reason_name,PDTRIGGER.is_original_report_created,PDTRIGGER.pd_report_latest_version,PDAPPLICANTSDETAILS.applicant_name as main_applicant,PDTRIGGER.pd_branch_id,ENTITYLENDERBRANCH.branch_name,PDTRIGGER.qc_feedback,PDTRIGGER.qc_rating,PDTRIGGER.qc_remarks,PDTRIGGER.lender_rating,PDTRIGGER.lender_feedback,PDAPPLICANTSDETAILS.applicant_title_name,TITLES.name as title_name,PDTRIGGER.pd_contact_landline,PDTRIGGER.other_pincode,PDTRIGGER.is_otp_done,PDTRIGGER.encrypted_url,PDTRIGGER.is_child,PDTRIGGER.parent_pd_id,PDTRIGGER.fk_primary_address_id,PDTRIGGER.fk_address_id,PDTRIGGER.start_location,PDTRIGGER.satellite_image_base64_blob');
$this->db->FROM(PDTRIGGER.' as PDTRIGGER');
$this->db->JOIN(ENTITY.' as ENTITY','PDTRIGGER.fk_lender_id = ENTITY.entity_id ','LEFT');
$this->db->JOIN(ENTITYBILLING.' as ENTITYBILLING','PDTRIGGER.fk_entity_billing_id = ENTITYBILLING.entity_billing_id','LEFT');
diff --git a/api/application/views/js/phantomchart.js b/api/application/views/js/phantomchart.js
index f6c04bd0..962ab575 100644
--- a/api/application/views/js/phantomchart.js
+++ b/api/application/views/js/phantomchart.js
@@ -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 = 78;var url = 'http://localhost:9999/AWSEC2/sparqapi/api?'+score;var image_url = 'C:/5.6/xampp/htdocs/AWSEC2/sparqapi/api/application/views/report_templates/chart.png' ;page.open(url,function() {setTimeout(function() {page.render(image_url);phantom.exit();}, 500);});
\ No newline at end of file
+var page = require('webpage').create();page.viewportSize = { width: 600, height: 350 };page.clipRect = { top: 0, left: 0, width: 600, height: 350 };var score = 52.6;var url = 'http://localhost:9999/AWSEC2/sparqapi/api?'+score;var image_url = 'C:/5.6/xampp/htdocs/AWSEC2/sparqapi/api/application/views/report_templates/chart.png' ;page.open(url,function() {setTimeout(function() {page.render(image_url);phantom.exit();}, 500);});
\ No newline at end of file
diff --git a/api/application/views/js/phantomsatellite.js b/api/application/views/js/phantomsatellite.js
new file mode 100644
index 00000000..cdeeebd8
--- /dev/null
+++ b/api/application/views/js/phantomsatellite.js
@@ -0,0 +1 @@
+var page = require('webpage').create();page.viewportSize = { width: 650, height: 250 };page.clipRect = { top: 0, left: 0, width: 500, height: 250 };var score = 78;var url = 'https://maps.googleapis.com/maps/api/staticmap?center=CORGO INDIA ENTERPRISES B 19 8 FIRST FLOOR,JOSHI COLONY PATPARGANJ,New Delhi,Delhi,IND&zoom=14&markers=color:red|28.6282898,77.3025616&size=800x300&maptype=roadmap&key=AIzaSyCXsHTus6hyIB8jYvt9ZEIbZve-2vWeQRg';var image_url ='C:/5.6/xampp/htdocs/AWSEC2/sparqapi/api/application/views/report_templates/satellite.png';page.open(url,function() {setTimeout(function() {page.render(image_url);phantom.exit();}, 500);});
\ No newline at end of file
diff --git a/api/application/views/report_templates/JSONTOREPORT.php b/api/application/views/report_templates/JSONTOREPORT.php
index f9c7c467..dd9a6359 100644
--- a/api/application/views/report_templates/JSONTOREPORT.php
+++ b/api/application/views/report_templates/JSONTOREPORT.php
@@ -6,13 +6,14 @@ defined('BASEPATH') OR exit('No direct script access allowed');