From dc722781be8a0462a9c0b076784113975b58ab73 Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Mon, 10 Apr 2023 14:12:43 +0530
Subject: [PATCH] group started in sales adv filter : ps

---
 api/application/models/Sales_PD_Model.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/api/application/models/Sales_PD_Model.php b/api/application/models/Sales_PD_Model.php
index 3721ec70..381d65b3 100644
--- a/api/application/models/Sales_PD_Model.php
+++ b/api/application/models/Sales_PD_Model.php
@@ -33,35 +33,41 @@ class Sales_PD_Model extends SPARQ_Model {
             }
             if(($pd_from_date != "" || $pd_from_date != null) && ($pd_to_date != "" || $pd_to_date != null)) {
                 // $this->db->where('SALES_PD_DATA.createdon  BETWEEN '. "'$pd_from_date'". ' AND '. "'$pd_to_date'" );
-                if($pd_status[0] == "STARTED" ){
+                if(!empty($pd_status) && $pd_status[0] == "STARTED" ){
                     $this->db->where("DATE_FORMAT(SALES_PD_DATA.createdon,'%Y-%m-%d')  BETWEEN ". "'$pd_from_date'". ' AND '. "'$pd_to_date'" );
-                }else if($pd_status[0] == "COMPLETED" ){
+                }else if(!empty($pd_status) && $pd_status[0] == "COMPLETED" ){
                     $this->db->where("DATE_FORMAT(SALES_PD_DATA.completed_date,'%Y-%m-%d')  BETWEEN ". "'$pd_from_date'". ' AND '. "'$pd_to_date'" );
                 }else{
+                    $this->db->group_start();
                     $this->db->where("DATE_FORMAT(SALES_PD_DATA.completed_date,'%Y-%m-%d')  BETWEEN ". "'$pd_from_date'". ' AND '. "'$pd_to_date'" );
                     $this->db->or_where("DATE_FORMAT(SALES_PD_DATA.createdon,'%Y-%m-%d')  BETWEEN ". "'$pd_from_date'". ' AND '. "'$pd_to_date'" );
+                    $this->db->group_end();
                 }
             }
             else if($pd_from_date != "" && $pd_from_date != null) {
                 // $this->db->where("DATE_FORMAT(SALES_PD_DATA.createdon,'%Y-%m-%d')",$pd_from_date);
-                if($pd_status[0] == "STARTED" ){
+                if(!empty($pd_status) && $pd_status[0] == "STARTED" ){
                     $this->db->where("DATE_FORMAT(SALES_PD_DATA.createdon,'%Y-%m-%d')",$pd_from_date);
-                }else if($pd_status[0] == "COMPLETED" ){
+                }else if(!empty($pd_status) && $pd_status[0] == "COMPLETED" ){
                     $this->db->where("DATE_FORMAT(SALES_PD_DATA.completed_date,'%Y-%m-%d')",$pd_from_date);
                 }else{
+                    $this->db->group_start();
                     $this->db->where("DATE_FORMAT(SALES_PD_DATA.completed_date,'%Y-%m-%d')",$pd_from_date);
                     $this->db->or_where("DATE_FORMAT(SALES_PD_DATA.createdon,'%Y-%m-%d')",$pd_from_date);
+                    $this->db->group_end();
                 }
             }
             else if($pd_to_date != "" && $pd_to_date != null) {
                 // $this->db->where("DATE_FORMAT(SALES_PD_DATA.createdon,'%Y-%m-%d')",$pd_to_date);
-                if($pd_status[0] == "STARTED" ){
+                if(!empty($pd_status) && $pd_status[0] == "STARTED" ){
                     $this->db->where("DATE_FORMAT(SALES_PD_DATA.createdon,'%Y-%m-%d')",$pd_to_date);
-                }else if($pd_status[0] == "COMPLETED" ){
+                }else if(!empty($pd_status) && $pd_status[0] == "COMPLETED" ){
                     $this->db->where("DATE_FORMAT(SALES_PD_DATA.completed_date,'%Y-%m-%d')",$pd_to_date);
                 }else{
+                    $this->db->group_start();
                     $this->db->where("DATE_FORMAT(SALES_PD_DATA.completed_date,'%Y-%m-%d')",$pd_to_date);
                     $this->db->or_where("DATE_FORMAT(SALES_PD_DATA.createdon,'%Y-%m-%d')",$pd_to_date);
+                    $this->db->group_end();
                 }
             }
             if(!empty($pd_products)){