diff --git a/api/application/config/constants.php b/api/application/config/constants.php index 404ba619..ca983c11 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -95,7 +95,8 @@ defined('ROUTE_LOGIN_W') OR define('ROUTE_LOGIN_W', 'saveSalesPDImage'); defined('ROUTE_LOGIN_V') OR define('ROUTE_LOGIN_V', 'generateSatelliteImg'); // no errors defined('ROUTE_LOGIN_U') OR define('ROUTE_LOGIN_U', 'generateOTP'); defined('ROUTE_LOGIN_T') OR define('ROUTE_LOGIN_T', 'verifyOTP'); -defined('ROUTE_LOGIN_W') OR define('ROUTE_LOGIN_D', 'saveFlyhiPDImage'); // no errors +defined('ROUTE_LOGIN_E') OR define('ROUTE_LOGIN_E', 'getDigiLockerDocs'); +defined('ROUTE_LOGIN_D') OR define('ROUTE_LOGIN_D', 'saveFlyhiPDImage'); // no errors defined('ROUTE_LOGIN_C') OR define('ROUTE_LOGIN_C', 'getCreditPDReportforCETApp'); defined('ROUTE_LOGIN_B') OR define('ROUTE_LOGIN_B', 'getSalesPDReportforCETApp'); defined('ROUTE_LOGIN_A') OR define('ROUTE_LOGIN_A', 'getAuditedImages'); // no errors diff --git a/api/application/controllers/Flyhi_Controller.php b/api/application/controllers/Flyhi_Controller.php index 9c3e2426..8fa6a097 100644 --- a/api/application/controllers/Flyhi_Controller.php +++ b/api/application/controllers/Flyhi_Controller.php @@ -706,8 +706,8 @@ class Flyhi_Controller extends REST_Controller { mkdir($this->external_path.'/sales_pd/'.$pd_id,0777); } - // if(!$flyhipd_data[0]['is_pdf'] || $flyhipd_data[0]['is_edited']) - if(1) + if(!$flyhipd_data[0]['is_pdf'] || $flyhipd_data[0]['is_edited']) + // if(1) { $all_section_data = $this->Flyhi_Model->selectCustomRecords(array('*'),array('sales_pd_id' => $pd_id,'isactive' => 1),SALESPD_SECTION_DATA,array(),'','section_id','ASC'); @@ -2186,21 +2186,22 @@ class Flyhi_Controller extends REST_Controller { } } - public function getDigiLockerDocs_get(){ + public function getDigiLockerDocsu_get(){ $this->load->helper('digital_locker'); - $code = "0049e4a9fa3826e8b64a0882c32038bd84daa0ab"; - // $code = $this->get('code'); + // $code = "0049e4a9fa3826e8b64a0882c32038bd84daa0ab"; + $code = $this->get('code'); $state = $this->get('state'); log_message('ERROR',"###Step 1 : Inside Controller GetDigilockerDocs code :".$code); $response_data = digital_locker::getAccessToken($code); if(isset($response_data['dataStatus']) && $response_data['dataStatus'] == false){ $response_data['status'] = REST_Controller::HTTP_NOT_FOUND; + $this->response($response_data,REST_Controller::HTTP_OK); }else{ $view_data['list'] = json_decode($response_data['records'], true); - $html_content = $this->load->view("digital_locker",$view_data,true); - echo $html_content;die(); - $response_data['status'] = REST_Controller::HTTP_OK; + $this->load->view("digital_locker",$view_data,true); + // echo $html_content;die(); + // $response_data['status'] = REST_Controller::HTTP_OK; } // $this->response($response_data,REST_Controller::HTTP_OK); } @@ -2211,7 +2212,7 @@ class Flyhi_Controller extends REST_Controller { print_r($this->post()); die(); } - public function getDigiLockerDocstest_get(){ + public function getDigiLockerDocs_get(){ $view_data['list2'] = array ( 'items' => array ( @@ -2298,7 +2299,7 @@ class Flyhi_Controller extends REST_Controller { ), ), ); - $html_content = $this->load->view("digital_locker",$view_data,true); - echo $html_content; die(); +$this->load->view("digital_locker",$view_data,true); + // echo $html_content; die(); } }// Class Ends diff --git a/api/application/helpers/authorization_helper.php b/api/application/helpers/authorization_helper.php index be6c69fb..244485bd 100644 --- a/api/application/helpers/authorization_helper.php +++ b/api/application/helpers/authorization_helper.php @@ -72,7 +72,7 @@ class AUTHORIZATION } - if( $routingName == ROUTE_LOGIN_X || $routingName == ROUTE_LOGIN_Y || $routingName == ROUTE_LOGIN_Z || $routingName == ROUTE_LOGIN_W || $routingName == ROUTE_LOGIN_V || $routingName == ROUTE_LOGIN_A || $routingName == TURN_SERVER_API || $routingName == VIDEO_CHAT_ACCESS_KEY_API || $routingName ==SAVEROOMINFO_API || $routingName ==SAVESMCCREDITPDIMAGE_API || $routingName ==GETSMCPDIMGSECTIONDATA_API || $routingName == ROUTE_LOGIN_T || $routingName == ROUTE_LOGIN_U || $routingName == ROUTE_LOGIN_B || $routingName == ROUTE_LOGIN_C) + if( $routingName == ROUTE_LOGIN_X || $routingName == ROUTE_LOGIN_Y || $routingName == ROUTE_LOGIN_Z || $routingName == ROUTE_LOGIN_W || $routingName == ROUTE_LOGIN_V || $routingName == ROUTE_LOGIN_A || $routingName == TURN_SERVER_API || $routingName == VIDEO_CHAT_ACCESS_KEY_API || $routingName ==SAVEROOMINFO_API || $routingName ==SAVESMCCREDITPDIMAGE_API || $routingName ==GETSMCPDIMGSECTIONDATA_API || $routingName == ROUTE_LOGIN_T || $routingName == ROUTE_LOGIN_U || $routingName == ROUTE_LOGIN_B || $routingName == ROUTE_LOGIN_C || $routingName == ROUTE_LOGIN_D || $routingName == ROUTE_LOGIN_E) { return true; }