diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php index 492a4315..b1c28459 100644 --- a/api/application/controllers/Sales_PD_Controller.php +++ b/api/application/controllers/Sales_PD_Controller.php @@ -157,7 +157,7 @@ class Sales_PD_Controller extends REST_Controller { function prepareSalesPDReport($sales_pd_id,$api = true) { log_message('ERROR','####PREPARE SALESPD REPORT CALLED'.$sales_pd_id); - $columns = array('SALES_PD_DATA.*','ENTITY.short_name','PRODUCT.abbr'); + $columns = array('SALES_PD_DATA.*','ENTITY.short_name','PRODUCT.abbr','USERPROFILE.smc_emp_code'); $table = SALES_PD_DATA.' as SALES_PD_DATA'; $joins = array( array('table' => ENTITY. ' as ENTITY', @@ -165,14 +165,16 @@ class Sales_PD_Controller extends REST_Controller { 'jointype' => 'INNER'), array('table' => PRODUCTS. ' as PRODUCT', 'condition' =>'SALES_PD_DATA.product_id = PRODUCT.product_id', - 'jointype' => 'INNER') + 'jointype' => 'INNER'), + array('table' => USERPROFILE. ' as USERPROFILE', + 'condition' =>'SALES_PD_DATA.createdby = USERPROFILE.userid', + 'jointype' => 'LEFT') ); $where_condition_array = array('SALES_PD_DATA.sales_pd_id' => $sales_pd_id); $sales_pd_data = $this->Sales_PD_Model->getJoinRecords($columns,$table,$joins,$where_condition_array); $pd_type = ""; if($sales_pd_data[0]['sales_pd_type'] == 1){$pd_type = "Physical PD-"; }else if($sales_pd_data[0]['sales_pd_type'] == 2){$pd_type = "Tele PD-";} - // print_r($sales_pd_data);die(); if($sales_pd_data) { diff --git a/api/application/views/sale_pd_templates/MEQ.php b/api/application/views/sale_pd_templates/MEQ.php index 4cb36fc4..6949a0ca 100644 --- a/api/application/views/sale_pd_templates/MEQ.php +++ b/api/application/views/sale_pd_templates/MEQ.php @@ -8,6 +8,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $rupee_symbol = ""; $title = ""; if($master[0]['sales_pd_type'] == 1){$title = "Physical "; }else if($master[0]['sales_pd_type'] == 2){$title = "Tele ";} + $smc_emp_code = $master[0]['smc_emp_code']; //print_r($master[0]['abbr']);die(); ?> @@ -619,7 +620,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); Employee ID - + diff --git a/api/application/views/sale_pd_templates/MWISE.php b/api/application/views/sale_pd_templates/MWISE.php index 390fd6fd..57aff3ad 100644 --- a/api/application/views/sale_pd_templates/MWISE.php +++ b/api/application/views/sale_pd_templates/MWISE.php @@ -8,6 +8,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $rupee_symbol = ""; $title = ""; if($master[0]['sales_pd_type'] == 1){$title = "Physical "; }else if($master[0]['sales_pd_type'] == 2){$title = "Tele ";} + $smc_emp_code = $master[0]['smc_emp_code']; //print_r($master[0]['abbr']);die(); ?> @@ -599,7 +600,7 @@ if(isset($section6)) Employee ID - + Date of PD Visit diff --git a/api/application/views/smc_creditpd_reports/MWISE.php b/api/application/views/smc_creditpd_reports/MWISE.php index c836aa45..46a070a6 100644 --- a/api/application/views/smc_creditpd_reports/MWISE.php +++ b/api/application/views/smc_creditpd_reports/MWISE.php @@ -1539,10 +1539,10 @@ if(count($smc_images)) Designation of Sales Team Member --> - + Date of PD Visit diff --git a/api/application/views/smc_creditpd_reports/NBFC.php b/api/application/views/smc_creditpd_reports/NBFC.php index 33b16671..99cacdbb 100644 --- a/api/application/views/smc_creditpd_reports/NBFC.php +++ b/api/application/views/smc_creditpd_reports/NBFC.php @@ -583,10 +583,10 @@ if(count($smc_images)) Designation of Sales Team Member --> - + Date of PD Visit