diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php index 25e10bf6..b4824903 100644 --- a/api/application/controllers/Sales_PD_Controller.php +++ b/api/application/controllers/Sales_PD_Controller.php @@ -55,15 +55,7 @@ class Sales_PD_Controller extends REST_Controller { $applicant_name = ''; $applicant_id = ''; $officer = ''; - //generate sales pd serial no - - $count = $this->Sales_PD_Model->selectCustomRecords(array('count(*) as count'),array('lender_id' => $records['lender_id'],'product_id' => $records['product_id']),SALES_PD_DATA); - - $salepd_serial_no = $records['lender_id'] == 35 ? 'MWISE':'UNKNOWN'; - $salepd_serial_no .= $records['product_id'] == 4 ? '-BL' : '-LFMP'; - $salepd_serial_no .= '-'.(++$count[0]['count']); - //echo $salepd_serial_no; - //end generate sales pd serial no + //die(); @@ -113,10 +105,20 @@ class Sales_PD_Controller extends REST_Controller { $records['applicant_id'] = $applicant_id; $records['applicant_name'] = $applicant_name; $records['officer_name'] = $officer; - $records['sales_pd_sno'] = $salepd_serial_no; + $id = null; if(!$records['sales_pd_id']) { + //generate sales pd serial no + + $count = $this->Sales_PD_Model->selectCustomRecords(array('count(*) as count'),array('lender_id' => $records['lender_id'],'product_id' => $records['product_id']),SALES_PD_DATA); + + $salepd_serial_no = $records['lender_id'] == 35 ? 'MWISE':'UNKNOWN'; + $salepd_serial_no .= $records['product_id'] == 4 ? '-BL' : '-LFMP'; + $salepd_serial_no .= '-'.(++$count[0]['count']); + //echo $salepd_serial_no; + //end generate sales pd serial no + $records['sales_pd_sno'] = $salepd_serial_no; $id = $this->Sales_PD_Model->saveRecords($records,SALES_PD_DATA); } else @@ -228,7 +230,7 @@ class Sales_PD_Controller extends REST_Controller { { $lender_id = $this->uri->segment(2); $user_id = $this->uri->segment(3); - $columns = array('SALES_PD_DATA.sales_pd_id','SALES_PD_DATA.applicant_name','SALES_PD_DATA.officer_name','SALES_PD_DATA.applicant_id','SALES_PD_DATA.lender_id','SALES_PD_DATA.product_id','SALES_PD_DATA.is_pdf','SALES_PD_DATA.is_edited','ENTITY.short_name','PRODUCT.abbr','SALES_PD_DATA.createdon'); + $columns = array('SALES_PD_DATA.sales_pd_id','SALES_PD_DATA.sales_pd_sno','SALES_PD_DATA.applicant_name','SALES_PD_DATA.officer_name','SALES_PD_DATA.applicant_id','SALES_PD_DATA.lender_id','SALES_PD_DATA.product_id','SALES_PD_DATA.is_pdf','SALES_PD_DATA.is_edited','ENTITY.short_name','PRODUCT.abbr','SALES_PD_DATA.createdon'); $table = SALES_PD_DATA.' as SALES_PD_DATA'; $joins = array( array('table' => ENTITY. ' as ENTITY', diff --git a/api/application/helpers/getprocessedjson_helper.php b/api/application/helpers/getprocessedjson_helper.php index e09329ea..20e82f0d 100644 --- a/api/application/helpers/getprocessedjson_helper.php +++ b/api/application/helpers/getprocessedjson_helper.php @@ -2453,7 +2453,7 @@ class GETPROCESSEDJSON $master_tables_field_names = $CI->config->item('master_tables_field_names'); $master_tables_pkid = $CI->config->item('master_tables_pkid'); - //print_r($raw_json); + //print_r($raw_json);die(); // GET KEYS FROM MASTER TABLE FOR FINAL FORM $fields = array('question', 'key', 'ismaster', 'master_name'); @@ -2488,6 +2488,13 @@ class GETPROCESSEDJSON $raw_json['pd_officers_recommendation_master'] = $pdofficer_recommendations[0][$master_tables_field_names['PDOFFICERRECOMMENDATIONS']]; } } + + if(isset($raw_json['was_the_pd_address_ogl']) && $raw_json['was_the_pd_address_ogl'] == true) + { + $CI->PD_Model->updateRecords(array('is_ogl' => 1),PDTRIGGER,array('pd_id' => $raw_json['pdid'])); + } + + return $raw_json; } diff --git a/api/application/models/Dash_Board_Model.php b/api/application/models/Dash_Board_Model.php index 30ecce71..c5f50cd9 100644 --- a/api/application/models/Dash_Board_Model.php +++ b/api/application/models/Dash_Board_Model.php @@ -235,7 +235,7 @@ class Dash_Board_Model extends SPARQ_Model { public function pdTATreport($applicant_id = null,$from_date = null,$to_date = null,$city = null,$branch = null,$lender_short_name = null) { - $this->db->SELECT('created_on, pd_sno, applicant, application_id, sineedge_ref, lender, lender_contact, branch, city, state, pincode, is_outside_city_limit, pd_agency, product, sub_product, pd_type, cust_seg, loan_amount, pd_officer, remarks, current_status, draft, triggered, allocated, bounced, if(strcmp(current_status,"BOUNCED"),accepted,null) as accepted, if(strcmp(current_status,"BOUNCED"),scheduled,null) as scheduled, if(strcmp(current_status,"BOUNCED"),initiated,null) as initiated, if(strcmp(current_status,"BOUNCED"),started,null) as started, if(strcmp(current_status,"BOUNCED"),inprogress,null) as inprogress, if(strcmp(current_status,"BOUNCED"),completed,null) as completed, if(strcmp(current_status,"BOUNCED"),qc_complete,null) as qc_complete, TIMEDIFF(triggered,draft) as draft_to_triggered,TIMEDIFF(allocated,triggered) as triggered_to_allocated,TIMEDIFF(bounced,allocated) as allocated_to_bounced,if(strcmp(current_status,"BOUNCED"),TIMEDIFF(accepted,allocated),null) as allocated_to_accepted,if(strcmp(current_status,"BOUNCED"),TIMEDIFF(scheduled,accepted),null) as accepted_to_scheduled,if(strcmp(current_status,"BOUNCED"),TIMEDIFF(initiated,scheduled),null) as scheduled_to_initiated,if(strcmp(current_status,"BOUNCED"),TIMEDIFF(started,initiated),null) as initiated_to_started,if(strcmp(current_status,"BOUNCED"),TIMEDIFF(inprogress,started),null) as started_to_inprogress,if(strcmp(current_status,"BOUNCED"),TIMEDIFF(completed,inprogress),null) as inprogress_to_completed,if(strcmp(current_status,"BOUNCED"),TIMEDIFF(qc_complete,completed),null) as completed_to_qc_completed, + $this->db->SELECT('created_on, pd_sno, applicant, application_id, sineedge_ref, lender, lender_contact, branch,address_visited,city, state, pincode, is_outside_city_limit, pd_agency, product, sub_product, pd_type, cust_seg, loan_amount, pd_officer, remarks, current_status, draft, triggered, allocated, bounced, if(strcmp(current_status,"BOUNCED"),accepted,null) as accepted, if(strcmp(current_status,"BOUNCED"),scheduled,null) as scheduled, if(strcmp(current_status,"BOUNCED"),initiated,null) as initiated, if(strcmp(current_status,"BOUNCED"),started,null) as started, if(strcmp(current_status,"BOUNCED"),inprogress,null) as inprogress, if(strcmp(current_status,"BOUNCED"),completed,null) as completed, if(strcmp(current_status,"BOUNCED"),qc_complete,null) as qc_complete, TIMEDIFF(triggered,draft) as draft_to_triggered,TIMEDIFF(allocated,triggered) as triggered_to_allocated,TIMEDIFF(bounced,allocated) as allocated_to_bounced,if(strcmp(current_status,"BOUNCED"),TIMEDIFF(accepted,allocated),null) as allocated_to_accepted,if(strcmp(current_status,"BOUNCED"),TIMEDIFF(scheduled,accepted),null) as accepted_to_scheduled,if(strcmp(current_status,"BOUNCED"),TIMEDIFF(initiated,scheduled),null) as scheduled_to_initiated,if(strcmp(current_status,"BOUNCED"),TIMEDIFF(started,initiated),null) as initiated_to_started,if(strcmp(current_status,"BOUNCED"),TIMEDIFF(inprogress,started),null) as started_to_inprogress,if(strcmp(current_status,"BOUNCED"),TIMEDIFF(completed,inprogress),null) as inprogress_to_completed,if(strcmp(current_status,"BOUNCED"),TIMEDIFF(qc_complete,completed),null) as completed_to_qc_completed, IF(strcmp(current_status,"BOUNCED"),IF(qc_complete is not null ,TIMEDIFF(qc_complete, triggered),IF(completed is not null,TIMEDIFF(completed, triggered),IF(inprogress is not null,TIMEDIFF(inprogress, triggered),IF(started is not null,TIMEDIFF(started, triggered),IF(initiated is not null,TIMEDIFF(initiated, triggered),IF(scheduled is not null,TIMEDIFF(scheduled, triggered),IF(allocated is not null,TIMEDIFF(allocated, triggered),TIMEDIFF(allocated, triggered)))))))),null) as total_tat'); $this->db->FROM(PDMIS); //$this->db->LIMIT(1,0);