ENTITY PD

This commit is contained in:
velz 2018-10-24 12:53:41 +05:30
parent 2d965f2ef8
commit d25b5a80e9
5 changed files with 53 additions and 4 deletions

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', 'getFullPDDetails'); // no errors defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getCityHierarchy'); // 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');
@ -282,8 +282,8 @@ defined('PDTEAMPRODUCTID') OR define('PDTEAMPRODUCTID','pdteam_product_id');
defined('PDTEAMCUSTOMERSEGMENT') OR define('PDTEAMCUSTOMERSEGMENT','m_pdteam_customer_segment'); defined('PDTEAMCUSTOMERSEGMENT') OR define('PDTEAMCUSTOMERSEGMENT','m_pdteam_customer_segment');
defined('PDTEAMCUSTOMERSEGMENTID') OR define('PDTEAMCUSTOMERSEGMENTID','pdteam_customer_segment_id'); defined('PDTEAMCUSTOMERSEGMENTID') OR define('PDTEAMCUSTOMERSEGMENTID','pdteam_customer_segment_id');
defined('ENTITYREGION') OR define('ENTITYREGION','m_entity_region'); defined('ENTITYREGION') OR define('ENTITYREGION','m_entity_region_mapping');
defined('ENTITYREGIONID') OR define('ENTITYREGIONID','entity_region_id'); defined('ENTITYREGIONID') OR define('ENTITYREGIONID','entity_region_map_id');
defined('ENTITYSTATE') OR define('ENTITYSTATE','m_entity_state'); defined('ENTITYSTATE') OR define('ENTITYSTATE','m_entity_state');
defined('ENTITYSTATEID') OR define('ENTITYSTATEID','entity_state_id'); defined('ENTITYSTATEID') OR define('ENTITYSTATEID','entity_state_id');

View File

@ -123,6 +123,7 @@ $route['getEntityBillingInfo'] = 'Entity_Management_Controller/getEntityBillingI
$route['getLocationHierarchy'] = 'Entity_Management_Controller/getLocationHierarchy'; $route['getLocationHierarchy'] = 'Entity_Management_Controller/getLocationHierarchy';
$route['getEntityMasterInfo'] = 'Entity_Management_Controller/getEntityMasterInfo'; $route['getEntityMasterInfo'] = 'Entity_Management_Controller/getEntityMasterInfo';
$route['saveEntityBillingInfo'] = 'Entity_Management_Controller/saveEntityBillingInfo'; $route['saveEntityBillingInfo'] = 'Entity_Management_Controller/saveEntityBillingInfo';
$route['getCityHierarchy'] = 'Entity_Management_Controller/getCityHierarchy';
//PD RELATED //PD RELATED
$route['triggerNewPD'] = 'PD_Controller/triggerNewPD'; $route['triggerNewPD'] = 'PD_Controller/triggerNewPD';

View File

@ -338,6 +338,42 @@ class Entity_Management_Controller extends REST_Controller {
} }
} }
} }
/*
* Get Location Hierarchy as city and state - wrapped as one array for Lender Regions Mapping
*/
public function getCityHierarchy_get()
{
$cities = $this->Entity_Management_Model->getCityHierarchy();
if(count($cities))
{
$data['dataStatus'] = true;
$data['status'] = REST_Controller::HTTP_OK;
$data['records'] = $cities;
$this->response($data,REST_Controller::HTTP_OK);
}
else
{
$data['dataStatus'] = false;
$data['status'] = REST_Controller::HTTP_NOT_MODIFIED;
$data['msg'] = 'Records Not Found';
$this->response($data,REST_Controller::HTTP_OK);
}
}
/*
* Save Entity Regions Mapping
*/
public function getCityHierarchy_get()
{
}

View File

@ -90,6 +90,18 @@ class Entity_Management_Model extends SPARQ_Model {
return $result; return $result;
} }
public function getCityHierarchy()
{
$this->db->SELECT('CITY.city_id,CITY.fk_state_id,CITY.name as city_name,STATE.name as state_name,CITY.isactive');
$this->db->FROM(CITY.' as CITY');
$this->db->JOIN(STATE.' as STATE','CITY.fk_state_id = STATE.state_id');
$this->db->WHERE('CITY.isactive',1);
$data = $this->db->get()->result_array();
return $data;
}
} }

View File

@ -325,7 +325,7 @@ class PD_Model extends SPARQ_Model {
} }
} }
$result_data['child'] = array('Hi'=>'Welcome'); //$result_data['child'] = array('Hi'=>'Welcome');
$result_data['master'] = $actual_logs; $result_data['master'] = $actual_logs;
// Child History Start // Child History Start