From 22531a5f1e0e5bcf23579b5202a1e45506c48472 Mon Sep 17 00:00:00 2001 From: Velz2020 Date: Thu, 21 Nov 2019 13:07:47 +0530 Subject: [PATCH] CLIX SUBPRODUCT MANDATROY REMOVED MWISE AGE OF ASSETS REPORT --- api/application/models/PD_Model.php | 6 ++++- .../report_templates/JSONTOREPORT_CLIX.php | 23 ++++++++++++++----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index 1b56e14b..373a8ca9 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -900,7 +900,11 @@ class PD_Model extends SPARQ_Model { if($result_array[0]['fk_product_id'] == "" || $result_array[0]['fk_product_id'] == null || $result_array[0]['fk_product_id'] == 0){ $mandatory_fields[] = 'fk_product_id'; } - if($result_array[0]['fk_subproduct_id'] == "" || $result_array[0]['fk_subproduct_id'] == null || $result_array[0]['fk_subproduct_id'] == 0){ $mandatory_fields[] = 'fk_subproduct_id'; } + if(($result_array[0]['lender_short_name'] != 'CLIX') && ($result_array[0]['lender_short_name'] != 'MWISE' && $result_array[0]['subproduct_abbr'] != "BL")) + { + + if($result_array[0]['fk_subproduct_id'] == "" || $result_array[0]['fk_subproduct_id'] == null || $result_array[0]['fk_subproduct_id'] == 0){ $mandatory_fields[] = 'fk_subproduct_id'; } + } if($result_array[0]['fk_pd_type'] == "" || $result_array[0]['fk_pd_type'] == null || $result_array[0]['fk_pd_type'] == 0){ $mandatory_fields[] = 'fk_pd_type'; } diff --git a/api/application/views/report_templates/JSONTOREPORT_CLIX.php b/api/application/views/report_templates/JSONTOREPORT_CLIX.php index db27a774..bd98edd5 100644 --- a/api/application/views/report_templates/JSONTOREPORT_CLIX.php +++ b/api/application/views/report_templates/JSONTOREPORT_CLIX.php @@ -1985,8 +1985,11 @@ defined('BASEPATH') OR exit('No direct script access allowed'); echo $value['fourth_row']; echo $value['fifth_row']; echo $value['sixth_row']; - // echo $value['seventh_row']; - // echo $value['eighth_row']; + if($pd_master_details[0]['lender_short_name'] == 'MWISE') + { + echo $value['seventh_row']; + echo $value['eighth_row']; + } echo ''; echo ''; echo '
'; @@ -3700,8 +3703,13 @@ defined('BASEPATH') OR exit('No direct script access allowed'); Asset Description Asset Owned By Approx Market Value(Rs) - - + + Age of the Assest(Yrs) + Loan Again Assest + @@ -3713,8 +3721,11 @@ defined('BASEPATH') OR exit('No direct script access allowed'); '. $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($paRow['approximate_market_value']) : $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($paRow['approximate_market_value']); ?> - - + + + +