diff --git a/api/application/config/constants.php b/api/application/config/constants.php index a711bde3..4e7185a5 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -86,7 +86,7 @@ defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest auto // 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', 'getListOfLenders'); // no errors +defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getListOfProducts'); // no errors /*********************AWS resources Constants*************************************************/ defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic'); diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 25c191db..c5e6e787 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -149,7 +149,8 @@ class PD_Controller extends REST_Controller { $fields = array('city_id','name as city_name'); $where_condition_array = array('isactive' => 1,'fk_state_id' => $state['state_id']); $cities = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,CITY); - array_push($result_data[$key],$cities); + //array_push($result_data[$key],$cities); + $result_data[$key]['cities'] = $cities; } $data['dataStatus'] = true; diff --git a/api/application/libraries/AWS_S3.php b/api/application/libraries/AWS_S3.php index a7c958bf..2d99c22c 100644 --- a/api/application/libraries/AWS_S3.php +++ b/api/application/libraries/AWS_S3.php @@ -21,7 +21,7 @@ class AWS_S3 //echo "listAllBuckets"; $this->S3 = S3Client::factory($this->s3_properties); - //$this->getAllObjectsInaBucket(); + // $this->deleteSingleObjFromBucket(); } @@ -107,7 +107,7 @@ class AWS_S3 } - + // Get List of objetcs as byte(Raw file). public function getAllObjectsInaBucket($bucket_name,$folder_name) { $objects = array(); @@ -131,6 +131,19 @@ class AWS_S3 } + // Delete an object from the bucket. + public function deleteSingleObjFromBucket($bucket,$key) + { + + $result = $this->S3->deleteObject([ + 'Bucket' => $bucket, + 'Key' => $key + ]); + + return $result; + } + + } diff --git a/api/application/libraries/SPARQ_Model.php b/api/application/libraries/SPARQ_Model.php index dbcf18e1..72b128bf 100644 --- a/api/application/libraries/SPARQ_Model.php +++ b/api/application/libraries/SPARQ_Model.php @@ -92,7 +92,7 @@ class SPARQ_Model extends CI_Model { } - public function getJoinRecords($columns,$table,$joins,$print_query = '') + public function getJoinRecords($columns,$table,$joins,$where_condition_array = array(),$print_query = '') { @@ -104,6 +104,13 @@ class SPARQ_Model extends CI_Model { $this->db->join($join['table'], $join['condition'], $join['jointype']); } } + if(count($where_condition_array)) + { + foreach($where_condition_array as $key => $condition) + { + $this->db->WHERE($key,$condition); + } + } $data = $this->db->get()->result_array();