From f7b0f0ae5361b6d6a87c67adbed8f7c27e9b1595 Mon Sep 17 00:00:00 2001 From: "sanjeev.p" Date: Mon, 20 Sep 2021 13:31:04 +0530 Subject: [PATCH] rename sales report : ps --- api/application/controllers/SMC_Credit_PD_Controller.php | 5 ++++- api/application/controllers/Sales_PD_Controller.php | 6 ++++-- api/application/helpers/pdalerts_helper.php | 4 +++- api/application/views/sale_pd_templates/MEQ.php | 4 +++- api/application/views/sale_pd_templates/MWISE.php | 5 ++++- api/application/views/smc_creditpd_reports/MWISE.php | 6 ++++-- api/application/views/smc_creditpd_reports/NBFC.php | 5 ++++- 7 files changed, 26 insertions(+), 9 deletions(-) diff --git a/api/application/controllers/SMC_Credit_PD_Controller.php b/api/application/controllers/SMC_Credit_PD_Controller.php index 4745153a..1b0a8e32 100644 --- a/api/application/controllers/SMC_Credit_PD_Controller.php +++ b/api/application/controllers/SMC_Credit_PD_Controller.php @@ -1377,7 +1377,9 @@ public function filterSalesPDList_post() { if($is_file_uploaded){ $filename = ($pd_master_data[0]['re_uploaded'] ? XLPATH.'/tmp/'.$pd_master_data[0]['re_uploaded_file_name'] : XLPATH.'/tmp/'.$pd_master_data[0]['modified_fname']); // $filename = XLPATH.'/tmp/mySMCPD_client_working.xlsx'; - // $filename = '/home/venba/Downloads/Sample_CET_Upload4.xls'; + // $filename = '/home/venba/Downloads/Book1_2021-07-17_02-00-02225.xlsx'; + // $filename = '/home/venba/Downloads/Sample_CET_Upload_LFMP_s1.xls'; + // $filename = '/home/venba/Downloads/Sample_CET_Upload_WCTL_s1.xls'; if(!file_exists($filename)) { @@ -1391,6 +1393,7 @@ public function filterSalesPDList_post() { //echo '*'.$sucess; } return $cur_section_data = readexceldata::getExcelSectionData($filename,$form_id,$pd_master_data[0]['pd_id']); + // print_r($cur_section_data); }else{ return []; } diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php index 6b5ca6a3..8609fcd2 100644 --- a/api/application/controllers/Sales_PD_Controller.php +++ b/api/application/controllers/Sales_PD_Controller.php @@ -170,6 +170,8 @@ class Sales_PD_Controller extends REST_Controller { $where_condition_array = array('SALES_PD_DATA.sales_pd_id' => $sales_pd_id); $sales_pd_data = $this->Sales_PD_Model->getJoinRecords($columns,$table,$joins,$where_condition_array); + $pd_type = ""; + if($sales_pd_data[0]['sales_pd_type'] == 1){$pd_type = "Physical PD "; }else if($sales_pd_data[0]['sales_pd_type'] == 2){$pd_type = "Telephonic PD ";} // print_r($sales_pd_data);die(); if($sales_pd_data) @@ -177,7 +179,7 @@ class Sales_PD_Controller extends REST_Controller { ini_set('max_execution_time', 0); $bucket_name = LENDER_BUCKET_NAME_PREFIX.$sales_pd_data[0]['lender_id']; $pdf_name = strtolower(trim($sales_pd_data[0]['applicant_name'])); - $pdf_name .= '-'.$sales_pd_data[0]['abbr']; + $pdf_name .= '-'.$pd_type.$sales_pd_data[0]['abbr']; $pdf_name .= '-'.(date('dmY',strtotime($sales_pd_data[0]['completed_date']))); //$pdf_name = str_replace(' ', '_', $pdf_name); @@ -209,7 +211,7 @@ class Sales_PD_Controller extends REST_Controller { //$view_name = $sales_pd_data[0]['short_name'].'_'.$sales_pd_data[0]['abbr']; $view_name = $sales_pd_data[0]['short_name'];if( $sales_pd_data[0]['abbr'] == 'MEQ'){ $view_name = $sales_pd_data[0]['abbr']; } $html_content = $this->load->view('sale_pd_templates/'.$view_name,$view_data,true); - //echo $html_content;die(); + // echo $html_content;die(); $pdf_doc = $this->pdfgenerator->generate($html_content, $filename='version', $stream=false, $paper = 'A4', $orientation = "portrait"); //End of PDF Gen using DOM PDF $output_file = $this->external_path ."/sales_pd/" . $sales_pd_id . "/temp.pdf"; diff --git a/api/application/helpers/pdalerts_helper.php b/api/application/helpers/pdalerts_helper.php index 26e0bc6d..4c41d7cf 100644 --- a/api/application/helpers/pdalerts_helper.php +++ b/api/application/helpers/pdalerts_helper.php @@ -610,9 +610,11 @@ class PDALERTS $sales_pd_data = $CI->Sales_PD_Model->getJoinRecords($columns,$table,$joins,$where_condition_array); if(count($sales_pd_data)) { + $pd_type = ""; + if($sales_pd_data[0]['sales_pd_type'] == 1){$pd_type = "Physical PD "; }else if($sales_pd_data[0]['sales_pd_type'] == 2){$pd_type = "Telephonic PD ";} $mail_subject = "Sales PD Report for "; $pdf_name = strtolower(trim($sales_pd_data[0]['applicant_name'])); - $pdf_name .= '-'.$sales_pd_data[0]['abbr']; + $pdf_name .= '-'.$pd_type.$sales_pd_data[0]['abbr']; $pdf_name .= '-'.(date('dmY',strtotime($sales_pd_data[0]['completed_date']))); $mail_subject .=$pdf_name; $file_name = $pdf_name.'.pdf'; diff --git a/api/application/views/sale_pd_templates/MEQ.php b/api/application/views/sale_pd_templates/MEQ.php index c37085c7..25ca6d04 100644 --- a/api/application/views/sale_pd_templates/MEQ.php +++ b/api/application/views/sale_pd_templates/MEQ.php @@ -6,6 +6,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $dash = ' '; $product_name = $master[0]['abbr']; $rupee_symbol = "₹"; + $pd_type = ""; + if($master[0]['sales_pd_type'] == 1){$pd_type = "Physical PD "; }else if($master[0]['sales_pd_type'] == 2){$pd_type = "Telephonic PD ";} //print_r($master[0]['abbr']);die(); ?> @@ -146,7 +148,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); - Personal Discussion by Sales Team - + Personal Discussion by Sales Team - + Personal Discussion Sheet - Application ID diff --git a/api/application/views/smc_creditpd_reports/NBFC.php b/api/application/views/smc_creditpd_reports/NBFC.php index 3208f071..d08c42b0 100644 --- a/api/application/views/smc_creditpd_reports/NBFC.php +++ b/api/application/views/smc_creditpd_reports/NBFC.php @@ -6,6 +6,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $dash = ' '; // $product_name = $master[0]['abbr']; $rupee_symbol = "₹"; + $pd_type = ""; + if($master[0]['sales_pd_type'] == 1){$pd_type = "Physical PD "; }else if($master[0]['sales_pd_type'] == 2){$pd_type = "Telephonic PD ";} //print_r($master[0]['abbr']);die(); ?> @@ -199,7 +201,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); - Personal Discussion Sheet - + Personal Discussion Sheet - + Application ID