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

GET COMPANY DETAILS UNEXP DIE REMOVED

Browse Source
This commit is contained in:
Velz2020 2020-02-21 13:11:19 +05:30
parent fb993ecde7
commit a14f994a2c
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4695,7 +4695,7 @@ public function getPDFormDetailsJSON_post()
// }
// else
// {
$data['lender_disclaimer'] = $this->PD_Model->selectRecords(ENTITYDISCLAIMER,array('fk_entity_id' => $data['pd_master_details'][0]['fk_lender_id']));
$data['lender_disclaimer'] = $this->PD_Model->selectRecords(ENTITYDISCLAIMER,array('fk_entity_id' => ($data['pd_master_details'][0]['sub_entity_id'] ? $data['pd_master_details'][0]['sub_entity_id'] : $data['pd_master_details'][0]['fk_lender_id'])));
//}
//$data['lender_disclaimer'] = $this->PD_Model->selectRecords(ENTITYDISCLAIMER,array('fk_entity_id' => $data['pd_master_details'][0]['fk_lender_id']));
@ -5993,7 +5993,7 @@ public function getPDFormDetailsJSON_post()
// else
// {
//echo 'NOR';
$data['lender_disclaimer'] = $this->PD_Model->selectRecords(ENTITYDISCLAIMER,array('fk_entity_id' => $data['pd_master_details'][0]['fk_lender_id']));
$data['lender_disclaimer'] = $this->PD_Model->selectRecords(ENTITYDISCLAIMER,array('fk_entity_id' => ($data['pd_master_details'][0]['sub_entity_id'] ? $data['pd_master_details'][0]['sub_entity_id'] : $data['pd_master_details'][0]['fk_lender_id'])));
//}
//print_r($data['lender_disclaimer']);die();
//$GLOBALS['footer_lender_disclaimer'] = $data['lender_disclaimer'][0]['type'] == 2 ? $data['lender_disclaimer'][0]['disclaimer'] : (isset($data['lender_disclaimer'][1]) && $$data['lender_disclaimer'][1]['type'] == 2 ? $$data['lender_disclaimer'][1]['disclaimer'] : '');
@ -6376,7 +6376,7 @@ public function getCompaniesListsFromGeneralFormRawJSON_post()
$this->db->WHERE('PDFORMDETAILSJSON.company_id',$company['company_order_id']);
$this->db->WHERE('PDFORMDETAILSJSON.isactive',1);
$template_forms_count = $this->db->GET()->result_array();
print_r($this->db->last_query());die();
//print_r($this->db->last_query());die();
}
else

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

@ -1895,8 +1895,8 @@ class PD_Model extends SPARQ_Model {
{
// check CLIX group - this script for is lender is whether clix or clix housing, then have to bring both lender contact persons, otherwise pull contact persons belongs to single entity
$is_lenderid_clix_group = ENVIRONMENT == 'production' && ($lender_id == 5 || $lender_id == 9) ? true : (($lender_id == 16 || $lender_id == 38) ? true : false);
$clix = ENVIRONMENT == 'production' ? 5 : 16;$clixhousing = ENVIRONMENT == 'production' ? 9 : 38;
// $is_lenderid_clix_group = ENVIRONMENT == 'production' && ($lender_id == 5 || $lender_id == 9) ? true : (($lender_id == 16 || $lender_id == 38) ? true : false);
// $clix = ENVIRONMENT == 'production' ? 5 : 16;$clixhousing = ENVIRONMENT == 'production' ? 9 : 38;
// check CLIX group
$this->db->select('USERPROFILE.userid, concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as user_name,USERPROFILE.fk_entity_id,USERPROFILE.fk_city,USERPROFILEROLES.user_role,USERPROFILE.fk_entity_type_id,ROLES.role_name,if( POSITION("credit" IN ROLES.role_name),"CREDIT","SALES") as role_type');
@ -1908,15 +1908,15 @@ class PD_Model extends SPARQ_Model {
$this->db->join(USERPROFILEROLES. ' as USERPROFILEROLES','USERPROFILEROLES.fk_userid = USERPROFILE.userid and USERPROFILEROLES.isactive =1');
$this->db->join(ROLES.' as ROLES','ROLES.role_id = USERPROFILEROLES.user_role');
//$this->db->where('USERPROFILE.fk_city',$pd_branch_id);
if(!$is_lenderid_clix_group)
{
// if(!$is_lenderid_clix_group)
// {
$this->db->where('USERPROFILE.fk_entity_id',$lender_id);
}
else
{
$this->db->where('USERPROFILE.fk_entity_id',$clix);
$this->db->or_where('USERPROFILE.fk_entity_id',$clixhousing);
}
// }
// else
// {
// $this->db->where('USERPROFILE.fk_entity_id',$clix);
// $this->db->or_where('USERPROFILE.fk_entity_id',$clixhousing);
// }
if($pd_branch_id)
{