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

code committed : ps

Browse Source
This commit is contained in:
sanjeev 2021-12-10 20:16:23 +05:30
parent 119ef8b097
commit baf49c22c0
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2887,9 +2887,10 @@ public function assignPDTempalate($data)
$processed_json = GETPROCESSEDJSON::convertFinalRemarksForm($records,$formid); $processed_json = GETPROCESSEDJSON::convertFinalRemarksForm($records,$formid);
break; break;
// case 21: // Buiness Banking Form
// $processed_json = GETPROCESSEDJSON::convertBankingInfoDetailsForm($records,$formid); case 21:
// break; $processed_json = GETPROCESSEDJSON::convertBankingInfoDetailsForm($records,$formid);
break;
case 22: case 22:
$processed_json = GETPROCESSEDJSON::convertBusinessAssetsForm($records,$formid); $processed_json = GETPROCESSEDJSON::convertBusinessAssetsForm($records,$formid);
@ -6700,7 +6701,7 @@ public function getCompaniesListsFromGeneralFormRawJSON_post()
$form_array[] = array('form_id' => 22,'form_name' => 'Business Assets'); $form_array[] = array('form_id' => 22,'form_name' => 'Business Assets');
//$form_array[] = array('form_id' => 21,'form_name' => 'Business Banking'); Removed ( step 2 )
$form_array[] = array('form_id' => 14,'form_name' => 'Financial Information'); $form_array[] = array('form_id' => 14,'form_name' => 'Financial Information');
$form_array[] = array('form_id' => 1,'form_name' => 'Supplier Details'); $form_array[] = array('form_id' => 1,'form_name' => 'Supplier Details');
$form_array[] = array('form_id' => 2,'form_name' => 'Client Details'); $form_array[] = array('form_id' => 2,'form_name' => 'Client Details');
@ -6716,6 +6717,7 @@ public function getCompaniesListsFromGeneralFormRawJSON_post()
$form_array[] = array('form_id' => 13,'form_name' => 'About Business'); $form_array[] = array('form_id' => 13,'form_name' => 'About Business');
$form_array[] = array('form_id' => 22,'form_name' => 'Business Assets'); $form_array[] = array('form_id' => 22,'form_name' => 'Business Assets');
//$form_array[] = array('form_id' => 21,'form_name' => 'Business Banking');Removed ( step 2 )
$form_array[] = array('form_id' => 14,'form_name' => 'Financial Information'); $form_array[] = array('form_id' => 14,'form_name' => 'Financial Information');
$form_array[] = array('form_id' => 1,'form_name' => 'Supplier Details'); $form_array[] = array('form_id' => 1,'form_name' => 'Supplier Details');
$form_array[] = array('form_id' => 2,'form_name' => 'Client Details'); $form_array[] = array('form_id' => 2,'form_name' => 'Client Details');

2
api/application/helpers/getprocessedjson_helper.php
View File

@ -377,7 +377,7 @@ class GETPROCESSEDJSON
} }
} }
} }
} }
}// buiness banking..... }// buiness banking.....
} }

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

@ -2299,7 +2299,7 @@ class PD_Model extends SPARQ_Model {
//Get SMC CityWise Agency //Get SMC CityWise Agency
function getCityWiseSMCAgency($city){ function getCityWiseSMCAgency($city){
$this->db->select('AGENCYLIST.agency_id as entity_id, AGENCYLIST.agency_name as full_name, AGENCYLIST.agency_abbr as short_name,AGENCYLIST.fk_city_id,AGENCYLIST.mail_id'); $this->db->select('AGENCYLIST.agency_id as entity_id, AGENCYLIST.agency_name as full_name as name,AGENCYLIST.agency_name as full_name, AGENCYLIST.agency_abbr as short_name,AGENCYLIST.fk_city_id,AGENCYLIST.mail_id');
$this->db->from(AGENCYLIST.' as AGENCYLIST'); $this->db->from(AGENCYLIST.' as AGENCYLIST');
$this->db->where('AGENCYLIST.isactive',1); $this->db->where('AGENCYLIST.isactive',1);
if($city!=""){ if($city!=""){
@ -2315,7 +2315,7 @@ class PD_Model extends SPARQ_Model {
// $role = array(28,29); // $role = array(28,29);
$role = array(29); $role = array(29);
// } // }
$this->db->select('USERPROFILE.userid,USERPROFILE.first_name,USERPROFILE.last_name,USERPROFILEROLES.user_role'); $this->db->select('USERPROFILE.userid,USERPROFILE.first_name,USERPROFILE.last_name,USERPROFILE.first_name as name,USERPROFILEROLES.user_role');
$this->db->from(USERPROFILE.' as USERPROFILE'); $this->db->from(USERPROFILE.' as USERPROFILE');
$this->db->join(USERPROFILEROLES.' as USERPROFILEROLES','USERPROFILEROLES.fk_userid = USERPROFILE.userid and USERPROFILEROLES.isactive = 1','LEFT'); $this->db->join(USERPROFILEROLES.' as USERPROFILEROLES','USERPROFILEROLES.fk_userid = USERPROFILE.userid and USERPROFILEROLES.isactive = 1','LEFT');
$this->db->join(ROLES.' as ROLES','ROLES.role_id = USERPROFILEROLES.user_role and ROLES.isactive = 1','LEFT'); $this->db->join(ROLES.' as ROLES','ROLES.role_id = USERPROFILEROLES.user_role and ROLES.isactive = 1','LEFT');
@ -2324,7 +2324,7 @@ class PD_Model extends SPARQ_Model {
$this->db->where_in('USERPROFILEROLES.user_role',$role); $this->db->where_in('USERPROFILEROLES.user_role',$role);
// if(!empty($entity)){ $this->db->where('USERPROFILE.fk_entity_id',$entity); } // if(!empty($entity)){ $this->db->where('USERPROFILE.fk_entity_id',$entity); }
$result = $this->db->get()->result_array(); $result = $this->db->get()->result_array();
// print_r($this->db->last_query());die(); print_r($this->db->last_query());die();
return $result; return $result;
} }