From e93e800624c3f99b4c18b2ee8eec58203252bbbb Mon Sep 17 00:00:00 2001 From: velz Date: Thu, 9 May 2019 23:20:31 +0530 Subject: [PATCH] SECOND SCRIPT --- api/application/config/constants.php | 4 ++-- api/application/controllers/PD_Controller.php | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/api/application/config/constants.php b/api/application/config/constants.php index eee7d1e9..ed1c5e4f 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -93,7 +93,7 @@ defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getPDOfficerCurrentLocat defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic'); if(ENVIRONMENT == 'development') { -defined('SATELLITE_IMAGE_LOCATION') OR define('SATELLITE_IMAGE_LOCATION','phantomjs_dev'); +defined('SATELLITE_IMAGE_LOCATION') OR define('SATELLITE_IMAGE_LOCATION','phantomsatellite_dev'); defined('LENDER_BUCKET_NAME_PREFIX') OR define('LENDER_BUCKET_NAME_PREFIX','lender'); defined('PHANTOMJSSCRIPT_LOCATION') OR define('PHANTOMJSSCRIPT_LOCATION','phantomjs_dev'); defined('LOGTOBOT') OR define('LOGTOBOT',0); @@ -101,7 +101,7 @@ defined('GOOGLE_STATIC_MAP_API_KEY') OR define('GOOGLE_STATIC_MAP_API_KEY','AIza } else if(ENVIRONMENT == 'testing') { - defined('SATELLITE_IMAGE_LOCATION') OR define('SATELLITE_IMAGE_LOCATION','phantomjs_test'); + defined('SATELLITE_IMAGE_LOCATION') OR define('SATELLITE_IMAGE_LOCATION','phantomsatellite_test'); defined('LENDER_BUCKET_NAME_PREFIX') OR define('LENDER_BUCKET_NAME_PREFIX','len'); defined('PHANTOMJSSCRIPT_LOCATION') OR define('PHANTOMJSSCRIPT_LOCATION','phantomjs_test'); defined('LOGTOBOT') OR define('LOGTOBOT',0); diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 9c6cb5c9..a2752cee 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -4699,7 +4699,8 @@ class PD_Controller extends REST_Controller { $pdmas = $this->PD_Model->getPDMasterDetails($pdid); //load satellite script from db - $satellite_script_from_db = $this->PD_Model->selectCustomRecords(array('*'),array('script_name' => 'phantomsatellite_local'),SCRIPTS); + //$satellite_script_from_db = $this->PD_Model->selectCustomRecords(array('*'),array('script_name' => 'phantomsatellite_local'),SCRIPTS); + $satellite_script_from_db = $this->PD_Model->selectCustomRecords(array('*'),array('script_name' => SATELLITE_IMAGE_LOCATION),SCRIPTS); $satellite_script = $satellite_script_from_db[0]['script_content']; //Get Address Data