From aa398724f0d3c77e365799d115a07498f3c6a668 Mon Sep 17 00:00:00 2001 From: "sanjeev.p" Date: Tue, 7 Sep 2021 16:01:37 +0530 Subject: [PATCH] Mis Credit PD Date (try1) : ps --- .../controllers/SMC_Credit_PD_Controller.php | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/api/application/controllers/SMC_Credit_PD_Controller.php b/api/application/controllers/SMC_Credit_PD_Controller.php index b793e262..d5399be9 100644 --- a/api/application/controllers/SMC_Credit_PD_Controller.php +++ b/api/application/controllers/SMC_Credit_PD_Controller.php @@ -1063,12 +1063,12 @@ class SMC_Credit_PD_Controller extends REST_Controller { if($from_date) { - $this->db->WHERE('date(PDTRIGGER.createdon) >=',$from_date); + $this->db->WHERE('date(PDTRIGGER.updatedon) >=',$from_date); } if($to_date) { - $this->db->WHERE('date(PDTRIGGER.createdon) <=',$to_date); + $this->db->WHERE('date(PDTRIGGER.updatedon) <=',$to_date); } if($officer_name) @@ -1080,7 +1080,6 @@ class SMC_Credit_PD_Controller extends REST_Controller { $this->db->ORDER_BY('PDTRIGGER.pd_id DESC'); $SMC_CREDIT_PD = $this->db->GET()->result_array(); - //print_r($this->db->last_query());die(); if(count($SMC_CREDIT_PD)) { $data['dataStatus'] = true; @@ -1376,18 +1375,18 @@ public function filterSalesPDList_post() { $is_file_uploaded = ($pd_master_data[0]['re_uploaded'] ? true : ($pd_master_data[0]['modified_fname'] ? true : false)); if($is_file_uploaded){ - $filename = ($pd_master_data[0]['re_uploaded'] ? XLPATH.'/tmp/'.$pd_master_data[0]['re_uploaded_file_name'] : XLPATH.'/tmp/'.$pd_master_data[0]['modified_fname']); + // $filename = ($pd_master_data[0]['re_uploaded'] ? XLPATH.'/tmp/'.$pd_master_data[0]['re_uploaded_file_name'] : XLPATH.'/tmp/'.$pd_master_data[0]['modified_fname']); // $filename = XLPATH.'/tmp/mySMCPD_client_working.xlsx'; - //$filename = '/home/venba/Downloads/Sample_CET_Upload4.xls'; + $filename = '/home/venba/Downloads/Sample_CET_Upload4.xls'; if(!file_exists($filename)) { //echo 'getting it from s3'; - $bucket_name = LENDER_BUCKET_NAME_PREFIX.$pd_master_data[0]['fk_lender_id']; - $key = 'tmp/'. ($pd_master_data[0]['re_uploaded'] ? $pd_master_data[0]['re_uploaded_file_name'] : $pd_master_data[0]['modified_fname']); - $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$key,'+5 minutes'); - //echo $singed_uri; - $sucess = file_put_contents($filename, file_get_contents($singed_uri)); + // $bucket_name = LENDER_BUCKET_NAME_PREFIX.$pd_master_data[0]['fk_lender_id']; + // $key = 'tmp/'. ($pd_master_data[0]['re_uploaded'] ? $pd_master_data[0]['re_uploaded_file_name'] : $pd_master_data[0]['modified_fname']); + // $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$key,'+5 minutes'); + // //echo $singed_uri; + // $sucess = file_put_contents($filename, file_get_contents($singed_uri)); //echo '*'.$sucess; }