From 92f4d94beb5f80753a440a62b64e949814785066 Mon Sep 17 00:00:00 2001 From: "sanjeev.p" Date: Wed, 18 Aug 2021 13:03:34 +0530 Subject: [PATCH] Started date als added : ps --- api/application/models/SMC_Credit_PD_Model.php | 1 + api/application/models/Sales_PD_Model.php | 3 +++ 2 files changed, 4 insertions(+) diff --git a/api/application/models/SMC_Credit_PD_Model.php b/api/application/models/SMC_Credit_PD_Model.php index ebd17084..aef7c1a6 100644 --- a/api/application/models/SMC_Credit_PD_Model.php +++ b/api/application/models/SMC_Credit_PD_Model.php @@ -113,6 +113,7 @@ class SMC_Credit_PD_Model extends SPARQ_Model { $result = array(); if($role == 26){ + # To Find the CM users (Using RCM user's-state-ID ) if(!empty($RCMusers)){ $temp1 = array(); // to filter RCM user's id we using Temp1 array. diff --git a/api/application/models/Sales_PD_Model.php b/api/application/models/Sales_PD_Model.php index e89f9de8..d1ba2f84 100644 --- a/api/application/models/Sales_PD_Model.php +++ b/api/application/models/Sales_PD_Model.php @@ -28,6 +28,7 @@ class Sales_PD_Model extends SPARQ_Model { $this->db->where("DATE_FORMAT(SALES_PD_DATA.completed_date,'%Y-%m-%d') BETWEEN ". "'$pd_from_date'". ' AND '. "'$pd_to_date'" ); }else{ $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'" ); } } else if($pd_from_date != "" && $pd_from_date != null) { @@ -38,6 +39,7 @@ class Sales_PD_Model extends SPARQ_Model { $this->db->where("DATE_FORMAT(SALES_PD_DATA.completed_date,'%Y-%m-%d')",$pd_from_date); }else{ $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); } } else if($pd_to_date != "" && $pd_to_date != null) { @@ -48,6 +50,7 @@ class Sales_PD_Model extends SPARQ_Model { $this->db->where("DATE_FORMAT(SALES_PD_DATA.completed_date,'%Y-%m-%d')",$pd_to_date); }else{ $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); } } if(!empty($pd_products)){