From a99062be83b5b3e3fdfc09d402742059305b1cb9 Mon Sep 17 00:00:00 2001 From: Velz2020 Date: Wed, 8 Apr 2020 21:26:41 +0530 Subject: [PATCH] CUS LINK SMS --- api/application/config/constants.php | 3 ++ api/application/controllers/PD_Controller.php | 54 +++++++++++++------ 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/api/application/config/constants.php b/api/application/config/constants.php index a2a757ed..0fbb925c 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -103,6 +103,7 @@ defined('LOGTOBOT') OR define('LOGTOBOT',0); defined('GOOGLE_STATIC_MAP_API_KEY') OR define('GOOGLE_STATIC_MAP_API_KEY','AIzaSyA3lYDYxwtn5vLSl45SOKbtK7G6cEyXGr0'); defined('FIREBASE_PUSH_NOTIFICATION_SERVER_API_KEY') OR define('FIREBASE_PUSH_NOTIFICATION_SERVER_API_KEY','AAAA0yTIWHY:APA91bGuBHAEn1NcX95Uudm847Ez2AIbqqmi5698trFPx0cIs0OTXWUNu7c5DKDJlbxPBILytBGC5cEHqEy08AQZGu_rpCE4hyvoHyCDkOjuwhA3DFNMQDpMU6XxDDJXCI1zjhHRuEQr'); defined('OFFICER_TRACKING_URL') OR define('OFFICER_TRACKING_URL','https://demo.pdgenie.com/otnew/#/'); +defined('CUSTOMER_IMG_URL') OR define('CUSTOMER_IMG_URL','https://demo.pdgenie.com/customer/#/pd-images/'); } else if(ENVIRONMENT == 'testing') { @@ -114,6 +115,7 @@ else if(ENVIRONMENT == 'testing') defined('GOOGLE_STATIC_MAP_API_KEY') OR define('GOOGLE_STATIC_MAP_API_KEY','AIzaSyA3lYDYxwtn5vLSl45SOKbtK7G6cEyXGr0'); defined('FIREBASE_PUSH_NOTIFICATION_SERVER_API_KEY') OR define('FIREBASE_PUSH_NOTIFICATION_SERVER_API_KEY','AAAA0yTIWHY:APA91bGuBHAEn1NcX95Uudm847Ez2AIbqqmi5698trFPx0cIs0OTXWUNu7c5DKDJlbxPBILytBGC5cEHqEy08AQZGu_rpCE4hyvoHyCDkOjuwhA3DFNMQDpMU6XxDDJXCI1zjhHRuEQr'); defined('OFFICER_TRACKING_URL') OR define('OFFICER_TRACKING_URL','https://demo.pdgenie.com/otnew/#/'); + defined('CUSTOMER_IMG_URL') OR define('CUSTOMER_IMG_URL','https://demo.pdgenie.com/customer/#/pd-images/'); } else if(ENVIRONMENT == 'production') { @@ -125,6 +127,7 @@ else if(ENVIRONMENT == 'production') defined('GOOGLE_STATIC_MAP_API_KEY') OR define('GOOGLE_STATIC_MAP_API_KEY','AIzaSyA3lYDYxwtn5vLSl45SOKbtK7G6cEyXGr0'); defined('FIREBASE_PUSH_NOTIFICATION_SERVER_API_KEY') OR define('FIREBASE_PUSH_NOTIFICATION_SERVER_API_KEY','AAAA0yTIWHY:APA91bGuBHAEn1NcX95Uudm847Ez2AIbqqmi5698trFPx0cIs0OTXWUNu7c5DKDJlbxPBILytBGC5cEHqEy08AQZGu_rpCE4hyvoHyCDkOjuwhA3DFNMQDpMU6XxDDJXCI1zjhHRuEQr'); defined('OFFICER_TRACKING_URL') OR define('OFFICER_TRACKING_URL','https://pdgenie.com/track/#/'); + defined('CUSTOMER_IMG_URL') OR define('CUSTOMER_IMG_URL','https://pdgenie.com/customer/#/pd-images/'); } /*********************END of AWS resources Constants*************************************************/ diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 9e0a0a1d..eb91166b 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -851,6 +851,12 @@ class PD_Controller extends REST_Controller { SMS_GUPSHUP::sendSMS($msg,$no,array('pd_id' => $pd_details['pd_id'],'status' => 'STARTED','msg' => 'Started OTP msg from PD controlller')); } + if($exist_pd_details[0]['fk_pd_type'] == 3) + { + $msg = "Dear Applicant, Please click the link to upload the photographs." . CUSTOMER_IMG_URL .$exist_pd_details[0]['random_string']; + SMS_GUPSHUP::sendSMS($msg,$no,array('pd_id' => $exist_pd_details[0]['pd_id'],'status' => 'STARTED','msg' => 'Cus Link from PD controlller')); + } + } if(isset($pd_details['pd_status']) && ($pd_details['pd_status'] == COMPLETED) || ($pd_details['pd_status'] == ADD_ON_PENDING) ) @@ -5862,6 +5868,7 @@ public function getPDFormDetailsJSON_post() public function codeigniterViewTest_post() { + //print_r($this->aws_s3->createNewBucket('xmldatatest007'));die(); //satellite_image::getSatelliteImage(1213);die(); //echo $this->assignPDTempalate(1325);die(); @@ -7879,6 +7886,8 @@ public function getCompaniesListsFromGeneralFormRawJSON_post() } + + public function saveEmpSalaryAsBusinessExpensesFromBusinessForm($records) { //echo "FROM saveEmpSalaryAsBusinessExpensesFromBusinessForm"; @@ -9519,6 +9528,7 @@ public function getCompaniesListsFromGeneralFormRawJSON_post() { $img_array['image'] = $records['image']; $img_array['Name'] = $records['name']; + $img_array['is_show_report'] = 1; $current_doc_title = $records['image_key']; } else if(strpos($records['image_key'], 'name_board_seen') !== false) @@ -9655,16 +9665,16 @@ public function getCompaniesListsFromGeneralFormRawJSON_post() foreach ($this->photo_names as $key => $value) { $temp = $this->photoMapping($key,$value); - $final_data[] = is_array($temp) ? $temp : array('img_key' =>$key,'img_name' => $value[0],'img_url' => '','fk_form_id' => $value[1]); - - foreach ($this->existing_imges as $key => $value) + $final_data[] = is_array($temp) ? $temp : array('img_key' =>$key,'img_name' => $value[0],'img_url' => '','fk_form_id' => $value[1]); + } + + foreach ($this->existing_imges as $key => $value) { if(!$value['fk_form_id'] && ($value['pd_document_title'] != 'satellite')) { $final_data[] = array('img_key' =>'common_image','img_name' => $value['pd_document_title'],'img_url' => $value['doc_url'],'fk_form_id' => null); } - } - } + } } else { @@ -9686,7 +9696,7 @@ public function getCompaniesListsFromGeneralFormRawJSON_post() function photoMapping($current_img_key,$current_img) { - //print_r(count($this->existing_imges));///echo $img_key;die(); + ///echo $img_key;die(); //;die(); foreach ($this->existing_imges as $key => $value) { @@ -9694,34 +9704,44 @@ public function getCompaniesListsFromGeneralFormRawJSON_post() // echo $current_img_key.'***'.$value['pd_document_title']; // echo '
'; // echo '
'; + // print_r(count($this->existing_imges)); + // echo $value['pd_document_title']; if($current_img_key == 'selfie_with_person_met' && $value['img_type'] == 1 ) { - unset($this->existing_imges[$key]); + //echo "SELFIE"; - return array('img_key' => 'selfie_with_person_met','img_name' => $this->photo_names['selfie_with_person_met'][0],'fk_form_id' => $this->photo_names['selfie_with_person_met'][1],'img_url' => $value['doc_url'],'is_multiple' => 0); + $arr = array('img_key' => 'selfie_with_person_met','img_name' => $this->photo_names['selfie_with_person_met'][0],'fk_form_id' => $this->photo_names['selfie_with_person_met'][1],'img_url' => $value['doc_url'],'is_multiple' => 0); + unset($this->existing_imges[$key]); + return $arr; } else if($current_img_key == 'person_met_id' && $value['img_type'] == 2) { - unset($this->existing_imges[$key]); + //echo 'HOLD'; - return array('img_key' => 'person_met_id','img_name' => $this->photo_names['person_met_id'][0],'img_url' => $value['doc_url'],'fk_form_id' => $this->photo_names['person_met_id'][1],'is_multiple' => 0); + $arr = array('img_key' => 'person_met_id','img_name' => $this->photo_names['person_met_id'][0],'img_url' => $value['doc_url'],'fk_form_id' => $this->photo_names['person_met_id'][1],'is_multiple' => 0); + unset($this->existing_imges[$key]); + return $arr; // unset($this->photo_names['selfie_with_person_met']); // return $arr; } else if($current_img_key == 'approach_to_pd_location' && strpos($value['pd_document_title'], 'Approach') !== false) { - unset($this->existing_imges[$key]); + //echo "APPROACH"; - return array('img_key' => 'approach_to_pd_location','img_name' => $this->photo_names['approach_to_pd_location'][0],'img_url' => $value['doc_url'],'fk_form_id' => $this->photo_names['approach_to_pd_location'][1],'is_multiple' => 0); + $arr = array('img_key' => 'approach_to_pd_location','img_name' => $this->photo_names['approach_to_pd_location'][0],'img_url' => $value['doc_url'],'fk_form_id' => $this->photo_names['approach_to_pd_location'][1],'is_multiple' => 0); + unset($this->existing_imges[$key]); + return $arr; // unset($this->photo_names['selfie_with_person_met']); // return $arr; } else if($current_img_key == 'name_board_seen' && strpos($value['pd_document_title'], 'Name Board Seen') !== false) { - unset($this->existing_imges[$key]); + //echo "APPROACH"; - return array('img_key' => 'name_board_seen','img_name' => $this->photo_names['approach_to_pd_location'][0],'img_url' => $value['doc_url'],'fk_form_id' => $this->photo_names['approach_to_pd_location'][1],'is_multiple' => 0); + $arr = array('img_key' => 'name_board_seen','img_name' => $this->photo_names['approach_to_pd_location'][0],'img_url' => $value['doc_url'],'fk_form_id' => $this->photo_names['approach_to_pd_location'][1],'is_multiple' => 0); + unset($this->existing_imges[$key]); + return $arr; // unset($this->photo_names['selfie_with_person_met']); // return $arr; } @@ -9729,9 +9749,11 @@ public function getCompaniesListsFromGeneralFormRawJSON_post() else if(strpos($current_img_key, $value['pd_document_title']) !== false) { //echo $current_img_key.'***'.$value['pd_document_title']; - unset($this->existing_imges[$key]); + //unset($this->existing_imges[$key]); //echo "OTHER"; - return array('img_key' => $value['pd_document_title'],'img_name' => $this->photo_names[ $value['pd_document_title'] ][0],'img_url' => $value['doc_url'],'fk_form_id' => $this->photo_names[ $value['pd_document_title'] ][1],'is_multiple' => 0); + $arr = array('img_key' => $value['pd_document_title'],'img_name' => $this->photo_names[ $value['pd_document_title'] ][0],'img_url' => $value['doc_url'],'fk_form_id' => $this->photo_names[ $value['pd_document_title'] ][1],'is_multiple' => 0); + unset($this->existing_imges[$key]); + return $arr; // unset($this->photo_names['selfie_with_person_met']); // return $arr; }