Sineedge/sparqapi
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASSESSED INCOME 3

Browse Source
This commit is contained in:
velz 2018-12-03 12:10:19 +05:30
parent e3b3614dce
commit 259663b9fb
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/application/config/constants.php
View File

@ -87,7 +87,7 @@ defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest auto
// define login route name for token verification // define login route name for token verification
//defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listLessPDDetails/:any)'); // no errors //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listLessPDDetails/:any)'); // no errors
//defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listAllTemplates/:any)'); // no errors //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listAllTemplates/:any)'); // no errors
defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getAssessedIncome'); // no errors defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getPDFormDetails'); // no errors
/*********************AWS resources Constants*************************************************/ /*********************AWS resources Constants*************************************************/
defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic'); defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic');

9
api/application/controllers/PD_Controller.php
View File

@ -1575,6 +1575,8 @@ class PD_Controller extends REST_Controller {
$result_array = $this->PD_Model->getPDFormDetails($pd_id,$pd_form_id); $result_array = $this->PD_Model->getPDFormDetails($pd_id,$pd_form_id);
//call helper function for get structured key,value pairs
$final_array = GETPDFORMDETAILS::getPDFormDetailsStructured($result_array,$pd_id,$pd_form_id);
// *****************************Get Docs from bucket // *****************************Get Docs from bucket
// Get Alredy stored Images // Get Alredy stored Images
$fields = array('pd_document_title', 'pd_document_name'); $fields = array('pd_document_title', 'pd_document_name');
@ -1594,12 +1596,16 @@ class PD_Controller extends REST_Controller {
$pd_docs[$doc_key]['pd_document_name'] = $singed_uri; $pd_docs[$doc_key]['pd_document_name'] = $singed_uri;
} }
} }
$final_array['base64images'] = $pd_docs;
} }
// *************************End Get Docs from bucket // *************************End Get Docs from bucket
$final_array = GETPDFORMDETAILS::getPDFormDetailsStructured($result_array,$pd_id,$pd_form_id);
if($result_array) if($result_array)
{ {
@ -1638,6 +1644,7 @@ class PD_Controller extends REST_Controller {
if(array_key_exists('base64images',$records)) if(array_key_exists('base64images',$records))
{ {
$base64images = $records['base64images']; $base64images = $records['base64images'];
unset($records['base64images']);
} }
//Deactivate Old rec //Deactivate Old rec
$where_condition_array = array('fk_pd_id' => $pd_id,"fk_form_id"=>$pd_form_id); $where_condition_array = array('fk_pd_id' => $pd_id,"fk_form_id"=>$pd_form_id);