diff --git a/api/application/config/constants.php b/api/application/config/constants.php index 3c529f5a..129bf2dc 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -87,7 +87,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', '(listAllTemplates/:any)'); // no errors -defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getDashBoardDetailsOfCity'); // no errors +defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'updatePDMaster'); // no errors /*********************AWS resources Constants*************************************************/ defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic'); @@ -337,4 +337,46 @@ defined('TEMPLATEFORMS') OR define('TEMPLATEFORMS','m_template_forms'); defined('TEMPLATEFORMSID') OR define('TEMPLATEFORMSID','template_form_id'); +// These master are not available in front end.not able to add front end master +defined('EARNINGMEMBERSSTATUS') OR define('EARNINGMEMBERSSTATUS','m_earning_members_status'); +defined('EARNINGMEMBERSSTATUSID') OR define('EARNINGMEMBERSSTATUSID','earning_member_status_id'); + +defined('EDUQUALIFICATION') OR define('EDUQUALIFICATION','m_edu_qualification'); +defined('EDUQUALIFICATIONID') OR define('EDUQUALIFICATIONID','qualification_id'); + +defined('ADDRESSTYPE') OR define('ADDRESSTYPE','m_address_type'); +defined('ADDRESSTYPEID') OR define('ADDRESSTYPEID','address_type_id'); + +defined('LOCALITY') OR define('LOCALITY','m_locality'); +defined('LOCALITYID') OR define('LOCALITYID','locality_id'); + +defined('ASSETTYPE') OR define('ASSETTYPE','m_asset_type'); +//defined('ASSETTYPEID') OR define('ASSETTYPEID','asset_type_id'); + +defined('PROPERTIES') OR define('PROPERTIES','m_properties'); +//defined('PROPERTIESID') OR define('PROPERTIESID','property_id'); + +defined('INVESTMENTTYPE') OR define('INVESTMENTTYPE','m_investment_type'); +//defined('INVESTMENTTYPEID') OR define('INVESTMENTTYPEID','investment_type_id'); + +defined('INSURANCETYPE') OR define('INSURANCETYPE','m_insurance_type'); +//defined('INSURANCETYPEID') OR define('INSURANCETYPEID','insurance_type_id'); + +defined('PERSONSMET') OR define('PERSONSMET','m_persons_met'); +//defined('PERSONSMETID') OR define('PERSONSMETID','person_met_id'); + +defined('RESIDENCEOWNERSHIP') OR define('RESIDENCEOWNERSHIP','m_residence_ownership'); +//defined('PERSONSMETID') OR define('PERSONSMETID','id'); + +defined('PAYMENTMODE') OR define('PAYMENTMODE','m_payment_mode'); +defined('ACCOUNTTYPE') OR define('ACCOUNTTYPE','m_account_type'); +defined('SOURCEOFOTHERINCOME') OR define('SOURCEOFOTHERINCOME','m_source_of_other_income'); +defined('MORTAGEPROPERTYTYPE') OR define('MORTAGEPROPERTYTYPE','m_mortage_property_type'); +defined('ENDUSEOFLOAN') OR define('ENDUSEOFLOAN','m_enduse_of_loan'); +defined('SOURCEOFBALANCETRANSFER') OR define('SOURCEOFBALANCETRANSFER','m_source_of_balance_transfer'); + + + + + diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index d39ddbe6..9a79a8ac 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -451,7 +451,7 @@ class PD_Controller extends REST_Controller { { $pd_details = $this->post('records'); // print_r($pd_details);die; - //print_r($pd_details); + print_r($pd_details); // OTP Generate Condition if($pd_details['pd_status'] == INITIATED) @@ -923,7 +923,7 @@ class PD_Controller extends REST_Controller { $central_pd_officers = array(); if($res_array[0]['fk_pd_type'] == 2 || $res_array[0]['fk_pd_type'] == 3) { - $this->db->SELECT('USERPROFILE.userid,USERPROFILE.first_name,USERPROFILE.last_name,USERPROFILE.profilepic,USERPROFILE.mobile_no,USERPROFILEROLES.user_role,ROLES.role_name'); + $this->db->SELECT('USERPROFILE.userid as fk_user_id,USERPROFILE.first_name,USERPROFILE.last_name,USERPROFILE.profilepic,USERPROFILE.mobile_no,USERPROFILEROLES.user_role,ROLES.role_name'); $this->db->FROM(USERPROFILE.' as USERPROFILE'); $this->db->JOIN(USERPROFILEROLES.' as USERPROFILEROLES','USERPROFILE.userid = USERPROFILEROLES.fk_userid'); $this->db->JOIN(ROLES.' as ROLES','USERPROFILEROLES.user_role = ROLES.role_id'); @@ -1021,7 +1021,7 @@ class PD_Controller extends REST_Controller { $central_pd_officers = array(); if($res_array[0]['fk_pd_type'] == 2 || $res_array[0]['fk_pd_type'] == 3) { - $this->db->SELECT('USERPROFILE.userid,USERPROFILE.first_name,USERPROFILE.last_name,USERPROFILE.profilepic,USERPROFILE.mobile_no,USERPROFILEROLES.user_role,ROLES.role_name'); + $this->db->SELECT('USERPROFILE.userid as fk_user_id,USERPROFILE.first_name,USERPROFILE.last_name,USERPROFILE.profilepic,USERPROFILE.mobile_no,USERPROFILEROLES.user_role,ROLES.role_name'); $this->db->FROM(USERPROFILE.' as USERPROFILE'); $this->db->JOIN(USERPROFILEROLES.' as USERPROFILEROLES','USERPROFILE.userid = USERPROFILEROLES.fk_userid'); $this->db->JOIN(ROLES.' as ROLES','USERPROFILEROLES.user_role = ROLES.role_id'); @@ -1543,7 +1543,7 @@ class PD_Controller extends REST_Controller { $t2 = array(); //$sub_group = array(); - //echo '\n'."New-".$result['iter_column_name'].$result['iteration']; + //echo '\n'."New-".$result['iter_column_name'].$result['iteration'].$result['iter_sub_column_name']; // print_r(array($result['column_name']=>$result['column_value'])); $t2 = array_merge($t2,array($result['column_name']=>$result['column_value'])); $sub_group[$result['iter_sub_column_name']][$result['iteration']] = $t2; @@ -1553,7 +1553,7 @@ class PD_Controller extends REST_Controller { else { - // echo '\n'."old-".$result['iter_column_name'].$result['iteration']; + // echo '\n'."old-".$result['iter_column_name'].$result['iteration'].$result['iter_sub_column_name']; // print_r(array($result['column_name']=>$result['column_value'])); $t2 = array_merge($t2,array($result['column_name']=>$result['column_value'])); $sub_group[$result['iter_sub_column_name']][$result['iteration']] = $t2; @@ -1575,7 +1575,7 @@ class PD_Controller extends REST_Controller { //print_r($group); $final_data = array_merge($final_data,$group); } - //print_r($sub_group); + //print_r($sub_group);die(); // Merge subgroup into main group $i = 0;