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

LENDER ASC ORDER

Browse Source
This commit is contained in:
Velz2020 2021-02-26 14:33:19 +05:30
parent 5c929baf86
commit dac7783b3e
2 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,7 +94,7 @@ class PD_Controller extends REST_Controller {
{ {
$fields = array('entity_id','full_name','short_name'); $fields = array('entity_id','full_name','short_name');
$where_condition_array = array('isactive' => 1,'fk_entity_type_id' => 2); $where_condition_array = array('isactive' => 1,'fk_entity_type_id' => 2);
$result_data = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,ENTITY); $result_data = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,ENTITY,array(),'','full_name');
if(count($result_data)) if(count($result_data))
{ {

7
api/application/helpers/readexceldata_helper.php
View File

@ -3,7 +3,7 @@
class readexceldata class readexceldata
{ {
private static $current_section_id = null; private static $current_section_id = null;
private static $current_excel_file_id = 9999; private static $current_excel_file_id = null;
public static function getExcelSectionData($file_path_withname,$section_id = null,$pd_id = null,$excel_file_id = null) public static function getExcelSectionData($file_path_withname,$section_id = null,$pd_id = null,$excel_file_id = null)
{ {
$CI =&get_instance(); $CI =&get_instance();
@ -101,6 +101,8 @@ class readexceldata
{ {
$return_data = SELF::getTriggerData($sheetData,$section_ref_data); $return_data = SELF::getTriggerData($sheetData,$section_ref_data);
//store address details in temp table SMC_TEMP_ADDRESS //store address details in temp table SMC_TEMP_ADDRESS
if(SELF::$current_excel_file_id)
{
if(array_key_exists('address_details', $return_data)) if(array_key_exists('address_details', $return_data))
{ {
foreach ($return_data['address_details'] as $key => $address) foreach ($return_data['address_details'] as $key => $address)
@ -130,6 +132,7 @@ class readexceldata
} }
} }
} }
}
return ($return_data); return ($return_data);
@ -276,7 +279,7 @@ class readexceldata
$return_data = array(); $return_data = array();
foreach ($arr as $key => $value) foreach ($arr as $key => $value)
{ {
if(is_string($value) || is_numeric($value)) if((is_string($value) && $value != '') || is_numeric($value))// && $value != '')
// if($value) // if($value)
{ {
$return_data[$key] = $value; $return_data[$key] = $value;