From fbe6933aa530bfb315109e9cd833fe91996ddfc5 Mon Sep 17 00:00:00 2001
From: Velz2020 <velmurugan.s@venbainfotech.com>
Date: Tue, 10 Mar 2020 11:59:20 +0530
Subject: [PATCH] 10 TO 60DAYS FILTER CHANGED

---
 api/application/controllers/Sales_PD_Controller.php | 5 +++--
 api/application/models/PD_Model.php                 | 2 +-
 api/application/models/Sales_PD_Model.php           | 6 +++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php
index 292dd1b8..4253e4e9 100644
--- a/api/application/controllers/Sales_PD_Controller.php
+++ b/api/application/controllers/Sales_PD_Controller.php
@@ -281,7 +281,7 @@ class Sales_PD_Controller extends REST_Controller {
 			}
 			// FILTERING THE LAST 10 DAYS RECORDS
 
-					$key_date='SALES_PD_DATA.createdon BETWEEN DATE_SUB(NOW(), INTERVAL 10 DAY) AND NOW()';
+					$key_date='SALES_PD_DATA.createdon BETWEEN DATE_SUB(NOW(), INTERVAL 60 DAY) AND NOW()';
 			$condition_value=null;
 			$where_condition_array[$key_date] = $condition_value;
 		// print_r ($where_condition_array);
@@ -922,7 +922,8 @@ public function filterSalesPDList_post() {
 	$pd_lender = $records['pd_lender'];
 	$pd_applicant_name = strtolower($records['pd_applicant_name']);
 	$pd_officer_name = isset($records['pd_officer']) ? $records['pd_officer'] : null ;
-	$result_data=$this->Sales_PD_Model->getSalesPDListwithFilters($pd_status,$pd_from_date,$pd_to_date,$pd_products,$pd_lender,$pd_applicant_name,$pd_officer_name);
+	$sales_pd_officer_id = isset($records['sales_pd_officer_id']) ? $records['sales_pd_officer_id'] : null ;
+	$result_data=$this->Sales_PD_Model->getSalesPDListwithFilters($pd_status,$pd_from_date,$pd_to_date,$pd_products,$pd_lender,$pd_applicant_name,$pd_officer_name,$sales_pd_officer_id);
 	// print_r ($result_data);
 	if(count($result_data)){
 				$data['dataStatus'] = true;
diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php
index 88b7b367..3b87123b 100644
--- a/api/application/models/PD_Model.php
+++ b/api/application/models/PD_Model.php
@@ -123,7 +123,7 @@ class PD_Model extends SPARQ_Model {
 			}
 
 				// FILTERING THE LAST 10 DAYS RECORDS
-				$filter_rec='PDTRIGGER.pd_date_of_initiation BETWEEN DATE_SUB(NOW(), INTERVAL 10 DAY) AND NOW()';
+				$filter_rec='PDTRIGGER.pd_date_of_initiation BETWEEN DATE_SUB(NOW(), INTERVAL 60 DAY) AND NOW()';
 				$this->db->WHERE($filter_rec);
 				// ----END OF FILTERING THE LAST 10 DAYS RECORDS---
 
diff --git a/api/application/models/Sales_PD_Model.php b/api/application/models/Sales_PD_Model.php
index 400abe50..e8e3cb30 100644
--- a/api/application/models/Sales_PD_Model.php
+++ b/api/application/models/Sales_PD_Model.php
@@ -8,7 +8,7 @@ class Sales_PD_Model extends SPARQ_Model {
 		public function __construct() {
             parent::__construct();
         }
-		public function getSalesPDListwithFilters($pd_status = '',$pd_from_date = '',$pd_to_date = '',$pd_products = '',$pd_lender = '',$pd_applicant_name = '',$pd_officer_name = '') {
+		public function getSalesPDListwithFilters($pd_status = '',$pd_from_date = '',$pd_to_date = '',$pd_products = '',$pd_lender = '',$pd_applicant_name = '',$pd_officer_name = '',$sales_pd_officer_id) {
             // SALES_PD_DATA.sales_pd_sno, SALES_PD_DATA.sales_pd_id,  SALES_PD_DATA.applicant_name,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as officer_name,SALES_PD_DATA.applicant_id,SALES_PD_DATA.lender_id,SALES_PD_DATA.product_id,SALES_PD_DATA.is_pdf,SALES_PD_DATA.is_edited,ENTITY.short_name,PRODUCTS.abbr,DATE_FORMAT(SALES_PD_DATA.createdon, "%d/%m/%Y") as pd_createdon,SALES_PD_DATA.status
             $this->db->SELECT(' SALES_PD_DATA.sales_pd_sno, SALES_PD_DATA.sales_pd_id,  SALES_PD_DATA.applicant_name,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as officer_name,SALES_PD_DATA.applicant_id,SALES_PD_DATA.lender_id,SALES_PD_DATA.product_id,SALES_PD_DATA.is_pdf,SALES_PD_DATA.is_edited,ENTITY.short_name,PRODUCTS.abbr,SALES_PD_DATA.createdon,
             DATE_FORMAT(SALES_PD_DATA.createdon, "%Y-%m-%d") as pd_createdon, SALES_PD_DATA.status');
@@ -40,6 +40,10 @@ class Sales_PD_Model extends SPARQ_Model {
             if(!empty($pd_officer_name)) {
                 $this->db->like('SALES_PD_DATA.officer_name',$pd_officer_name);
             }
+
+             if(!empty($sales_pd_officer_id)) {
+                $this->db->WHERE('SALES_PD_DATA.createdby',$sales_pd_officer_id);
+            }
             $this->db->order_by('SALES_PD_DATA.sales_pd_id','desc');
             $this->db->limit(1000,0);
             $result = $this->db->get()->result_array();