From b7dd905545f21f0c12336c27169dbf5b7878e4b2 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Sat, 7 Jan 2023 16:20:17 +0530 Subject: [PATCH] is_the_data_transfer_cet flag changes added : ps --- .../controllers/SMC_Credit_PD_Controller.php | 43 ++++++++++++++----- .../controllers/Sales_PD_Controller.php | 42 +++++++++++++----- 2 files changed, 63 insertions(+), 22 deletions(-) diff --git a/api/application/controllers/SMC_Credit_PD_Controller.php b/api/application/controllers/SMC_Credit_PD_Controller.php index 93c7ab78..deca81ee 100644 --- a/api/application/controllers/SMC_Credit_PD_Controller.php +++ b/api/application/controllers/SMC_Credit_PD_Controller.php @@ -272,18 +272,31 @@ class SMC_Credit_PD_Controller extends REST_Controller { $smc_credit_pd = $this->uri->segment(2); if($smc_credit_pd){ log_message('ERROR', '#### upload SMC-Credit PDData To CETApp Function Called'); - $response = $this->dataSynchronization($smc_credit_pd); - if($response){ - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['msg'] = 'Data Shared Successfully'; - $this->response($data,REST_Controller::HTTP_OK); + $columns = array('PDTRIGGER.pd_id'); + $table = PDTRIGGER . ' as PDTRIGGER'; + $where_arr = array('PDTRIGGER.is_the_data_transfer_cet'=>0,'PDTRIGGER.pd_status' => COMPLETED,'PDTRIGGER.pd_id'=>$smc_credit_pd); + $details = $this->SMC_Credit_PD_Model->selectCustomRecords($columns, $where_arr, $table); + if(!empty($details)){ + $response = $this->dataSynchronization($smc_credit_pd); + if($response){ + $data['dataStatus'] = true; + $data['status'] = REST_Controller::HTTP_OK; + $data['msg'] = 'Data Shared Successfully'; + $this->response($data,REST_Controller::HTTP_OK); + }else{ + $data['dataStatus'] = false; + $data['status'] = REST_Controller::HTTP_NO_CONTENT; + $data['msg'] = 'Something went wrong! Try Later'; + $this->response($data, REST_Controller::HTTP_OK); + } }else{ + log_message('ERROR', $smc_credit_pd.' Data already uploaded'); $data['dataStatus'] = false; $data['status'] = REST_Controller::HTTP_NO_CONTENT; - $data['msg'] = 'Something went wrong! Try Later'; + $data['msg'] = 'Data already uploaded! Try Later'; $this->response($data, REST_Controller::HTTP_OK); } + }else{ $msg = 'Can`t Upload ID Not Founded ! Try Later'; $data['dataStatus'] = false; @@ -312,20 +325,28 @@ class SMC_Credit_PD_Controller extends REST_Controller { FROM h_common_masters as logmaster WHERE logmaster.new_value = "COMPLETED" AND PDTRIGGER.pd_id = logmaster.primary_key) BETWEEN ' ."'$newDate1'". ' AND ' ."'$newDate2'"; - $where_arr = array('PDTRIGGER.fk_lender_id' => $smc_lender_id,'PDTRIGGER.pd_status' => COMPLETED, $where => null); + $where_arr = array('PDTRIGGER.is_the_data_transfer_cet'=>0,'PDTRIGGER.fk_lender_id' => $smc_lender_id,'PDTRIGGER.pd_status' => COMPLETED, $where => null); $details = $this->SMC_Credit_PD_Model->selectCustomRecords($columns, $where_arr, $table); log_message('ERROR', $msg." Changed ".$newDate1." to ".$newDate2." Total Records => " . count($details)); if(!empty($details)){ - $flag = 0; + $flag = 0;$ids=array(); for ($i = 0; $i < count($details); $i++) { $smc_credit_pd = $details[$i]['pd_id']; // echo $smc_credit_pd; $result = $this->dataSynchronization($smc_credit_pd); - $flag = $result == true ? $flag+1 : $flag; + // $flag = $result == true ? $flag+1 : $flag; + if($result == true){ + $flag = $flag+1; + array_push($ids, $smc_credit_pd); + //update here. + $update_fields2 = array('is_the_data_transfer_cet' => 1); + $this->SMC_Credit_PD_Model->updateRecords($update_fields2,PDTRIGGER,array('pd_id' => $smc_credit_pd)); + + } } $data['dataStatus'] = true; $data['status'] = REST_Controller::HTTP_OK; - $data['msg'] = $flag.' Data Shared Successfully'; + $data['msg'] = implode(', ', $ids).' ( '.$flag.' ) Data Shared Successfully'; $this->response($data, REST_Controller::HTTP_OK); }else{ $msg = 'There is no data for Given Date ! Try Later'; diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php index b20229df..3ec756e4 100644 --- a/api/application/controllers/Sales_PD_Controller.php +++ b/api/application/controllers/Sales_PD_Controller.php @@ -276,16 +276,28 @@ class Sales_PD_Controller extends REST_Controller { $sales_pd_id = $this->uri->segment(2); if($sales_pd_id){ log_message('ERROR', '#### upload Sales PDData To CETApp Function Called'); - $response = $this->dataSynchronization($sales_pd_id); - if($response){ - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['msg'] = 'Data Shared Successfully'; - $this->response($data,REST_Controller::HTTP_OK); + $columns = array('SALES_PD_DATA.sales_pd_id'); + $table = SALES_PD_DATA . ' as SALES_PD_DATA'; + $where_arr = array('SALES_PD_DATA.is_the_data_transfer_cet'=>0,'SALES_PD_DATA.status' => COMPLETED,'SALES_PD_DATA.sales_pd_id'=>$sales_pd_id); + $details = $this->Sales_PD_Model->selectCustomRecords($columns, $where_arr, $table); + if(!empty($details)){ + $response = $this->dataSynchronization($sales_pd_id); + if($response){ + $data['dataStatus'] = true; + $data['status'] = REST_Controller::HTTP_OK; + $data['msg'] = 'Data Shared Successfully'; + $this->response($data,REST_Controller::HTTP_OK); + }else{ + $data['dataStatus'] = false; + $data['status'] = REST_Controller::HTTP_NO_CONTENT; + $data['msg'] = 'Something went wrong! Try Later'; + $this->response($data, REST_Controller::HTTP_OK); + } }else{ + log_message('ERROR', $sales_pd_id.' Data already uploaded'); $data['dataStatus'] = false; $data['status'] = REST_Controller::HTTP_NO_CONTENT; - $data['msg'] = 'Something went wrong! Try Later'; + $data['msg'] = 'Data already uploaded! Try Later'; $this->response($data, REST_Controller::HTTP_OK); } }else{ @@ -311,20 +323,28 @@ class Sales_PD_Controller extends REST_Controller { $table = SALES_PD_DATA . ' as SALES_PD_DATA'; $where = 'DATE(SALES_PD_DATA.completed_date) BETWEEN ' ."'$newDate1'". ' AND ' ."'$newDate2'"; - $where_arr = array('SALES_PD_DATA.status' => COMPLETED, $where => null); + $where_arr = array('SALES_PD_DATA.is_the_data_transfer_cet'=>0,'SALES_PD_DATA.status' => COMPLETED, $where => null); $details = $this->Sales_PD_Model->selectCustomRecords($columns, $where_arr, $table); log_message('ERROR', $msg." Changed ".$newDate1." to ".$newDate2." Total Records => " . count($details)); if(!empty($details)){ - $flag = 0; + $flag = 0;$ids=array(); for ($i = 0; $i < count($details); $i++) { $sales_pd_id = $details[$i]['sales_pd_id']; // echo $sales_pd_id; $result = $this->dataSynchronization($sales_pd_id); - $flag = ($result == true) ? $flag+1 : $flag; + if($result == true){ + $flag = $flag+1; + //update here. + $update_fields2 = array('is_the_data_transfer_cet' => 1); + $this->Sales_PD_Model->updateRecords($update_fields2,SALES_PD_DATA,array('sales_pd_id' => $sales_pd_id)); + array_push($ids, $sales_pd_id); + + } + // $flag = ($result == true) ? $flag+1 : $flag; } $data['dataStatus'] = true; $data['status'] = REST_Controller::HTTP_OK; - $data['msg'] = $flag.' Data Shared Successfully'; + $data['msg'] = implode(', ', $ids).' ( '.$flag.' ) Data Shared Successfully'; $this->response($data, REST_Controller::HTTP_OK); }else{ $msg = 'There is no data for Given Date ! Try Later';