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

PD ASSESSED CHANGED

Browse Source
This commit is contained in:
velz 2018-11-21 12:04:40 +05:30
parent bf8bf3d5ad
commit 51f4e11b3d
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/application/config/constants.php
View File

@ -87,7 +87,7 @@ defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest auto
// define login route name for token verification
//defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listLessPDDetails/:any)'); // no errors
//defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listAllTemplates/:any)'); // no errors
defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'saveAssessedIncomeMonthwiseItems'); // no errors
defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getAssessedIncome'); // no errors
/*********************AWS resources Constants*************************************************/
defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic');

31
api/application/models/PD_Model.php
View File

@ -810,7 +810,10 @@ class PD_Model extends SPARQ_Model {
$sales_calculated_by_itemwise = $this->getJoinRecords($fields,$table,$joins,$where_condition_array);
//get sales_items_by_monthwise details
//get sales_items_by_monthwise details
$sales_items_by_months = array();
$this->db->SELECT('sim_id,sales_item');
$this->db->FROM(SALESITEMMONTHWISE.' as SALESITEMMONTHWISE');
$this->db->WHERE('SALESITEMMONTHWISE.fk_pd_id',$pdid);
@ -820,13 +823,31 @@ class PD_Model extends SPARQ_Model {
{
foreach($sales_items_by_monthwise as $key => $item)
{
$this->db->SELECT('simc_id,sales_date,sales_value');
$this->db->SELECT('month(sales_date) as month,year(sales_date) as year');
$this->db->FROM(SALESITEMMONTHWISECHILD.' as SALESITEMMONTHWISECHILD');
$this->db->WHERE('SALESITEMMONTHWISECHILD.fk_sim_id',$item['sim_id']);
$this->db->WHERE('SALESITEMMONTHWISECHILD.isactive',1);
//$this->db->GROUP_BY('SALESITEMMONTHWISECHILD.sales_date');
$sales_items_by_monthwise_child = $this->db->GET()->result_array();
$sales_items_by_monthwise[$key]['items'] = $sales_items_by_monthwise_child;
$this->db->GROUP_BY('month(SALESITEMMONTHWISECHILD.sales_date)');
$sales_items_by_month = $this->db->GET()->result_array();
//print_r($this->db->last_query());
if(count($sales_items_by_month))
{
foreach($sales_items_by_month as $month_key => $month)
{
$this->db->SELECT('simc_id,sales_date,sales_value');
$this->db->FROM(SALESITEMMONTHWISECHILD.' as SALESITEMMONTHWISECHILD');
$this->db->WHERE('SALESITEMMONTHWISECHILD.fk_sim_id',$item['sim_id']);
$this->db->WHERE('month(SALESITEMMONTHWISECHILD.sales_date)',$month['month']);
$this->db->WHERE('SALESITEMMONTHWISECHILD.isactive',1);
//$this->db->GROUP_BY('month(SALESITEMMONTHWISECHILD.sales_date)');
$sales_items_by_month_child = $this->db->GET()->result_array();
//print_r($this->db->last_query());die();
$sales_items_by_months[date("M-Y", strtotime($month['year'].'-'.$month['month']))] = $sales_items_by_month_child;
}
}
$sales_items_by_monthwise[$key]['items'] = $sales_items_by_months;
//print_r($sales_items_by_months);
}
}