Sineedge/sparqapi
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Started date als added : ps

Browse Source
This commit is contained in:
sanjeev.p 2021-08-18 13:03:34 +05:30
parent b388d5b191
commit 92f4d94beb
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/application/models/SMC_Credit_PD_Model.php
View File

@ -113,6 +113,7 @@ class SMC_Credit_PD_Model extends SPARQ_Model {
$result = array(); $result = array();
if($role == 26){ if($role == 26){
# To Find the CM users (Using RCM user's-state-ID )
if(!empty($RCMusers)){ if(!empty($RCMusers)){
$temp1 = array(); // to filter RCM user's id we using Temp1 array. $temp1 = array(); // to filter RCM user's id we using Temp1 array.

3
api/application/models/Sales_PD_Model.php
View File

@ -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'" ); $this->db->where("DATE_FORMAT(SALES_PD_DATA.completed_date,'%Y-%m-%d') BETWEEN ". "'$pd_from_date'". ' AND '. "'$pd_to_date'" );
}else{ }else{
$this->db->where("DATE_FORMAT(SALES_PD_DATA.completed_date,'%Y-%m-%d') BETWEEN ". "'$pd_from_date'". ' AND '. "'$pd_to_date'" ); $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) { 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); $this->db->where("DATE_FORMAT(SALES_PD_DATA.completed_date,'%Y-%m-%d')",$pd_from_date);
}else{ }else{
$this->db->where("DATE_FORMAT(SALES_PD_DATA.completed_date,'%Y-%m-%d')",$pd_from_date); $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) { 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); $this->db->where("DATE_FORMAT(SALES_PD_DATA.completed_date,'%Y-%m-%d')",$pd_to_date);
}else{ }else{
$this->db->where("DATE_FORMAT(SALES_PD_DATA.completed_date,'%Y-%m-%d')",$pd_to_date); $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)){ if(!empty($pd_products)){