salesPDMisReport api changes 2 : ps
This commit is contained in:
parent
7978ee2dfe
commit
726a42aa0d
@ -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;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user