From 6f9916ce07915acb7e46cdf73a93bea1a8fbaeaf Mon Sep 17 00:00:00 2001 From: velz Date: Mon, 10 Jun 2019 11:50:55 +0530 Subject: [PATCH] RENTAL YES NO SES REMOVED --- api/application/config/autoload.php | 2 +- api/application/controllers/PD_Controller.php | 4 +- .../User_Management_Controller.php | 2 +- api/application/controllers/Welcome.php | 4 +- api/application/helpers/rentalform_helper.php | 38 +++++++++++++++++++ .../views/report_templates/JSONTOREPORT.php | 6 +-- 6 files changed, 46 insertions(+), 10 deletions(-) create mode 100644 api/application/helpers/rentalform_helper.php diff --git a/api/application/config/autoload.php b/api/application/config/autoload.php index 208b07bb..fa849ea1 100644 --- a/api/application/config/autoload.php +++ b/api/application/config/autoload.php @@ -89,7 +89,7 @@ $autoload['drivers'] = array(); | | $autoload['helper'] = array('url', 'file'); */ -$autoload['helper'] = array('url','file','form', 'jwt', 'authorization', 'date','mylog','myocr','mydb','pdalerts','myutil','myhttpclient','pdscore','businessform','otherincomeform','financialform','neighbourreferencecheckform', 'otherfamilyform', 'assetsform','stockform', 'bankingform','sms_gupshup','assessedincome'); +$autoload['helper'] = array('url','file','form', 'jwt', 'authorization', 'date','mylog','myocr','mydb','pdalerts','myutil','myhttpclient','pdscore','businessform','otherincomeform','financialform','neighbourreferencecheckform', 'otherfamilyform', 'assetsform','stockform', 'bankingform','sms_gupshup','assessedincome','rentalform'); /* | ------------------------------------------------------------------- diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index a165a748..7bcadecc 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -878,7 +878,7 @@ class PD_Controller extends REST_Controller { if(count($parent_pd_details)) { $newpd['fk_lender_id'] = $parent_pd_details[0]['fk_lender_id']; - $newpd['pd_date_of_initiation'] = $parent_pd_details[0]['pd_date_of_initiation_sqlformat']; + $newpd['pd_date_of_initiation'] = date('Y-m-d H-i-s'); $newpd['fk_entity_billing_id'] = $parent_pd_details[0]['fk_entity_billing_id']; $newpd['lender_applicant_id'] = $parent_pd_details[0]['lender_applicant_id']; $newpd['fk_product_id'] = $parent_pd_details[0]['fk_product_id']; @@ -5113,7 +5113,7 @@ class PD_Controller extends REST_Controller { // $this->getPDImages_post($fields2,array('fk_pd_id'=>$pdid,'fk_form_id' => $i),PDDOCUMENTS,array(),'','company_id','ASC'); // print_r($this->db->last_query()); } - //print_r($data['pd_images']); + //print_r($data['pd_processed_forms'][17]); //die(); //print_r($data['pd_images']);die(); //print_r(json_decode($data['pd_processed_forms'][14][0]['processed_json'],true)); //die(); diff --git a/api/application/controllers/User_Management_Controller.php b/api/application/controllers/User_Management_Controller.php index 08178110..04fdac50 100644 --- a/api/application/controllers/User_Management_Controller.php +++ b/api/application/controllers/User_Management_Controller.php @@ -152,7 +152,7 @@ class User_Management_Controller extends REST_Controller { // send a verification mail for registered user to get PD alert informations // They have to clik a verification link from sent mail - $this->aws_ses->verifyEmailIdentity($records['email']); + //$this->aws_ses->verifyEmailIdentity($records['email']); $data['dataStatus'] = true; $data['status'] = REST_Controller::HTTP_OK; $data['record'] = $user_id; diff --git a/api/application/controllers/Welcome.php b/api/application/controllers/Welcome.php index 298aad70..e310e663 100644 --- a/api/application/controllers/Welcome.php +++ b/api/application/controllers/Welcome.php @@ -20,9 +20,7 @@ class Welcome extends CI_Controller { */ public function index() { - $this->load->view('welcome_message'); - - + $this->load->view('welcome_message'); } diff --git a/api/application/helpers/rentalform_helper.php b/api/application/helpers/rentalform_helper.php new file mode 100644 index 00000000..b61abf91 --- /dev/null +++ b/api/application/helpers/rentalform_helper.php @@ -0,0 +1,38 @@ + 1 ? 'were' : 'was'; + + $name_of_persons_showing_property = null; + foreach($rental_data['person_met'] as $showed_person){ + + if($showed_person['id'] != 0) + { + $name_of_persons_showing_property .= $showed_person['name'].' ,'; + } + else + { + $name_of_persons_showing_property .= $rental_data['other_person_met']; + } + } + + $name_of_persons_showing_property = substr_replace($name_of_persons_showing_property,'and ',strrpos($name_of_persons_showing_property,','),1); + $property_text .= 'The property shown by '.$name_of_persons_showing_property; + + echo $property_text; + + die(); + + } +} +?> \ No newline at end of file diff --git a/api/application/views/report_templates/JSONTOREPORT.php b/api/application/views/report_templates/JSONTOREPORT.php index f7019e3c..9722a727 100644 --- a/api/application/views/report_templates/JSONTOREPORT.php +++ b/api/application/views/report_templates/JSONTOREPORT.php @@ -418,8 +418,6 @@ defined('BASEPATH') OR exit('No direct script access allowed');
- -