From a73f8aa6ea34629e9e0441cd9729d477ab9dbe15 Mon Sep 17 00:00:00 2001 From: Velz2020 Date: Fri, 13 Dec 2019 20:24:46 +0530 Subject: [PATCH] SALES PD IMG ISSUE --- .../neighbourreferencecheckform_helper.php | 2 +- .../report_templates/JSONTOREPORT_DI_AI.php | 12 +++++----- .../JSONTOREPORT_DI_AI_ADDON.php | 5 ++++- .../report_templates/JSONTOREPORT_RI.php | 5 ++++- .../views/sale_pd_templates/MWISE.php | 22 ++++++++++++++----- 5 files changed, 32 insertions(+), 14 deletions(-) diff --git a/api/application/helpers/neighbourreferencecheckform_helper.php b/api/application/helpers/neighbourreferencecheckform_helper.php index 049d6f64..26c2f59a 100644 --- a/api/application/helpers/neighbourreferencecheckform_helper.php +++ b/api/application/helpers/neighbourreferencecheckform_helper.php @@ -24,7 +24,7 @@ public static function getNeighbourhoodDetails($company_name,$values,$pdMasterVa { $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['how_long_do_know_in_year']." year" : (($tag['how_long_do_know_in_year'] > 1) ? $tag['how_long_do_know_in_year']." years" : ""); - $tag['how_long_do_know_in_year'] && $tag['how_long_do_know_in_month'] ? $neighbourhood_business_running_yr .= 'and':''; + $tag['how_long_do_know_in_year'] && $tag['how_long_do_know_in_month'] ? $neighbourhood_business_running_yr .= ' and ':''; $neighbourhood_business_running_yr .= ($tag['how_long_do_know_in_month'] == 1) ? $tag['how_long_do_know_in_month']." month" : (($tag['how_long_do_know_in_month'] > 1) ? $tag['how_long_do_know_in_month']." months" : ""); $neighbourhood_business_running_yr .= '.'; } diff --git a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php index 5cf7e2bc..c1948ce4 100644 --- a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php +++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php @@ -1248,10 +1248,12 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $loan_table_dispaly_rows[] = array('particulars' => 'Balance Transfer Amount','details' => "₹"." ".MYUTIL::customIndianNumberFormat($loan_form['balance_transfer_amount']).' ('.MYUTIL::numtowords($loan_form['balance_transfer_amount']).')'); - $loan_table_dispaly_rows[] = array('particulars' => 'Top Up Amount applied for','details' => "₹"." ".MYUTIL::customIndianNumberFormat($loan_form['topup_amount']).' ('.MYUTIL::numtowords($loan_form['topup_amount']).')'); + $loan_table_dispaly_rows[] = array('particulars' => 'Top Up Amount applied for','details' => "₹"." ".MYUTIL::customIndianNumberFormat($loan_form['topup_amount']).($loan_form['topup_amount'] ? (' ('.MYUTIL::numtowords($loan_form['topup_amount']).')') : '') ); + if($loan_form['end_use_topup_master']) + { $loan_table_dispaly_rows[] = array('particulars' => 'End Use of Topup','details' => ( strcasecmp('others',$loan_form['end_use_topup_master'])) ? $loan_form['end_use_topup_master'] : $loan_form['other_end_use_topup'] ); - + } $loan_table_dispaly_rows[] = array('particulars' => 'Balance Transfer from','details' => $loan_form['lender'] == 1 ? $loan_form['other_bt_lender']: $loan_form['lender_master']); @@ -2704,7 +2706,7 @@ if($total_no_of_business > 0) { $value) { @@ -2722,7 +2724,7 @@ if($total_no_of_business > 0) { } - if($all_same) + if($all_same || count($done_on_credit) == 1) { echo "

Out of total sales done by ".$name_of_the_company .", ".$vals[0]."% is done on credit.

"; } else { @@ -3381,7 +3383,7 @@ if($total_no_of_business > 0) { $ai_summary_details_processed = ASSESSEDINCOME::getSummaryTable($ai_summary_details,$ai_core_details); //print_r($ai_summary_details_processed);die(); - echo "

Assessed Income - ".MYUTIL::findCompanyName($all_company_details,($business_count+1),1)."

"; + echo "

Assessed Income - ".MYUTIL::findCompanyName($all_company_details,($business_count+1),1)."

"; if(isset($ai_core_details) && count($ai_summary_details_processed)) { echo '

'.$order_dipaly_array[0].') Financial Snapshot

'; diff --git a/api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php b/api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php index f9b9e37d..7f518b13 100644 --- a/api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php +++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php @@ -1508,9 +1508,12 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $loan_table_dispaly_rows[] = array('particulars' => 'Balance Transfer Amount','details' => "₹"." ".MYUTIL::customIndianNumberFormat($loan_form['balance_transfer_amount']).' ('.MYUTIL::numtowords($loan_form['balance_transfer_amount']).')'); - $loan_table_dispaly_rows[] = array('particulars' => 'Top Up Amount applied for','details' => "₹"." ".MYUTIL::customIndianNumberFormat($loan_form['topup_amount']).' ('.MYUTIL::numtowords($loan_form['topup_amount']).')'); + $loan_table_dispaly_rows[] = array('particulars' => 'Top Up Amount applied for','details' => "₹"." ".MYUTIL::customIndianNumberFormat($loan_form['topup_amount']).($loan_form['topup_amount'] ? (' ('.MYUTIL::numtowords($loan_form['topup_amount']).')') : '') ); + if($loan_form['end_use_topup_master']) + { $loan_table_dispaly_rows[] = array('particulars' => 'End Use of Topup','details' => ( strcasecmp('others',$loan_form['end_use_topup_master'])) ? $loan_form['end_use_topup_master'] : $loan_form['other_end_use_topup'] ); + } $loan_table_dispaly_rows[] = array('particulars' => 'Balance Transfer from','details' => $loan_form['lender'] == 1 ? $loan_form['other_bt_lender']: $loan_form['lender_master']); diff --git a/api/application/views/report_templates/JSONTOREPORT_RI.php b/api/application/views/report_templates/JSONTOREPORT_RI.php index adf4227f..6c05dd63 100644 --- a/api/application/views/report_templates/JSONTOREPORT_RI.php +++ b/api/application/views/report_templates/JSONTOREPORT_RI.php @@ -1008,9 +1008,12 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $loan_table_dispaly_rows[] = array('particulars' => 'Balance Transfer Amount','details' => "₹"." ".MYUTIL::customIndianNumberFormat($loan_form['balance_transfer_amount']).' ('.MYUTIL::numtowords($loan_form['balance_transfer_amount']).')'); - $loan_table_dispaly_rows[] = array('particulars' => 'Top Up Amount applied for','details' => "₹"." ".MYUTIL::customIndianNumberFormat($loan_form['topup_amount']).' ('.MYUTIL::numtowords($loan_form['topup_amount']).')'); + $loan_table_dispaly_rows[] = array('particulars' => 'Top Up Amount applied for','details' => "₹"." ".MYUTIL::customIndianNumberFormat($loan_form['topup_amount']).($loan_form['topup_amount'] ? (' ('.MYUTIL::numtowords($loan_form['topup_amount']).')') : '') ); + if($loan_form['end_use_topup_master']) + { $loan_table_dispaly_rows[] = array('particulars' => 'End Use of Topup','details' => ( strcasecmp('others',$loan_form['end_use_topup_master'])) ? $loan_form['end_use_topup_master'] : $loan_form['other_end_use_topup'] ); + } $loan_table_dispaly_rows[] = array('particulars' => 'Balance Transfer from','details' => $loan_form['lender'] == 1 ? $loan_form['other_bt_lender']: $loan_form['lender_master']); diff --git a/api/application/views/sale_pd_templates/MWISE.php b/api/application/views/sale_pd_templates/MWISE.php index d1333e47..585d377d 100644 --- a/api/application/views/sale_pd_templates/MWISE.php +++ b/api/application/views/sale_pd_templates/MWISE.php @@ -467,25 +467,35 @@ if(isset($section6)) 'Selfie with person met','approach_to_pd_location' => 'Approach to pd location','name_board_seen' => 'Name board seen', 'stock_image' => 'Stock image','workplace_interior_image' => 'Workplace interior image','satellite1' => 'satellite'); - // if(count($photos)) + //echo count($section9);die(); + //print_r(array_keys($section9));die(); $tot_rows = ceil(count($section9) / 3); + + // foreach ($section9 as $key => $value) { + // print_r($value).'
'; + + // } + // die(); if(count($section9)) { echo '
'; echo '
Photograph`s

'; + $add_factor = 0; for($row = 0;$row < $tot_rows; $row++) { echo ''; - $from = $row == 0 ? $row : ($row+2); + + $from = $row == 0 ? $row : ($row+$add_factor); $to = ($from + 2); + $add_factor = $add_factor + 2; for($i = $from ; $i <= $to; $i++) { - if(isset($section9[$i])) - { - echo ''; - } + // if(isset($section9[$i])) + // { + echo ''; + //} //unset($p_key); }

'.$photo_names [ $section9[$i]['img_name'] ].'		 '.$section9[$i]['img_name'].'
'.$photo_names [ $section9[$i]['img_name'] ].'