diff --git a/api/application/config/constants.php b/api/application/config/constants.php index be15e296..242e2f98 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -96,6 +96,8 @@ defined('ROUTE_LOGIN_V') OR define('ROUTE_LOGIN_V', 'generateSatelliteImg defined('ROUTE_LOGIN_U') OR define('ROUTE_LOGIN_U', 'generateOTP'); defined('ROUTE_LOGIN_T') OR define('ROUTE_LOGIN_T', 'verifyOTP'); defined('ROUTE_LOGIN_S') OR define('ROUTE_LOGIN_S', 'purge_pddata'); +defined('ROUTE_LOGIN_R') OR define('ROUTE_LOGIN_R', 'archivedSalesPD'); +defined('ROUTE_LOGIN_Q') OR define('ROUTE_LOGIN_Q', 'archivedSMCCreditPD'); defined('ROUTE_LOGIN_J') OR define('ROUTE_LOGIN_J', 'googleSheet'); defined('ROUTE_LOGIN_I') OR define('ROUTE_LOGIN_I', 'saveDatadumpRequest'); defined('ROUTE_LOGIN_H') OR define('ROUTE_LOGIN_H', 'transferCreditPDToCETApp'); diff --git a/api/application/config/routes.php b/api/application/config/routes.php index 660143d0..d534b76f 100755 --- a/api/application/config/routes.php +++ b/api/application/config/routes.php @@ -432,3 +432,5 @@ $route['newSalesPd'] = 'Sales_PD_Controller/cetNewSalesPd'; $route['login'] = 'Common_Masters_Controller/login'; $route['pdfMerger'] = 'PD_Controller/pdfMerger'; +$route['archivedSalesPD']='Sales_PD_Controller/archivedSalesPD'; +$route['archivedSMCCreditPD'] = 'SMC_Credit_PD_Controller/archivedSMCCreditPD'; \ No newline at end of file diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 3b5ba593..6aed2c20 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -2125,7 +2125,7 @@ class PD_Controller extends REST_Controller $pd_applicant_lender_ref = strtolower($records['pd_applicant_id']); $pd_officer_name = isset($records['pd_officer']) ? $records['pd_officer'] : null; $pd_officer_id = isset($records['pd_officer_id']) ? $records['pd_officer_id'] : null; - $include_archive = isset($records['is_include_archived']) ? $records['is_include_archived'] : null; + $include_archive = isset($records['is_include_archived']) ? $records['is_include_archived'] : 1; $pd_agency_id = isset($records['pd_agency_id']) ? $records['pd_agency_id'] : null; $vendor_pdofficer = isset($records['vendor_pdofficer']) ? $records['vendor_pdofficer'] : null; $user_type = isset($records['user_type']) ? $records['user_type'] : null; diff --git a/api/application/controllers/SMC_Credit_PD_Controller.php b/api/application/controllers/SMC_Credit_PD_Controller.php index 80e52a47..1fb91fbe 100644 --- a/api/application/controllers/SMC_Credit_PD_Controller.php +++ b/api/application/controllers/SMC_Credit_PD_Controller.php @@ -2506,6 +2506,41 @@ public function filterSalesPDList_post() { $this->response($data, REST_Controller::HTTP_OK); } } + public function archivedSMCCreditPD_get(){ + + $pd_id = $this->get('pd_id'); + $days = 60; + $day_limit = date("d/m/Y", strtotime("-".$days." days")); + $select = array('*'); + $smc_lender_id = ENVIRONMENT == 'production' ? 7 : 35; //SMC lender id MWISE in live and demo + $limit_condition = "(DATE_FORMAT(completed_on,'%d/%m/%Y') <= '".$day_limit ."' OR DATE_FORMAT(updatedon,'%d/%m/%Y') <= '".$day_limit."')"; + $condit = array('pd_status' => 'COMPLETED','fk_lender_id' => $smc_lender_id); + if(!empty($pd_id)) $condit['pd_id'] = $pd_id; + $condit[$limit_condition]=null; + $value = $this->SMC_Credit_PD_Model->selectCustomRecords($select, $condit, PDTRIGGER); + // print_r($this->db->last_query());print_r($value);die(); + if(!empty($value)){ + $flag = 0;$ids=array(); + foreach( $value as $k => $v) + { + // echo "... ... ".$v['pd_id']; + $updt_arr['pd_status'] = ARCHIVED; + $updt_where = array('pd_id' => $v['pd_id'], 'pd_status' => COMPLETED); + $result = $this->SMC_Credit_PD_Model->updateRecords($updt_arr, PDTRIGGER, $updt_where); + if($result) $flag = $flag+1; + log_message('ERROR', '#### SMC credit PDID '.$v['pd_id'].' in ARCHIVED status '); + array_push($ids, $v['pd_id']); + } + log_message('ERROR', '#### '.$flag. '/'.count($value).' (archived pd/total pd) below this date '.$day_limit); + $data['dataStatus'] = true; + $data['status'] = REST_Controller::HTTP_OK; + $data['message'] = $flag. '/'.count($value).' SMC credit PD in ARCHIVED status ('.implode(', ', $ids).')'; + }else{ + $data['dataStatus'] = false; + $data['status'] = REST_Controller::HTTP_OK; + } + $this->response($data,REST_Controller::HTTP_OK); + } } \ No newline at end of file diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php index d8eca1a9..41f69ee2 100644 --- a/api/application/controllers/Sales_PD_Controller.php +++ b/api/application/controllers/Sales_PD_Controller.php @@ -581,6 +581,7 @@ class Sales_PD_Controller extends REST_Controller { { $where_condition_array['SALES_PD_DATA.lender_id'] = $lender_id; } + $where_condition_array['SALES_PD_DATA.status !='] = 'ARCHIVED'; // FILTERING THE LAST 10 DAYS RECORDS $key_date='SALES_PD_DATA.createdon BETWEEN DATE_SUB(NOW(), INTERVAL 60 DAY) AND NOW()'; @@ -1381,6 +1382,7 @@ class Sales_PD_Controller extends REST_Controller { } public function filterSalesPDList_post() { $records = $this->post('records'); + // print_r($records);die(); $pd_status= $records['pd_status']; $pd_from_date = $records['pd_from_date']; $pd_to_date = $records['pd_to_date']; @@ -2054,11 +2056,38 @@ public function filterSalesPDList_post() { $this->response($data,REST_Controller::HTTP_OK); } } - - - - + public function archivedSalesPD_get(){ + $sales_pd_id = $this->get('sales_pd_id'); + $days = 60; + $day_limit = date("d/m/Y", strtotime("-".$days." days")); + $select = array('*'); + $condit = array('isactive' => 1,'status' => 'COMPLETED','(DATE_FORMAT(completed_date, "%d/%m/%Y")) <=' => $day_limit); + if(!empty($sales_pd_id)) $condit['sales_pd_id'] = $sales_pd_id; + $value = $this->Sales_PD_Model->selectCustomRecords($select, $condit, SALES_PD_DATA); + // echo count($value); + if(!empty($value)){ + $flag = 0;$ids=array(); + foreach( $value as $k => $v) + { + // echo "... ... ".$v['sales_pd_id']; + $updt_arr['status'] = ARCHIVED; + $updt_where = array('sales_pd_id' => $v['sales_pd_id'], 'status' => COMPLETED); + $result = $this->Sales_PD_Model->updateRecords($updt_arr, SALES_PD_DATA, $updt_where); + if($result) $flag = $flag+1; + log_message('ERROR', '#### Sales PDID '.$v['sales_pd_id'].' in ARCHIVED status '); + array_push($ids, $v['sales_pd_id']); + } + log_message('ERROR', '#### '.$flag. '/'.count($value).' (archived pd/total pd) below this date '.$day_limit); + $data['dataStatus'] = true; + $data['status'] = REST_Controller::HTTP_OK; + $data['message'] = $flag. '/'.count($value).' sales PD in ARCHIVED status ('.implode(', ', $ids).')'; + }else{ + $data['dataStatus'] = false; + $data['status'] = REST_Controller::HTTP_OK; + } + $this->response($data,REST_Controller::HTTP_OK); + } } diff --git a/api/application/helpers/authorization_helper.php b/api/application/helpers/authorization_helper.php index 36bf047d..c1bbc8c9 100644 --- a/api/application/helpers/authorization_helper.php +++ b/api/application/helpers/authorization_helper.php @@ -72,7 +72,7 @@ class AUTHORIZATION } - if( $routingName == LOGIN || $routingName == ROUTE_LOGIN_X || $routingName == ROUTE_LOGIN_Y || $routingName == ROUTE_LOGIN_Z || $routingName == ROUTE_LOGIN_W || $routingName == ROUTE_LOGIN_V || $routingName == ROUTE_LOGIN_A || $routingName == TURN_SERVER_API || $routingName == VIDEO_CHAT_ACCESS_KEY_API || $routingName ==SAVEROOMINFO_API || $routingName ==SAVESMCCREDITPDIMAGE_API || $routingName ==GETSMCPDIMGSECTIONDATA_API || $routingName == ROUTE_LOGIN_T || $routingName == ROUTE_LOGIN_U || $routingName == ROUTE_LOGIN_B || $routingName == ROUTE_LOGIN_C || $routingName == ROUTE_LOGIN_D || $routingName == ROUTE_LOGIN_E || $routingName == ROUTE_LOGIN_F || $routingName == ROUTE_LOGIN_S || $routingName == ROUTE_LOGIN_G || $routingName == ROUTE_LOGIN_H || $routingName == ROUTE_LOGIN_I || $routingName == ROUTE_LOGIN_J) + if( $routingName == LOGIN || $routingName == ROUTE_LOGIN_X || $routingName == ROUTE_LOGIN_Y || $routingName == ROUTE_LOGIN_Z || $routingName == ROUTE_LOGIN_W || $routingName == ROUTE_LOGIN_V || $routingName == ROUTE_LOGIN_A || $routingName == TURN_SERVER_API || $routingName == VIDEO_CHAT_ACCESS_KEY_API || $routingName ==SAVEROOMINFO_API || $routingName ==SAVESMCCREDITPDIMAGE_API || $routingName ==GETSMCPDIMGSECTIONDATA_API || $routingName == ROUTE_LOGIN_T || $routingName == ROUTE_LOGIN_U || $routingName == ROUTE_LOGIN_B || $routingName == ROUTE_LOGIN_C || $routingName == ROUTE_LOGIN_D || $routingName == ROUTE_LOGIN_E || $routingName == ROUTE_LOGIN_F || $routingName == ROUTE_LOGIN_Q || $routingName == ROUTE_LOGIN_R || $routingName == ROUTE_LOGIN_S || $routingName == ROUTE_LOGIN_G || $routingName == ROUTE_LOGIN_H || $routingName == ROUTE_LOGIN_I || $routingName == ROUTE_LOGIN_J) { return true; } diff --git a/api/application/models/Sales_PD_Model.php b/api/application/models/Sales_PD_Model.php index 381d65b3..f6a5c2b5 100644 --- a/api/application/models/Sales_PD_Model.php +++ b/api/application/models/Sales_PD_Model.php @@ -30,6 +30,8 @@ class Sales_PD_Model extends SPARQ_Model { $this->db->join(USERPROFILE.' as USERPROFILE', 'USERPROFILE.userid = SALES_PD_DATA.createdby','INNER'); if(!empty($pd_status)){ $this->db->where_in('SALES_PD_DATA.status',$pd_status); + }else{ + $this->db->where('SALES_PD_DATA.status != ',ARCHIVED); } if(($pd_from_date != "" || $pd_from_date != null) && ($pd_to_date != "" || $pd_to_date != null)) { // $this->db->where('SALES_PD_DATA.createdon BETWEEN '. "'$pd_from_date'". ' AND '. "'$pd_to_date'" );