From 726a42aa0d6074f3a6bbeaef7d186bbfb792ad9d Mon Sep 17 00:00:00 2001
From: Sanjeev <sanjeev.p@venbainfotech.com>
Date: Fri, 9 Jul 2021 17:10:15 +0530
Subject: [PATCH] salesPDMisReport  api changes 2 :  ps

---
 api/application/controllers/Sales_PD_Controller.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php
index e5ccdbfd..6a5af7d5 100644
--- a/api/application/controllers/Sales_PD_Controller.php
+++ b/api/application/controllers/Sales_PD_Controller.php
@@ -955,18 +955,18 @@ class Sales_PD_Controller extends REST_Controller {
 			}
 			if($from_date)
 			{
-				
 				$where_condition_array['date(SALES_PD_DATA.createdon) >='] = $from_date;
+				$or_where_condition_array['date(SALES_PD_DATA.completed_date) >='] = $from_date;
 			}
 			if($to_date)
-			{
-				
+			{	
 				$where_condition_array['date(SALES_PD_DATA.createdon) <='] = $to_date;
+				$or_where_condition_array['date(SALES_PD_DATA.completed_date) <='] = $to_date;
 			}
 		
 			$order_by = 'SALES_PD_DATA.sales_pd_id';
-			$sales_pd_data = $this->Sales_PD_Model->getJoinRecords($columns,$table,$joins,$where_condition_array,$order_by,'DESC');
-			//print_r($this->db->last_query());
+			$sales_pd_data = $this->Sales_PD_Model->getJoinRecords($columns,$table,$joins,$where_condition_array,$order_by,'DESC',"",$or_where_condition_array);
+			// print_r($this->db->last_query());echo count($sales_pd_data);die();
 			if(count($sales_pd_data))
 			{
 					$data['dataStatus'] = true;