diff --git a/app/Models/EnquiryModel.php b/app/Models/EnquiryModel.php index 335a30e..6760825 100644 --- a/app/Models/EnquiryModel.php +++ b/app/Models/EnquiryModel.php @@ -110,8 +110,22 @@ class EnquiryModel extends Model } }else{ if($from_date != null){ - $data->where("partner_enquiry.created_on >=", $from_date) - ->where("partner_enquiry.created_on <=", $to_date); + // $data->where("partner_enquiry.created_on >=", $from_date) + // ->where("partner_enquiry.created_on <=", $to_date); + + $data->groupStart() + // Date filter + ->groupStart() + ->where("partner_enquiry.created_on >=", $from_date) + ->where("partner_enquiry.created_on <=", $to_date) + ->groupEnd() + + // OR pending cases (ignore date) + ->orGroupStart() + ->where("partner_enquiry.enquiry_status !=", "Completed") + ->groupEnd() + + ->groupEnd(); } }