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

AI DEFAULT NULL ADDED

Browse Source
This commit is contained in:
velz 2019-03-06 16:02:24 +05:30
parent 21d3f96466
commit d2642ac0ee
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/application/controllers/PD_Controller.php
View File

@ -1360,7 +1360,7 @@ class PD_Controller extends REST_Controller {
$list_of_pd_officers[$key]['mobile_no'] = $names[0]['mobile_no'];
$list_of_pd_officers[$key]['count'] = 0;
$this->db->SELECT('pd_id,pd_status,fk_pd_type,DATE_FORMAT(PDTRIGGER.scheduled_on,"%d/%m/%Y %H:%i:%s %p") as scheduled_on,PDAPPLICANTSDETAILS.applicant_name,PDTYPE.type_name as pd_type_name,PDTRIGGER.addressline1,PDTRIGGER.addressline2,PDTRIGGER.addressline3,PDTRIGGER.fk_city,CITY.name as city_name,PDTRIGGER.fk_state,STATE.name as state_name,PDTRIGGER.pincode');
$this->db->SELECT('pd_id,pd_status,fk_pd_type,DATE_FORMAT(PDTRIGGER.scheduled_on,"%d/%m/%Y %H:%i:%s %p") as scheduled_on,PDAPPLICANTSDETAILS.applicant_name,PDTYPE.type_name as pd_type_name,PDTRIGGER.addressline1,PDTRIGGER.addressline2,PDTRIGGER.addressline3,PDTRIGGER.fk_city,CITY.name as city_name,PDTRIGGER.fk_state,STATE.name as state_name,PDTRIGGER.pincode,PDTRIGGER.lender_applicant_id,ENTITY.short_name');
$this->db->FROM(PDTRIGGER.' as PDTRIGGER');
$this->db->JOIN(PDAPPLICANTSDETAILS.' as PDAPPLICANTSDETAILS','PDTRIGGER.pd_id = PDAPPLICANTSDETAILS.fk_pd_id AND PDAPPLICANTSDETAILS.applicant_type = 1');
$this->db->JOIN(PDTYPE.' as PDTYPE','PDTRIGGER.fk_pd_type = PDTYPE.pd_type_id AND PDTYPE.isactive = 1');
@ -1370,6 +1370,7 @@ class PD_Controller extends REST_Controller {
$this->db->OR_WHERE('PDTRIGGER.pd_status',SCHEDULED);
$this->db->OR_WHERE('PDTRIGGER.pd_status',INPROGRESS);
$this->db->OR_WHERE('PDTRIGGER.pd_status',ALLOCATED);
$this->db->JOIN(ENTITY.' as ENTITY','PDTRIGGER.fk_lender_id = ENTITY.entity_id','LEFT');
$this->db->GROUP_END();
if($pdofficer['fk_pd_type_id'] == 1)
{
@ -3212,6 +3213,9 @@ class PD_Controller extends REST_Controller {
$overall_summary_report = array();
$overall_summary_report['sales_calculated_by_itemwise'] = null;
$overall_summary_report['sales_calculated_by_monthwise'] = null;
$overall_summary_report['sales_declared_by_customer'] = null;
$sales_declared_by_customer = array();
$sales_declared_by_customer_flag = 0;