diff --git a/api/application/helpers/myutil_helper.php b/api/application/helpers/myutil_helper.php index 1a692444..0fbf8868 100644 --- a/api/application/helpers/myutil_helper.php +++ b/api/application/helpers/myutil_helper.php @@ -199,6 +199,17 @@ class MYUTIL } } return $num.'th'; + } + + public static function dispatchDisclaimer($array,$discliamer_type) + { + foreach ($array as $key => $value) + { + if($value['type'] == $discliamer_type ) + { + return $array[$key]; + } + } } diff --git a/api/application/models/User_Management_Model.php b/api/application/models/User_Management_Model.php index 2543304a..6798a9d7 100644 --- a/api/application/models/User_Management_Model.php +++ b/api/application/models/User_Management_Model.php @@ -54,7 +54,7 @@ class User_Management_Model extends SPARQ_Model { public function getUserDetails($userid){ - $this->db->select('USERPROFILE.userid, USERPROFILE.aws_name, USERPROFILE.first_name as user_first_name, USERPROFILE.last_name as user_last_name, USERPROFILE.email, USERPROFILE.mobile_no, USERPROFILE.profilepic, USERPROFILE.createdon, USERPROFILE.fk_createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as created_full_name, USERPROFILE.updatedon, USERPROFILE.fk_updatedby,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name)as update_full_name, USERPROFILE.fk_entity_id,ENTITY.full_name,ENTITY.short_name,USERPROFILE.isactive, USERPROFILE.fk_city,CITY.name as city_name, USERPROFILE.fk_state,STATE.name as state_name, PDOFFICIERSDETAILS.fk_pd_type_id,PDOFFICIERSDETAILS.fk_team_id,USERPROFILE.fk_entity_type_id,USERPROFILEROLES.user_role,ENTITYTYPE.name as entitytypename,ROLES.role_name,USERPROFILE.mpin'); + $this->db->select('USERPROFILE.userid, USERPROFILE.aws_name, USERPROFILE.first_name as user_first_name, USERPROFILE.last_name as user_last_name, USERPROFILE.email, USERPROFILE.mobile_no, USERPROFILE.profilepic, USERPROFILE.createdon, USERPROFILE.fk_createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as created_full_name, USERPROFILE.updatedon, USERPROFILE.fk_updatedby,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name)as update_full_name, USERPROFILE.fk_entity_id,ENTITY.full_name,ENTITY.short_name,USERPROFILE.isactive, USERPROFILE.fk_city,CITY.name as city_name, USERPROFILE.fk_state,STATE.name as state_name, PDOFFICIERSDETAILS.fk_pd_type_id,PDOFFICIERSDETAILS.fk_team_id,USERPROFILE.fk_entity_type_id,USERPROFILEROLES.user_role,ENTITYTYPE.name as entitytypename,ROLES.role_name,USERPROFILE.mpin,DESIGNATION.designation as designation_name,USERPROFILE.designation'); $this->db->from(USERPROFILE.' as USERPROFILE'); $this->db->join(ENTITY.' as ENTITY','USERPROFILE.fk_entity_id = ENTITY.entity_id and ENTITY.isactive = 1','LEFT'); $this->db->join(STATE.' as STATE','USERPROFILE.fk_state = STATE.state_id and STATE.isactive = 1','LEFT'); @@ -65,6 +65,7 @@ class User_Management_Model extends SPARQ_Model { $this->db->join(ENTITYTYPE.' as ENTITYTYPE','ENTITY.fk_entity_type_id = ENTITYTYPE.entity_type_id and ENTITYTYPE.isactive = 1','LEFT'); $this->db->join(PDOFFICIERSDETAILS.' as PDOFFICIERSDETAILS','PDOFFICIERSDETAILS.fk_user_id = USERPROFILE.userid and PDOFFICIERSDETAILS.isactive = 1','LEFT'); $this->db->join(ROLES.' as ROLES','ROLES.role_id = USERPROFILEROLES.user_role'); + $this->db->join(DESIGNATION.' as DESIGNATION','USERPROFILE.designation = DESIGNATION.designation_id','LEFT'); $this->db->where('USERPROFILE.userid',$userid); diff --git a/api/application/views/report_templates/JSONTOREPORT_CLIX.php b/api/application/views/report_templates/JSONTOREPORT_CLIX.php index 90f762eb..5b88dfeb 100644 --- a/api/application/views/report_templates/JSONTOREPORT_CLIX.php +++ b/api/application/views/report_templates/JSONTOREPORT_CLIX.php @@ -561,7 +561,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); echo "

"; echo "

"; - $header_lender_disclaimer = $lender_disclaimer[0]['type'] == 1 ? $lender_disclaimer[0] : (isset($lender_disclaimer[1]) && $lender_disclaimer[1]['type'] == 1 ? $lender_disclaimer[1] : ''); + $header_lender_disclaimer = MYUTIL::dispatchDisclaimer($lender_disclaimer,1); if(isset($header_lender_disclaimer['disclaimer']) && $header_lender_disclaimer['disclaimer'] != '' && $header_lender_disclaimer['type'] == 1) { echo '

Disclaimer: '. $header_lender_disclaimer['disclaimer'] .'

'; @@ -4673,14 +4673,16 @@ defined('BASEPATH') OR exit('No direct script access allowed');




'. $footer_lender_disclaimer .'

'; - - + echo '





'. $footer_lender_disclaimer['disclaimer'] .'

'; } + else + { + $footer_lender_disclaimer = MYUTIL::dispatchDisclaimer($lender_disclaimer,3); + echo '

'; + } // ########################### End disclaimer end ######################################### ?> diff --git a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php index 871d9d24..5cb01bfb 100644 --- a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php +++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php @@ -512,7 +512,7 @@ if ( isset($pdf) ) {
@@ -565,7 +565,7 @@ if ( isset($pdf) ) { echo "

"; echo "

"; - $header_lender_disclaimer = $lender_disclaimer[0]['type'] == 1 ? $lender_disclaimer[0] : (isset($lender_disclaimer[1]) && $lender_disclaimer[1]['type'] == 1 ? $lender_disclaimer[1] : ''); + $header_lender_disclaimer = MYUTIL::dispatchDisclaimer($lender_disclaimer,1); if(isset($header_lender_disclaimer['disclaimer']) && $header_lender_disclaimer['disclaimer'] != '' && $header_lender_disclaimer['type'] == 1) { echo '

Disclaimer: '. $header_lender_disclaimer['disclaimer'] .'

'; @@ -4656,14 +4656,19 @@ if($total_no_of_business > 0) {




'. $footer_lender_disclaimer .'

'; - - + echo '





'. $footer_lender_disclaimer['disclaimer'] .'

'; } + else + { + $footer_lender_disclaimer = MYUTIL::dispatchDisclaimer($lender_disclaimer,3); + echo '

'; + } + // ########################### End disclaimer end ######################################### ?> diff --git a/api/application/views/report_templates/JSONTOREPORT_RI.php b/api/application/views/report_templates/JSONTOREPORT_RI.php index b677c1fa..12d0155a 100644 --- a/api/application/views/report_templates/JSONTOREPORT_RI.php +++ b/api/application/views/report_templates/JSONTOREPORT_RI.php @@ -543,7 +543,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); echo "

"; echo "

"; - $header_lender_disclaimer = $lender_disclaimer[0]['type'] == 1 ? $lender_disclaimer[0] : (isset($lender_disclaimer[1]) && $lender_disclaimer[1]['type'] == 1 ? $lender_disclaimer[1] : ''); + $header_lender_disclaimer = MYUTIL::dispatchDisclaimer($lender_disclaimer,1); + if(isset($header_lender_disclaimer['disclaimer']) && $header_lender_disclaimer['disclaimer'] != '' && $header_lender_disclaimer['type'] == 1) { echo '

Disclaimer: '. $header_lender_disclaimer['disclaimer'] .'

'; @@ -1857,14 +1858,17 @@ defined('BASEPATH') OR exit('No direct script access allowed');




'. $footer_lender_disclaimer .'

'; - - + echo '





'. $footer_lender_disclaimer['disclaimer'] .'

'; } + else + { + $footer_lender_disclaimer = MYUTIL::dispatchDisclaimer($lender_disclaimer,3); + echo '

'; + } // ########################### End disclaimer end ######################################### ?> diff --git a/api/application/views/report_templates/JSONTOREPORT_SAL.php b/api/application/views/report_templates/JSONTOREPORT_SAL.php index bd17038f..f7d28762 100644 --- a/api/application/views/report_templates/JSONTOREPORT_SAL.php +++ b/api/application/views/report_templates/JSONTOREPORT_SAL.php @@ -542,7 +542,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); echo "

"; echo "

"; - $header_lender_disclaimer = $lender_disclaimer[0]['type'] == 1 ? $lender_disclaimer[0] : (isset($lender_disclaimer[1]) && $lender_disclaimer[1]['type'] == 1 ? $lender_disclaimer[1] : ''); + $header_lender_disclaimer = MYUTIL::dispatchDisclaimer($lender_disclaimer,1); if(isset($header_lender_disclaimer['disclaimer']) && $header_lender_disclaimer['disclaimer'] != '' && $header_lender_disclaimer['type'] == 1) { echo '

Disclaimer: '. $header_lender_disclaimer['disclaimer'] .'

'; @@ -1971,14 +1971,17 @@ defined('BASEPATH') OR exit('No direct script access allowed');




'. $footer_lender_disclaimer .'

'; - - + echo '





'. $footer_lender_disclaimer['disclaimer'] .'

'; } + else + { + $footer_lender_disclaimer = MYUTIL::dispatchDisclaimer($lender_disclaimer,3); + echo '

'; + } // ########################### End disclaimer end ######################################### ?>