From 9d5ce14fb28821e5752cd7d464755cbc77f2d9f9 Mon Sep 17 00:00:00 2001 From: Velz2020 Date: Thu, 27 Aug 2020 22:49:14 +0530 Subject: [PATCH] SMARTPD FEEDBACKS 3 --- api/application/controllers/PD_Controller.php | 5 +++++ api/application/controllers/Sales_PD_Controller.php | 3 ++- api/application/helpers/custom_pdalerts_helper.php | 8 ++++++++ api/application/helpers/pdalerts_helper.php | 4 +++- api/application/models/PD_Model.php | 2 +- 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index a9c5c217..45f7119b 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -6007,6 +6007,11 @@ public function getPDFormDetailsJSON_post() public function codeigniterViewTest_post() { + // $msg = "OTP for starting your personal discussions with the verification officer is 999999.Pls share this only when the officer has reached your place in person."; + // $res = SMS_GUPSHUP::sendSMS($msg,9715454901 ,array(),true); + //print_r($res); + //PDALERTS::pdnotification(1797); + die(); //$this->dupAssessedIncomeInfo(1192,9999,1);die(); //print_r($this->aws_s3->getAllObjectsInaBucket('test-lender1','pd114'));die(); diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php index 3af915a5..63df0ee8 100644 --- a/api/application/controllers/Sales_PD_Controller.php +++ b/api/application/controllers/Sales_PD_Controller.php @@ -800,9 +800,10 @@ class Sales_PD_Controller extends REST_Controller { $section_data = array(); - if($records['section_id'] == 'all'){ + if(!is_numeric($records['section_id'])){ // die(); $fields=array('id','sales_pd_id','section_id','status','createdby','createdon'); + if($records['section_id'] == 'data'){ $fields[] = 'section_data'; } $section_data=$this->Sales_PD_Model->selectCustomRecords($fields,array('sales_pd_id' => $records['sales_pd_id'],'isactive' => 1),SALESPD_SECTION_DATA); } else{ diff --git a/api/application/helpers/custom_pdalerts_helper.php b/api/application/helpers/custom_pdalerts_helper.php index 88a101a9..b35a414a 100644 --- a/api/application/helpers/custom_pdalerts_helper.php +++ b/api/application/helpers/custom_pdalerts_helper.php @@ -49,6 +49,14 @@ class CUSTOM_PDALERTS } } + + if($core_details[0]['pd_status'] == ALLOCATED_TO_PARTNER && $core_details[0]['vendor_email'] != '') + { + $msg = 'Dear Team,\n\n New PD has been Allocated to you. \" {{applicant_name}} \" ID - \" {{applicant_id}} \" .\n\nWarm Regards,\nSineedge Consulting Private Limited.'; + $msg = PDALERTS::stringReplace($msg,$core_details,'MAIL'); + PDALERTS::sendMail($CI,$core_details[0]['vendor_email'],$msg,$core_details); + } + //die(); /********************************************************/ } diff --git a/api/application/helpers/pdalerts_helper.php b/api/application/helpers/pdalerts_helper.php index ebf91f50..6a3f6ffc 100644 --- a/api/application/helpers/pdalerts_helper.php +++ b/api/application/helpers/pdalerts_helper.php @@ -33,10 +33,11 @@ class PDALERTS /*********************************************/ /*******Get PD Master Details*****************/ /*********************************************/ - $CI->db->SELECT("PDTRIGGER.pd_id,PDTRIGGER.fk_lender_id,ENTITY.short_name,PDTRIGGER.lender_applicant_id,PDTRIGGER.fk_pd_type,PDTRIGGER.pd_status,PDTRIGGER.pd_date_of_initiation,PDTRIGGER.scheduled_on,PDTRIGGER.updatedon,PDTRIGGER.fk_pd_allocated_to,ALLOCATED.email as allocated_email,ALLOCATED.mobile_no as allocated_mobile_no,concat(ALLOCATED.first_name,' ',ALLOCATED.last_name) as pdofficer_name,PDTRIGGER.executive_id,EXECUTIVE.email as executive_email,EXECUTIVE.mobile_no as executive_mobile_no,PDTRIGGER.central_pd_officer_id,CENTRALPDOFFICER.mobile_no as centralpdofficer_mobile_no,CENTRALPDOFFICER.email as centralpdofficer_mail,PDTRIGGER.pd_agency_id,PDTRIGGER.pd_contact_person,PDTRIGGER.pd_contact_mobileno,CREATED.fk_entity_type_id,CREATED.email as created_email,PDTRIGGER.pd_contact_person_mail,PDAPPLICANTSDETAILS.applicant_name,PDAPPLICANTSDETAILS.mobile_no as customer_mobile_no,PDTRIGGER.encrypted_url,PDOFFICER.web_token as pdofficer_webtoken,PDOFFICER.mob_token as pdofficer_mobtoken,PDEXECUTIVE.web_token as pdexecutive_webtoken,PDEXECUTIVE.mob_token as pdexecutive_mobtoken,CENTRALPDOFFICERTOKEN.web_token as centralpdofficer_webtoken,CENTRALPDOFFICERTOKEN.mob_token as centralpdofficer_mobtoken,concat(LENDERSALESPERSON.first_name,' ',LENDERSALESPERSON.last_name) as lender_sales_person_name,LENDERSALESPERSON.mobile_no as lender_sales_contact_mobileno,LENDERSALESPERSON.email as lender_sales_person_email,concat(LENDERCREDITPERSON.first_name,' ',LENDERCREDITPERSON.last_name) as lender_credit_person_name,LENDERCREDITPERSON.mobile_no as lender_credit_person_contact_mobileno,LENDERCREDITPERSON.email as lender_credit_person_email,LENDERSALESPERSONTOKEN.web_token as lender_sales_web_token,LENDERSALESPERSONTOKEN.mob_token as lender_sales_mob_token,LENDERCREDITPERSONTOKEN.web_token as lender_credit_web_token,LENDERCREDITPERSONTOKEN.mob_token as lender_credit_mob_token,ENTITYFININSTITUTION.institute_email,ENTITY.is_sms_enabled,ENTITY.is_mail_enabled,ENTITY.is_app_notify_enabled,PDTRIGGER.is_notify_enabled"); + $CI->db->SELECT("PDTRIGGER.pd_id,PDTRIGGER.fk_lender_id,ENTITY.short_name,PDTRIGGER.lender_applicant_id,PDTRIGGER.fk_pd_type,PDTRIGGER.pd_status,PDTRIGGER.pd_date_of_initiation,PDTRIGGER.scheduled_on,PDTRIGGER.updatedon,PDTRIGGER.fk_pd_allocated_to,ALLOCATED.email as allocated_email,ALLOCATED.mobile_no as allocated_mobile_no,concat(ALLOCATED.first_name,' ',ALLOCATED.last_name) as pdofficer_name,PDTRIGGER.executive_id,EXECUTIVE.email as executive_email,EXECUTIVE.mobile_no as executive_mobile_no,PDTRIGGER.central_pd_officer_id,CENTRALPDOFFICER.mobile_no as centralpdofficer_mobile_no,CENTRALPDOFFICER.email as centralpdofficer_mail,PDTRIGGER.pd_agency_id,PDTRIGGER.pd_contact_person,PDTRIGGER.pd_contact_mobileno,CREATED.fk_entity_type_id,CREATED.email as created_email,PDTRIGGER.pd_contact_person_mail,PDAPPLICANTSDETAILS.applicant_name,PDAPPLICANTSDETAILS.mobile_no as customer_mobile_no,PDTRIGGER.encrypted_url,PDOFFICER.web_token as pdofficer_webtoken,PDOFFICER.mob_token as pdofficer_mobtoken,PDEXECUTIVE.web_token as pdexecutive_webtoken,PDEXECUTIVE.mob_token as pdexecutive_mobtoken,CENTRALPDOFFICERTOKEN.web_token as centralpdofficer_webtoken,CENTRALPDOFFICERTOKEN.mob_token as centralpdofficer_mobtoken,concat(LENDERSALESPERSON.first_name,' ',LENDERSALESPERSON.last_name) as lender_sales_person_name,LENDERSALESPERSON.mobile_no as lender_sales_contact_mobileno,LENDERSALESPERSON.email as lender_sales_person_email,concat(LENDERCREDITPERSON.first_name,' ',LENDERCREDITPERSON.last_name) as lender_credit_person_name,LENDERCREDITPERSON.mobile_no as lender_credit_person_contact_mobileno,LENDERCREDITPERSON.email as lender_credit_person_email,LENDERSALESPERSONTOKEN.web_token as lender_sales_web_token,LENDERSALESPERSONTOKEN.mob_token as lender_sales_mob_token,LENDERCREDITPERSONTOKEN.web_token as lender_credit_web_token,LENDERCREDITPERSONTOKEN.mob_token as lender_credit_mob_token,ENTITYFININSTITUTION.institute_email,ENTITY.is_sms_enabled,ENTITY.is_mail_enabled,ENTITY.is_app_notify_enabled,PDTRIGGER.is_notify_enabled,PDTRIGGER.pd_agency_id,VENDORBILLING.email as vendor_email"); $CI->db->FROM(PDTRIGGER." as PDTRIGGER"); $CI->db->JOIN(USERPROFILE." as CREATED","PDTRIGGER.fk_createdby = CREATED.userid",'LEFT'); $CI->db->JOIN(ENTITY." as ENTITY","PDTRIGGER.fk_lender_id = ENTITY.entity_id",'LEFT'); + $CI->db->JOIN(ENTITYBILLING." as VENDORBILLING","PDTRIGGER.pd_agency_id = VENDORBILLING.fk_entity_id",'LEFT'); $CI->db->JOIN(ENTITYFININSTITUTION." as ENTITYFININSTITUTION","PDTRIGGER.imgc_fin_institute = ENTITYFININSTITUTION.entity_fin_institution_id",'LEFT'); $CI->db->JOIN(USERPROFILE." as ALLOCATED","PDTRIGGER.fk_pd_allocated_to = ALLOCATED.userid",'LEFT'); $CI->db->JOIN(USERPROFILE." as EXECUTIVE","PDTRIGGER.executive_id = EXECUTIVE.userid",'LEFT'); @@ -518,6 +519,7 @@ class PDALERTS } else { $logger->info("Mailer Send:" ,array('mail_ID' => $lender_email,'Status' => 'SEND')); + } } diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index 9fbd9ba7..0746d7b8 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -1093,7 +1093,7 @@ class PD_Model extends SPARQ_Model { else//18,5,13,11,19,20 { //echo 'insert'; - $f_arr = array(18,5,13,11,19,20,24,22); + $f_arr = array(18,5,13,19,20,24,22); foreach ($f_arr as $key => $value) { $this->saveRecords(array('fk_pd_id' => $pdid,'fk_form_id' => $value),VENDORFORMSTATUS);