From 637762f188a64c8c897104a97e080fb2d79064ad Mon Sep 17 00:00:00 2001 From: Velz2020 Date: Thu, 17 Oct 2019 19:44:45 +0530 Subject: [PATCH] ALERTS & EDITEABLE HEADING IN REPORT --- api/application/controllers/PD_Controller.php | 4 ++-- api/application/helpers/pdalerts_helper.php | 17 ++++++++++++----- .../report_templates/JSONTOREPORT_CLIX.php | 6 +++--- .../report_templates/JSONTOREPORT_DI_AI.php | 6 +++--- .../JSONTOREPORT_DI_AI_ADDON.php | 6 +++--- .../views/report_templates/JSONTOREPORT_RI.php | 4 ++-- 6 files changed, 25 insertions(+), 18 deletions(-) diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 805761d9..d60ba550 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -9049,10 +9049,10 @@ public function getCompaniesListsFromGeneralFormRawJSON_post() if($records['is_person_met_id_proof'] != "" && !substr_count($records['is_person_met_id_proof'],'https')) { $img_data[] = array('Name' => ($records['applicant_name'].'-id_proof'), 'image' => $records['is_person_met_id_proof'], 'link' => $records['link']); - $where1 = ($records['applicant_name'].'-id_proof'); + $where2 = ($records['applicant_name'].'-id_proof'); } - if($where1 != '' || $where2 != '') + if($where1 != '' && $where2 != '') { $sql .= ' and (pd_document_title = ? or pd_document_title = ?)'; $this->db->query($sql, array($where1, $where2)); diff --git a/api/application/helpers/pdalerts_helper.php b/api/application/helpers/pdalerts_helper.php index 34b73d90..bea0a09d 100644 --- a/api/application/helpers/pdalerts_helper.php +++ b/api/application/helpers/pdalerts_helper.php @@ -184,14 +184,21 @@ class PDALERTS // self::sendMail($CI,$lender_email,$msg,$core_details); // currently Mail disabled } - // if(ENVIRONMENT == 'production') - // { + if($lender_sales_person_email != null){ self::sendMail($CI,$lender_sales_person_email,$msg,$core_details); } if($lender_credit_person_email != null){ self::sendMail($CI,$lender_credit_person_email,$msg,$core_details); } - if($financial_institude_email != null){ self::sendMail($CI,$financial_institude_email,$msg,$core_details); } - //} + if($financial_institude_email != null) + { + self::sendMail($CI,$financial_institude_email,$msg,$core_details); + self::sendMail($CI,'velmurugan.s@venbainfotech.com',$msg,$core_details); + if(ENVIRONMENT == 'testing') + { + self::sendMail($CI,'vitvelz@gmail.com',$msg,$core_details); + } + } + self::sendMail($CI,'komalmittal@sinemanagement.com',$msg,$core_details); - self::sendMail($CI,'velmurugan.s@venbainfotech.com',$msg,$core_details); + self::sendMail($CI,'sinepd@sinemanagement.com',$msg,$core_details); } diff --git a/api/application/views/report_templates/JSONTOREPORT_CLIX.php b/api/application/views/report_templates/JSONTOREPORT_CLIX.php index 41c67fb0..e4241cd2 100644 --- a/api/application/views/report_templates/JSONTOREPORT_CLIX.php +++ b/api/application/views/report_templates/JSONTOREPORT_CLIX.php @@ -2594,7 +2594,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); ?> Client Details"; + echo '

Client Details

'; if($is_client_details_available != null) { @@ -4036,7 +4036,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); // if(count($credit_officier_specific_queries)) // { echo '
'; - echo '

Credit Manager`s Specific Queries:

'; + echo '

Credit Manager`s Specific Queries:

'; //echo '
'; if(isset($credit_officier_specific_queries['additional_requirements_processed']) && count($credit_officier_specific_queries['additional_requirements_processed'])) { @@ -4055,7 +4055,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); } echo '
'; - echo '

Documents to be collected:

'; + echo '

Documents to be collected:

'; // if(isset($credit_officier_specific_queries['docs_to_be_sighted_processed']) && count($credit_officier_specific_queries['docs_to_be_sighted_processed'])) { diff --git a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php index 4dd89103..d29ad6ac 100644 --- a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php +++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php @@ -2639,7 +2639,7 @@ if($total_no_of_business > 0) { ?> Client Details"; + echo '

Client Details

'; if($is_client_details_available != null) { @@ -4097,7 +4097,7 @@ if($total_no_of_business > 0) { // if(count($credit_officier_specific_queries)) // { echo '
'; - echo '

Credit Manager`s Specific Queries:

'; + echo '

Credit Manager`s Specific Queries:

'; //echo '
'; if(isset($credit_officier_specific_queries['additional_requirements_processed']) && count($credit_officier_specific_queries['additional_requirements_processed'])) { @@ -4116,7 +4116,7 @@ if($total_no_of_business > 0) { } echo '
'; - echo '

Documents to be collected:

'; + echo '

Documents to be collected:

'; // if(isset($credit_officier_specific_queries['docs_to_be_sighted_processed']) && count($credit_officier_specific_queries['docs_to_be_sighted_processed'])) { 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 3a7c9e82..d33c125d 100644 --- a/api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php +++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php @@ -2622,7 +2622,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); ?> Client Details"; + echo '

Client Details

'; if($is_client_details_available != null) { @@ -4068,7 +4068,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); // if(count($credit_officier_specific_queries)) // { echo '
'; - echo '

Credit Manager`s Specific Queries:

'; + echo '

Credit Manager`s Specific Queries:

'; //echo '
'; if(isset($credit_officier_specific_queries['additional_requirements_processed']) && count($credit_officier_specific_queries['additional_requirements_processed'])) { @@ -4087,7 +4087,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); } echo '
'; - echo '

Documents to be collected:

'; + echo '

Documents to be collected:

'; // if(isset($credit_officier_specific_queries['docs_to_be_sighted_processed']) && count($credit_officier_specific_queries['docs_to_be_sighted_processed'])) { diff --git a/api/application/views/report_templates/JSONTOREPORT_RI.php b/api/application/views/report_templates/JSONTOREPORT_RI.php index bf6041b6..6a6fa187 100644 --- a/api/application/views/report_templates/JSONTOREPORT_RI.php +++ b/api/application/views/report_templates/JSONTOREPORT_RI.php @@ -1581,7 +1581,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); // if(count($credit_officier_specific_queries)) // { echo '
'; - echo '

Credit Manager`s Specific Queries:

'; + echo '

Credit Manager`s Specific Queries:

'; //echo '
'; if(isset($credit_officier_specific_queries['additional_requirements_processed']) && count($credit_officier_specific_queries['additional_requirements_processed'])) { @@ -1600,7 +1600,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); } echo '
'; - echo '

Documents to be collected:

'; + echo '

Documents to be collected:

'; // if(isset($credit_officier_specific_queries['docs_to_be_sighted_processed']) && count($credit_officier_specific_queries['docs_to_be_sighted_processed'])) {