From 0fa49c7ddde52c275d2fc5f10849348b96ccf519 Mon Sep 17 00:00:00 2001 From: Velz2020 Date: Thu, 17 Oct 2019 12:38:50 +0530 Subject: [PATCH] SPACE REMOVED BW LOCATION & LOAN --- api/application/helpers/pdalerts_helper.php | 34 +++++++++++++------ .../report_templates/JSONTOREPORT_CLIX.php | 2 +- .../report_templates/JSONTOREPORT_DI_AI.php | 2 +- .../JSONTOREPORT_DI_AI_ADDON.php | 2 +- .../report_templates/JSONTOREPORT_RI.php | 2 +- 5 files changed, 28 insertions(+), 14 deletions(-) diff --git a/api/application/helpers/pdalerts_helper.php b/api/application/helpers/pdalerts_helper.php index 7b0ca12e..34b73d90 100644 --- a/api/application/helpers/pdalerts_helper.php +++ b/api/application/helpers/pdalerts_helper.php @@ -56,6 +56,20 @@ class PDALERTS // die(); if(count($core_details)) { + $is_pd_notify_enabled = $core_details[0]['is_notify_enabled']; + $is_sms_enabled = $core_details[0]['is_sms_enabled']; + $is_mail_enabled = $core_details[0]['is_mail_enabled']; + $is_app_notify_enabled = $core_details[0]['is_app_notify_enabled']; + + if(!$is_pd_notify_enabled) + { + $is_sms_enabled = 0; + $is_mail_enabled = 0; + $is_app_notify_enabled = 0; + } + + + $additional_data_for_logs['pd_status'] = $core_details[0]['pd_status']; /*********************************************/ /*******Get Notification Config Details*****/ @@ -117,7 +131,7 @@ class PDALERTS /*******Send SMS Notification to Lender*****/ /*********************************************/ - if($pd_notification_configs[0]['sms_lender'] == 1) + if($pd_notification_configs[0]['sms_lender'] == 1 && $is_sms_enabled) { $lender_sms = (string)$core_details[0]['pd_contact_mobileno']; $lender_sales_contact_mobileno = (string)$core_details[0]['lender_sales_contact_mobileno']; @@ -147,7 +161,7 @@ class PDALERTS /*********************************************/ /*******Send Mail Notification to Lender*****/ // currently Mail disabled /*********************************************/ - if($pd_notification_configs[0]['mail_lender'] == 1) + if($pd_notification_configs[0]['mail_lender'] == 1 && $is_mail_enabled) { $lender_email = null; $lender_sales_person_email = $core_details[0]['lender_sales_person_email']; @@ -188,7 +202,7 @@ class PDALERTS /*********************************************/ /*******Send Push Notification to Lender(WEB/MOB)***** /*********************************************/ - if($pd_notification_configs[0]['app_lender'] == 1) + if($pd_notification_configs[0]['app_lender'] == 1 && $is_app_notify_enabled) { //$lender_web_token = (string)$core_details[0]['pd_contact_mobileno']; //$lender_mob_token = (string)$core_details[0]['pd_contact_mobileno']; @@ -218,7 +232,7 @@ class PDALERTS /*********************************************/ /*******Send SMS Notification to PD Officer*****/ /*********************************************/ - if($pd_notification_configs[0]['sms_pdofficer'] == 1) + if($pd_notification_configs[0]['sms_pdofficer'] == 1 && $is_sms_enabled) { $mobile_nos_to_send_notification = array(); array_push($mobile_nos_to_send_notification,$core_details[0]['allocated_mobile_no']); @@ -244,7 +258,7 @@ class PDALERTS /*********************************************/ /*******Send Push Notification to PD Officer*****/ /*********************************************/ - if($pd_notification_configs[0]['app_pdofficer'] == 1) + if($pd_notification_configs[0]['app_pdofficer'] == 1 && $is_app_notify_enabled) { $pd_offcier_web_token = $core_details[0]['pdofficer_webtoken']; @@ -262,7 +276,7 @@ class PDALERTS /*********************************************/ /*******Send SMS Notification to Customer*****/ /*********************************************/ - if($pd_notification_configs[0]['sms_customer'] == 1) + if($pd_notification_configs[0]['sms_customer'] == 1 && $is_sms_enabled) { if($core_details[0]['customer_mobile_no'] != "" || $core_details[0]['customer_mobile_no'] != null) { @@ -280,7 +294,7 @@ class PDALERTS /*********************************************/ /**Send SMS Notification to Central PD Officer**/ /*********************************************/ - if($pd_notification_configs[0]['sms_pdincharge'] == 1) + if($pd_notification_configs[0]['sms_pdincharge'] == 1 && $is_sms_enabled) { if($core_details[0]['centralpdofficer_mobile_no'] != "" || $core_details[0]['centralpdofficer_mobile_no'] != null) { @@ -298,7 +312,7 @@ class PDALERTS /*********************************************/ /**Send Push Notification to Central PD Officer**/ /*********************************************/ - if($pd_notification_configs[0]['app_pdincharge'] == 1) + if($pd_notification_configs[0]['app_pdincharge'] == 1 && $is_app_notify_enabled) { $central_offcier_web_token = $core_details[0]['centralpdofficer_webtoken']; @@ -312,7 +326,7 @@ class PDALERTS /*********************************************/ /**Send SMS Notification to QC Team*****/ /*********************************************/ - if($pd_notification_configs[0]['sms_qcteam'] == 1) + if($pd_notification_configs[0]['sms_qcteam'] == 1 && $is_app_notify_enabled) { $CI->db->DISTINCT(); $CI->db->SELECT("mobile_no"); @@ -346,7 +360,7 @@ class PDALERTS /*********************************************/ /**Send PUSH Notification to QC Team*****/ /*********************************************/ - if($pd_notification_configs[0]['app_qcteam'] == 1) + if($pd_notification_configs[0]['app_qcteam'] == 1 && $is_app_notify_enabled) { $CI->db->DISTINCT(); $CI->db->SELECT("web_token,mob_token"); diff --git a/api/application/views/report_templates/JSONTOREPORT_CLIX.php b/api/application/views/report_templates/JSONTOREPORT_CLIX.php index 79f61f9d..41c67fb0 100644 --- a/api/application/views/report_templates/JSONTOREPORT_CLIX.php +++ b/api/application/views/report_templates/JSONTOREPORT_CLIX.php @@ -3823,7 +3823,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $residence_text ='This is a '. $fmValue['residence_ownership'].' Family Information - Ownership of Residence residence, where the applicant has been staying for '. $fmValue['residence_No_of_years'].'Family Information - No of Yrs in current residence .'; $residence_text .= (!strcasecmp($fmValue['residence_ownership'],'rented')) ? ' The rent paid '.$rupee_symbol.' '.$fmValue['rent'].' per month.' : ''; - $clix_dependency_text = 'There are '.$fmValue['no_family_members_clix'].' family member(s) family '; + $clix_dependency_text = 'There are '.$fmValue['no_family_members_clix'].' family member(s) '; $clix_dependency_text .= isset($fmValue['no_dependents_clix']) && $fmValue['no_dependents_clix'] != 0 ? ' in which ' . ($fmValue['no_dependents_clix'] == 1 ? 'One' : $fmValue['no_dependents_clix']). ' of them have dependent on applicant.' : ' and no dependents on applicant.'; echo $intro_text;echo "

";echo $residence_text;echo "

";echo $clix_dependency_text; diff --git a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php index 3b915919..4dd89103 100644 --- a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php +++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php @@ -1169,7 +1169,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); { echo ''.$address_form['address_form_remark'].'Address Form - Address Form Remarks ';} echo "

"; - echo "
"; + // echo "
"; //die(); // ?> 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 6ce3e05b..3a7c9e82 100644 --- a/api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php +++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php @@ -1169,7 +1169,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); { echo ''.$address_form['address_form_remark'].'Address Form - Address Form Remarks ';} echo "

"; - echo "
"; + // echo "
"; //die(); // ?> diff --git a/api/application/views/report_templates/JSONTOREPORT_RI.php b/api/application/views/report_templates/JSONTOREPORT_RI.php index 03ded8a0..bf6041b6 100644 --- a/api/application/views/report_templates/JSONTOREPORT_RI.php +++ b/api/application/views/report_templates/JSONTOREPORT_RI.php @@ -940,7 +940,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); { echo ''.$address_form['address_form_remark'].'Address Form - Address Form Remarks ';} echo "

"; - echo "
"; + // echo "
"; //die(); // ?>