From 465f5ee1bf1f63aa29c00fa87dc28f75ffbd90c8 Mon Sep 17 00:00:00 2001 From: velz Date: Sat, 1 Dec 2018 18:48:23 +0530 Subject: [PATCH] ASSESSED INCOME CHNAGED2 --- api/application/config/constants.php | 2 +- api/application/models/PD_Model.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/application/config/constants.php b/api/application/config/constants.php index c010d051..0f12996c 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -377,7 +377,7 @@ defined('SOURCEOFBALANCETRANSFER') OR define('SOURCEOFBALANCETRANSFER','m_source defined('STATUSOFCONSTRUCTION') OR define('STATUSOFCONSTRUCTION','m_status_of_construction'); -// Assessed Income related Tables Not added in test DB +// Assessed Income related Tables defined('SALESDECLAREDBYCUSTOMER') OR define('SALESDECLAREDBYCUSTOMER','t_pd_sales_declared_by_customer'); defined('SALESDECLAREDBYCUSTOMERID') OR define('SALESDECLAREDBYCUSTOMERID','sdc_id'); diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index 5ff839ba..b62f89b0 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -912,7 +912,7 @@ class PD_Model extends SPARQ_Model { $assessed_income = array(); //get sales_declared_by_customer details - $fields = array('sdc_id','sales_declared_by_customer'); + $fields = array('sdc_id','sales_declared_by_customer','margin_per','margin_value'); $where_condition_array = array('fk_pd_id'=>$pdid,'isactive'=>1); $sales_declared_by_customer = $this->selectCustomRecords($fields,$where_condition_array,SALESDECLAREDBYCUSTOMER); //get Gross Profit calculatio Mode details