From 41c2de952c32fa457c7f882bd3de24092b5c733c Mon Sep 17 00:00:00 2001 From: Velz2020 Date: Wed, 29 Jul 2020 20:11:20 +0530 Subject: [PATCH] SMART PD FEEDBACK 2 --- api/application/controllers/PD_Controller.php | 19 +++++++++++++------ api/application/models/PD_Model.php | 2 +- .../report_templates/JSONTOREPORT_CLIX.php | 2 +- .../report_templates/JSONTOREPORT_DI_AI.php | 2 +- .../JSONTOREPORT_DI_AI_ADDON.php | 2 +- .../JSONTOREPORT_DI_AI_TELE_PD.php | 2 +- .../report_templates/JSONTOREPORT_RI.php | 2 +- 7 files changed, 19 insertions(+), 12 deletions(-) diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 0404cf02..8bf2cc6f 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -951,10 +951,6 @@ class PD_Controller extends REST_Controller { $pd_details['complete_location'] = isset($pd_details['link']) ? $pd_details['link'] : null; unset($pd_details['link']); } - if($pd_details['pd_status'] == COMPLETED) - { - $pd_details['is_cus_link_disabled'] = 1; - } if(!isset($pd_details['is_revert_status'])) { $pd_details['pd_visit_date'] = date('Y-m-d H:i:s'); @@ -994,6 +990,10 @@ class PD_Controller extends REST_Controller { //print_r($pd_details); } //die(); + if($pd_details['pd_status'] == QC_COMPLETED) + { + $pd_details['is_cus_link_disabled'] = 1; + } if(isset($pd_details['pd_status']) && ($pd_details['pd_status'] == TRIGGERED || $pd_details['pd_status'] == INITIATED)) { @@ -6220,7 +6220,7 @@ public function getPDFormDetailsJSON_post() { $data['pd_images']['common_images'] = $this->PD_Model->getSignedPDDocsURL($pdid,null,null,null,null,'report'); } - //print_r($data['pd_images']['common_images']);die(); + //print_r(json_decode($data['pd_processed_forms'][24][0]['processed_json']));die(); // $it = array_filter($data['pd_images'][11],function($d){ if($d['company_id'] == 2){ echo $d['company_id'].'TRUE';return 1;}else {echo $d['company_id'].'FALSE'; return 0;} }); // print_r($it); @@ -9421,8 +9421,14 @@ public function getCompaniesListsFromGeneralFormRawJSON_post() $random_string = $this->post('random_string'); $pd_id = $this->post('pd_id'); $response = false; + $sms_flag = $this->post('sms_flag'); $msg = "Dear Applicant, Please click the link to upload the photographs. " . CUSTOMER_IMG_URL .$random_string; + if($sms_flag == 2)//recapture + { + $msg .= "/recapture"; + } + //SALESPD_CUSTOMER_IMG_URL $res = SMS_GUPSHUP::sendSMS($msg,$mobile_no,array('pd_id' => $pd_id,'status' => 'STARTED','msg' => 'Cus Link from PD controlller'),true); //print_r($res); @@ -10266,7 +10272,7 @@ public function getCompaniesListsFromGeneralFormRawJSON_post() { foreach ($docs as $key => $value) { - $where_condition_array[] = $value['pd_document_id'] ; + if(isset($value['pd_document_id']) && is_numeric($value['pd_document_id'])) { $where_condition_array[] = $value['pd_document_id']; } } $ids = $this->db->WHERE_IN('pd_document_id',$where_condition_array)->UPDATE(PDDOCUMENTS,array('retake_flag' => 1)); @@ -10278,6 +10284,7 @@ public function getCompaniesListsFromGeneralFormRawJSON_post() //echo count($docs);echo($total_affected_rows);echo ($is_api_processed); if($ids)// && $is_api_processed) { + //$this->PD_Model->updateRecords(array('is_cus_link_disabled' => 0),PDTRIGGER,array()); $data['dataStatus'] = true; $data['status'] = REST_Controller::HTTP_OK; $data['records'] = $total_affected_rows; diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index 47f95b44..9fbd9ba7 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); + $f_arr = array(18,5,13,11,19,20,24,22); foreach ($f_arr as $key => $value) { $this->saveRecords(array('fk_pd_id' => $pdid,'fk_form_id' => $value),VENDORFORMSTATUS); diff --git a/api/application/views/report_templates/JSONTOREPORT_CLIX.php b/api/application/views/report_templates/JSONTOREPORT_CLIX.php index 74c1453d..386b1a24 100644 --- a/api/application/views/report_templates/JSONTOREPORT_CLIX.php +++ b/api/application/views/report_templates/JSONTOREPORT_CLIX.php @@ -4290,7 +4290,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); foreach ($credit_officier_specific_queries['covid_section']['question_info'] as $covid_key => $covid_value) { - if(strcasecmp($covid_value['question'],'choose any')) + if(isset($covid_value['is_subfield']) && !$covid_value['is_subfield']) { echo 'Question : ' . $covid_value['question'].'
'; echo 'Answer : ' . $credit_officier_specific_queries['covid_section'][ $covid_value['question_key'] ].'
'; diff --git a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php index c7c114f0..6f125b4e 100644 --- a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php +++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php @@ -4345,7 +4345,7 @@ if($total_no_of_business > 0) { foreach ($credit_officier_specific_queries['covid_section']['question_info'] as $covid_key => $covid_value) { - if(strcasecmp($covid_value['question'],'choose any')) + if(isset($covid_value['is_subfield']) && !$covid_value['is_subfield']) { echo 'Question : ' . $covid_value['question'].'
'; echo 'Answer : ' . $credit_officier_specific_queries['covid_section'][ $covid_value['question_key'] ].'
'; 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 9d84ff95..e0d03fc3 100644 --- a/api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php +++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php @@ -4456,7 +4456,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); foreach ($credit_officier_specific_queries['covid_section']['question_info'] as $covid_key => $covid_value) { - if(strcasecmp($covid_value['question'],'choose any')) + if(isset($covid_value['is_subfield']) && !$covid_value['is_subfield']) { echo 'Question : ' . $covid_value['question'].'
'; echo 'Answer : ' . $credit_officier_specific_queries['covid_section'][ $covid_value['question_key'] ].'
'; diff --git a/api/application/views/report_templates/JSONTOREPORT_DI_AI_TELE_PD.php b/api/application/views/report_templates/JSONTOREPORT_DI_AI_TELE_PD.php index dc461d00..f04b8b89 100644 --- a/api/application/views/report_templates/JSONTOREPORT_DI_AI_TELE_PD.php +++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI_TELE_PD.php @@ -4281,7 +4281,7 @@ if($total_no_of_business > 0) { foreach ($credit_officier_specific_queries['covid_section']['question_info'] as $covid_key => $covid_value) { - if(strcasecmp($covid_value['question'],'choose any')) + if(isset($covid_value['is_subfield']) && !$covid_value['is_subfield']) { echo 'Question : ' . $covid_value['question'].'
'; echo 'Answer : ' . $credit_officier_specific_queries['covid_section'][ $covid_value['question_key'] ].'
'; diff --git a/api/application/views/report_templates/JSONTOREPORT_RI.php b/api/application/views/report_templates/JSONTOREPORT_RI.php index 5157254c..def239f3 100644 --- a/api/application/views/report_templates/JSONTOREPORT_RI.php +++ b/api/application/views/report_templates/JSONTOREPORT_RI.php @@ -1683,7 +1683,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); foreach ($credit_officier_specific_queries['covid_section']['question_info'] as $covid_key => $covid_value) { - if(strcasecmp($covid_value['question'],'choose any')) + ifisset($covid_value['is_subfield']) && !$covid_value['is_subfield']) { echo 'Question : ' . $covid_value['question'].'
'; echo 'Answer : ' . $credit_officier_specific_queries['covid_section'][ $covid_value['question_key'] ].'
';