diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php
index d8a8a954..59792ea2 100644
--- a/api/application/controllers/PD_Controller.php
+++ b/api/application/controllers/PD_Controller.php
@@ -2009,7 +2009,7 @@ public function assignPDTempalate($data)
$this->checkEmptyQueryParams($_GET);
$page = 0;$limit = 1000;$sort = 'DESC';$pdofficerid = "";$datetype = "";$fdate ="";$tdate ="";
$lenderid = "";$status="";$lender_details = array();
- $pdagencyid = "";$vendor_pdofficer = "";
+ $pdagencyid = "";$vendor_pdofficer = "";$user_type = "";
if($this->get('page')) { $page = $this->get('page'); }
if($this->get('limit')){ $limit = $this->get('limit'); }
if($this->get('sort')) { $sort = $this->get('sort'); }
@@ -2019,15 +2019,14 @@ public function assignPDTempalate($data)
if($this->get('lenderid'))
{
$lenderid = $this->get('lenderid');
- $lender_details = $this->getLenderHierarchyForPDListing($lenderid);
-
-
+ $lender_details = $this->getLenderHierarchyForPDListing($lenderid);
}
if($this->get('datetype')) { $datetype = $this->get('datetype'); }
if($this->get('fdate')) { $fdate = $this->get('fdate'); }
if($this->get('tdate')) { $tdate = $this->get('tdate'); }
if($this->get('status')) { $status = $this->get('status'); }
- $result_data = $this->PD_Model->listLessPDDetails($page,$limit,$sort,$pdofficerid,$datetype,$fdate,$tdate,$lenderid,$status,$lender_details,$pdagencyid,$vendor_pdofficer);
+ if($this->get('user_type')) { $user_type = $this->get('user_type'); }
+ $result_data = $this->PD_Model->listLessPDDetails($page,$limit,$sort,$pdofficerid,$datetype,$fdate,$tdate,$lenderid,$status,$lender_details,$pdagencyid,$vendor_pdofficer,$user_type);
if($result_data['data_status'] == true)
{
@@ -2130,7 +2129,8 @@ public function assignPDTempalate($data)
$include_archive = $records['is_include_archived'];
$pd_agency_id = $records['pd_agency_id'];
$vendor_pdofficer = $records['vendor_pdofficer'];
- $result_data = $this->PD_Model->PDListwithGlobalFilters($pd_type,$pd_status,$pd_from_date,$pd_to_date,$pd_city,$pd_products,$pd_lender,$pd_applicant_name,$pd_applicant_lender_ref,$pd_officer_name,$include_archive,$pd_officer_id,$pd_agency_id,$vendor_pdofficer);
+ $user_type = $records['user_type'];
+ $result_data = $this->PD_Model->PDListwithGlobalFilters($pd_type,$pd_status,$pd_from_date,$pd_to_date,$pd_city,$pd_products,$pd_lender,$pd_applicant_name,$pd_applicant_lender_ref,$pd_officer_name,$include_archive,$pd_officer_id,$pd_agency_id,$vendor_pdofficer,$user_type);
if(count($result_data))
{
@@ -6059,8 +6059,8 @@ public function getPDFormDetailsJSON_post()
public function codeigniterViewTest_post()
{
- echo 'HI';
- die();
+ // echo 'HI';
+ // die();
// $records = $this->post('records');
// $pd_master_details = $this->PD_Model->getPDMasterDetails($records['pd_id']);
// $video_key = 'DOW8jDJ9';
@@ -9763,6 +9763,11 @@ public function getCompaniesListsFromGeneralFormRawJSON_post()
}
+ // funtion getTwiloVideoStatus_post()
+ // {
+
+ // }
+
function mergeVideo($pd_id,$pd_master_details,$final_video_name,$video_key)
{
// $pd_id = $this->post('pd_id');
diff --git a/api/application/controllers/User_Management_Controller.php b/api/application/controllers/User_Management_Controller.php
index ca2a4f8c..f1e75809 100644
--- a/api/application/controllers/User_Management_Controller.php
+++ b/api/application/controllers/User_Management_Controller.php
@@ -106,7 +106,11 @@ class User_Management_Controller extends REST_Controller {
}
-
+ if(($records['fk_entity_id'] == 35 && ENVIRONMENT == 'testing') || ($records['fk_entity_id'] == 7 && ENVIRONMENT == 'prodcution'))
+ {
+ $records['user_type'] = 'SMC';
+ }
+
$user_id = $this->User_Management_Model->saveRecords($records,USERPROFILE);//insert user records and get userid
if($roles != "")
diff --git a/api/application/helpers/vendor_form_helper.php b/api/application/helpers/vendor_form_helper.php
index dc4874d9..82cac0bd 100644
--- a/api/application/helpers/vendor_form_helper.php
+++ b/api/application/helpers/vendor_form_helper.php
@@ -14,7 +14,7 @@ class vendor_form
{
$return_data = 'During Field Visit, Employer was met.';
}
- $return_data .= 'Field Visit officer clicked Office/Name Board/Entrance photographs and same is available in zipped folder attached with report.';
+ //$return_data .= 'Field Visit officer clicked Office/Name Board/Entrance photographs and same is available in zipped folder attached with report.';
}
@@ -34,6 +34,11 @@ class vendor_form
}
}
+ if($cus_type == 2)
+ {
+ $return_data .= 'Field Visit officer clicked Office/Name Board/Entrance photographs and same is available in zipped folder attached with report.';
+ }
+
return $return_data;
}
@@ -42,7 +47,7 @@ class vendor_form
$CI =&get_instance();
$CI->load->model('PD_Model');
$return_data = array();//fi_initiated_address
-
+ //print_r($vendor_add_section);die();
$initiated_address = vendor_form::getAddress($CI,$vendor_add_section,1);
$actual_address = $vendor_add_section['is_pd_done_on_initiated_address'] ? array() : vendor_form::getAddress($CI,$vendor_add_section,2);
@@ -56,8 +61,8 @@ class vendor_form
$comment_locality = $CI->PD_Model->selectCustomRecords(array('rating'),array('comments_on_locality_id' => $vendor_add_section['comment_locality']),COMMENTSONLOCALITY);
- $return_data = array('initiated_address' => $initiated_address,'actual_address' => $actual_address,'address_type' => $address_type_name[0]['address_type'],'address_locality' => $address_locality[0]['locality_name'],'pd_location_approach' => $pd_location_approach[0]['description'],'comment_locality' => $comment_locality[0]['rating']);
- if($cus_type == 1){ $return_data['uom'] = $uom[0]['name']; }
+ $return_data = array('initiated_address' => $initiated_address,'actual_address' => $actual_address,'address_type' => (is_array($address_type_name) ? $address_type_name[0]['address_type'] : $address_type_name),'address_locality' => (is_array($address_locality) ? $address_locality[0]['locality_name'] : $address_locality),'pd_location_approach' => $pd_location_approach[0]['description'],'comment_locality' => $comment_locality[0]['rating']);
+ if($cus_type == 1){ $return_data['uom'] = ( is_array($uom) ? $uom[0]['name'] : $uom); }
return $return_data;
}
diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php
index 58db0731..9b1a2736 100644
--- a/api/application/models/PD_Model.php
+++ b/api/application/models/PD_Model.php
@@ -11,7 +11,7 @@ class PD_Model extends SPARQ_Model {
}
- public function listLessPDDetails($page,$limit,$sort,$pdofficerid,$datetype,$fdate,$tdate,$lenderid,$status,$lender_details,$pdagencyid,$vendor_pdofficer)// $page represents mysql offset
+ public function listLessPDDetails($page,$limit,$sort,$pdofficerid,$datetype,$fdate,$tdate,$lenderid,$status,$lender_details,$pdagencyid,$vendor_pdofficer,$user_type)// $page represents mysql offset
{
//echo $pd_agency_id;die();
$this->db->SELECT('PDTRIGGER.pd_id,PDTRIGGER.imgc_fin_institute,PDTRIGGER.pd_sno,PDTRIGGER.fk_lender_id,PDTRIGGER.sub_entity_id,SUBENTITY.short_name as sub_entity_short_name,ENTITY.full_name as lender_full_name,ENTITY.short_name as lender_short_name,PDTRIGGER.fk_entity_billing_id,ENTITYBILLING.billing_name, PDTRIGGER.lender_applicant_id, DATE_FORMAT(PDTRIGGER.pd_date_of_initiation, "%d/%m/%Y") as pd_date_of_initiation, PDTRIGGER.fk_product_id,PRODUCTS.name as product_name,PRODUCTS.abbr as product_abbr, PRODUCTS.prod_catagory,PDTRIGGER.fk_subproduct_id,SUBPRODUCTS.name as subproduct_name,SUBPRODUCTS.abbr as subproduct_abbr, PDTRIGGER.fk_pd_type,PDTYPE.type_name as pd_type_name, PDTRIGGER.pd_status,PDTRIGGER.pd_specific_clarification, DATE_FORMAT(PDTRIGGER.createdon,"%d/%m/%Y %H:%i:%s") as createdon, PDTRIGGER.fk_createdby, DATE_FORMAT(PDTRIGGER.updatedon,"%d/%m/%Y %H:%i:%s") as master_updatedon, PDTRIGGER.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby, PDTRIGGER.fk_pd_allocation_type,,PDALLOCATIONTYPE.pd_allocation_type_name, PDTRIGGER.fk_pd_allocated_to,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name) as pd_allocated_to,PDTRIGGER.executive_id,concat(EXECUTIVE.first_name," ",EXECUTIVE.last_name) as executive_name,PDTRIGGER.central_pd_officer_id,concat(CENTRALOFFICER.first_name," ",CENTRALOFFICER.last_name) as centralofficer,PDTRIGGER.fk_pd_template_id,TEMPLATE.template_name, PDTRIGGER.fk_customer_segment,CUSTOMERSEGMENT.name as customer_segment_name,CUSTOMERSEGMENT.abbr as customer_segment_abbr, PDTRIGGER.pd_officier_final_judgement, PDTRIGGER.pd_agency_id,AGENCY.full_name as agency_name,AGENCY.short_name as agency_short_name,AGENCY.is_qc_enabled, PDTRIGGER.loan_amount,PDTRIGGER.addressline1,PDTRIGGER.addressline2,PDTRIGGER.addressline3,PDTRIGGER.fk_city,CITY.name as city_name,PDTRIGGER.fk_state,STATE.name as state_name,PINCODE.pincode,PDTRIGGER.pincode as pincode_id,PDTRIGGER.pd_contact_person,PDTRIGGER.pd_contact_mobileno,DATE_FORMAT(PDTRIGGER.scheduled_on,"%d/%m/%Y %h:%i %p") as scheduled_on,DATE_FORMAT(PDTRIGGER.completed_on,"%d/%m/%Y %h:%i:%s %p") as completed_on,PDTRIGGER.remarks,PDTRIGGER.is_original_report_created,PDTRIGGER.pd_report_latest_version,PDTRIGGER.pd_branch_id,ENTITYLENDERBRANCH.branch_name,PDTRIGGER.qc_feedback,PDTRIGGER.qc_rating,PDTRIGGER.qc_remarks,PDTRIGGER.lender_rating,PDTRIGGER.lender_feedback,PDTRIGGER.other_pincode,PDAPPLICANTSDETAILS.applicant_name,PDTRIGGER.is_otp_done,PDTRIGGER.is_child,PDTRIGGER.parent_pd_id,PDTRIGGER.fk_primary_address_id,PDTRIGGER.fk_address_id,PDTRIGGER.encrypted_url,PDTRIGGER.random_string,PDTRIGGER.pd_qc_note,ENTITY.is_sms_enabled,ENTITY.is_mail_enabled,ENTITY.is_app_notify_enabled,PDTRIGGER.is_notify_enabled,(SELECT DATE_FORMAT(createdon,"%d/%m/%Y") FROM h_common_masters where PDTRIGGER.pd_id = primary_key AND field_name = "pd_status" order by log_id DESC limit 1) as updatedon,ENTITYFININSTITUTION.institute_name as fin_institute_name,PDTRIGGER.is_video_merged,PDTRIGGER.vendor_status');
@@ -135,6 +135,12 @@ class PD_Model extends SPARQ_Model {
}
+ if($user_type == 'SMC')
+ {
+ $current_smc_lender_id = ENVIRONMENT == 'production' ? 7 : 35; //pk id of SMC in live and demo
+ $this->db->WHERE('PDTRIGGER.fk_lender_id',$current_smc_lender_id);
+ }
+
// FILTERING THE LAST 10 DAYS RECORDS
$filter_rec='PDTRIGGER.pd_date_of_initiation BETWEEN DATE_SUB(NOW(), INTERVAL 60 DAY) AND NOW()';
$this->db->WHERE($filter_rec);
@@ -143,7 +149,7 @@ class PD_Model extends SPARQ_Model {
$this->db->ORDER_BY('PDTRIGGER.pd_id',$sort);
//$this->db->LIMIT($limit,$page);
$result_array = $this->db->GET()->result_array();
- //print_r($this->db->last_query());die();
+
if(count($result_array) != 0)
{
foreach($result_array as $key => $result)
@@ -184,7 +190,7 @@ class PD_Model extends SPARQ_Model {
//PD List with Common Filters
- public function PDListwithGlobalFilters($pd_type,$pd_status,$pd_from_date,$pd_to_date,$pd_city,$pd_products,$pd_lender,$pd_applicant_name,$pd_applicant_lender_ref,$pd_officer_name,$include_archive,$pd_officer_id,$pd_agency_id,$vendor_pdofficer)
+ public function PDListwithGlobalFilters($pd_type,$pd_status,$pd_from_date,$pd_to_date,$pd_city,$pd_products,$pd_lender,$pd_applicant_name,$pd_applicant_lender_ref,$pd_officer_name,$include_archive,$pd_officer_id,$pd_agency_id,$vendor_pdofficer,$user_type)
{
$limit = 1000;
@@ -284,6 +290,11 @@ class PD_Model extends SPARQ_Model {
$this->db->LIKE('PDTRIGGER.vendor_pdofficer',"$vendor_pdofficer");
$limit = 100;
}
+ if($user_type == 'SMC')
+ {
+ $current_smc_lender_id = ENVIRONMENT == 'production' ? 7 : 35; //pk id of SMC in live and demo
+ $this->db->WHERE('PDTRIGGER.fk_lender_id',$current_smc_lender_id);
+ }
$this->db->ORDER_BY('PDTRIGGER.pd_id','DESC');
$this->db->LIMIT($limit,0);
diff --git a/api/application/models/User_Management_Model.php b/api/application/models/User_Management_Model.php
index 9a08d478..7f86a63d 100644
--- a/api/application/models/User_Management_Model.php
+++ b/api/application/models/User_Management_Model.php
@@ -15,7 +15,7 @@ class User_Management_Model extends SPARQ_Model {
$result_data = array();
- $this->db->select('USERPROFILE.userid, USERPROFILE.aws_name, USERPROFILE.first_name as user_first_name, USERPROFILE.last_name as user_last_name, USERPROFILE.email, USERPROFILE.mobile_no, USERPROFILE.profilepic, USERPROFILE.createdon, USERPROFILE.fk_createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as created_full_name, USERPROFILE.updatedon, USERPROFILE.fk_updatedby,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name)as update_full_name, USERPROFILE.fk_entity_id,ENTITY.full_name, USERPROFILE.isactive, USERPROFILE.fk_city,CITY.name as city_name, USERPROFILE.fk_state,STATE.name as state_name, PDOFFICIERSDETAILS.fk_pd_type_id,PDOFFICIERSDETAILS.fk_team_id,USERPROFILEROLES.user_role,USERPROFILE.fk_entity_type_id,ENTITYTYPE.name as entitytypename,ROLES.role_name,DESIGNATION.designation as designation_name,USERPROFILE.designation,USERPROFILE.fk_lender_branch_id');
+ $this->db->select('USERPROFILE.userid, USERPROFILE.aws_name, USERPROFILE.first_name as user_first_name, USERPROFILE.last_name as user_last_name, USERPROFILE.email, USERPROFILE.mobile_no, USERPROFILE.profilepic, USERPROFILE.createdon, USERPROFILE.fk_createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as created_full_name, USERPROFILE.updatedon, USERPROFILE.fk_updatedby,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name)as update_full_name, USERPROFILE.fk_entity_id,ENTITY.full_name, USERPROFILE.isactive, USERPROFILE.fk_city,CITY.name as city_name, USERPROFILE.fk_state,STATE.name as state_name, PDOFFICIERSDETAILS.fk_pd_type_id,PDOFFICIERSDETAILS.fk_team_id,USERPROFILEROLES.user_role,USERPROFILE.fk_entity_type_id,ENTITYTYPE.name as entitytypename,ROLES.role_name,DESIGNATION.designation as designation_name,USERPROFILE.designation,USERPROFILE.fk_lender_branch_id,USERPROFILE.user_type');
$this->db->from(USERPROFILE.' as USERPROFILE');
$this->db->join(ENTITY.' as ENTITY','USERPROFILE.fk_entity_id = ENTITY.entity_id and ENTITY.isactive = 1','LEFT');
$this->db->join(STATE.' as STATE','USERPROFILE.fk_state = STATE.state_id and STATE.isactive = 1','LEFT');
@@ -57,7 +57,7 @@ class User_Management_Model extends SPARQ_Model {
public function getUserDetails($userid){
- $this->db->select('USERPROFILE.userid, USERPROFILE.aws_name, USERPROFILE.first_name as user_first_name, USERPROFILE.last_name as user_last_name, USERPROFILE.email, USERPROFILE.mobile_no, USERPROFILE.profilepic, USERPROFILE.createdon, USERPROFILE.fk_createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as created_full_name, USERPROFILE.updatedon, USERPROFILE.fk_updatedby,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name)as update_full_name, USERPROFILE.fk_entity_id,ENTITY.full_name,ENTITY.short_name,USERPROFILE.isactive, USERPROFILE.fk_city,CITY.name as city_name, USERPROFILE.fk_state,STATE.name as state_name, PDOFFICIERSDETAILS.fk_pd_type_id,PDOFFICIERSDETAILS.fk_team_id,USERPROFILE.fk_entity_type_id,USERPROFILEROLES.user_role,ENTITYTYPE.name as entitytypename,ROLES.role_name,USERPROFILE.mpin,DESIGNATION.designation as designation_name,USERPROFILE.designation,USERPROFILE.fk_lender_branch_id');
+ $this->db->select('USERPROFILE.userid, USERPROFILE.aws_name, USERPROFILE.first_name as user_first_name, USERPROFILE.last_name as user_last_name, USERPROFILE.email, USERPROFILE.mobile_no, USERPROFILE.profilepic, USERPROFILE.createdon, USERPROFILE.fk_createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as created_full_name, USERPROFILE.updatedon, USERPROFILE.fk_updatedby,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name)as update_full_name, USERPROFILE.fk_entity_id,ENTITY.full_name,ENTITY.short_name,USERPROFILE.isactive, USERPROFILE.fk_city,CITY.name as city_name, USERPROFILE.fk_state,STATE.name as state_name, PDOFFICIERSDETAILS.fk_pd_type_id,PDOFFICIERSDETAILS.fk_team_id,USERPROFILE.fk_entity_type_id,USERPROFILEROLES.user_role,ENTITYTYPE.name as entitytypename,ROLES.role_name,USERPROFILE.mpin,DESIGNATION.designation as designation_name,USERPROFILE.designation,USERPROFILE.fk_lender_branch_id,USERPROFILE.user_type');
$this->db->from(USERPROFILE.' as USERPROFILE');
$this->db->join(ENTITY.' as ENTITY','USERPROFILE.fk_entity_id = ENTITY.entity_id and ENTITY.isactive = 1','LEFT');
$this->db->join(STATE.' as STATE','USERPROFILE.fk_state = STATE.state_id and STATE.isactive = 1','LEFT');
diff --git a/api/application/views/report_templates/JSONTOREPORT_DI_AI_SMARTPD.php b/api/application/views/report_templates/JSONTOREPORT_DI_AI_SMARTPD.php
index 7f75f8e5..62665908 100644
--- a/api/application/views/report_templates/JSONTOREPORT_DI_AI_SMARTPD.php
+++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI_SMARTPD.php
@@ -4824,10 +4824,11 @@ if($total_no_of_business > 0) {
echo $vendor_business_asset_info['business_asset_sight'] == 'yes' ? 'Business Assets were sighted during Field visit and photographs available in zipped file enclosed with report.
': 'No Business Assets were sighted during Field Visit.
';
echo "During Field visit, officer clicked office/Name board/Entrance photographs and same is available in
zipped folder attached with report.
";
- echo 'Credit Manager Special Requests:
';
+
$vendor_credit_manager_info = $vendor_form_json['questions'][6];
if(count($vendor_credit_manager_info['docs_to_be_sighted']))
{
+ echo 'Credit Manager Special Requests:
';
foreach ($vendor_credit_manager_info['docs_to_be_sighted'] as $cm_key => $cm_value)
{
echo 'Document Required:'.$cm_value['placeholder'].'
';
diff --git a/api/application/views/report_templates/JSONTOREPORT_SAL_SMARTPD.php b/api/application/views/report_templates/JSONTOREPORT_SAL_SMARTPD.php
index c41700e2..fa8f5cd5 100644
--- a/api/application/views/report_templates/JSONTOREPORT_SAL_SMARTPD.php
+++ b/api/application/views/report_templates/JSONTOREPORT_SAL_SMARTPD.php
@@ -1151,7 +1151,7 @@ font-weight: bolder;;
{
$employeement_data = json_decode($pd_processed_forms[12][0]['processed_json'],true);
}
- //print_r($employeement_data);
+ //print_r($employeement_data);die();
echo "Employment Information
" ; //die();
if(count($employeement_data))
{
@@ -1165,10 +1165,10 @@ font-weight: bolder;;
}
if($employer_details['visiting_card'] == 'yes'){ echo 'Person met/contacted provided company ID Card/Visiting Card.
';}else{ echo 'Person met/contacted was not provided company ID Card/Visiting Card.
'; }
- // echo "Employer Name : ". explode('-', $employeement_data['employer_name'])[1] ."
" ;
- // echo "Company Profile : ". $employeement_data['employer_in_brief'] ."
" ;
+ echo "Employer Name : ". explode('-', $employeement_data['employer_name'])[1] ."
" ;
+ echo "Company Profile : ". $employeement_data['employer_in_brief'] ."
" ;
- // echo "The applicant has served ". $employeement_data['how_long_year'] ." Years ".($employeement_data['how_long_month'] ? ' and '.$employeement_data['how_long_month'].' months' : '' )." as employee in this firm / company. " ;
+ echo "
The applicant has served ". $employeement_data['how_long_year'] ." Years ".($employeement_data['how_long_month'] ? ' and '.$employeement_data['how_long_month'].' months' : '' )." as employee in this firm / company. " ;
// echo "Applicant has total work experience of ". $employeement_data['total_business_experience']." years.
";
@@ -1188,6 +1188,14 @@ font-weight: bolder;;
echo "Salary paid to the applicant between ".MYUTIL::addOrdinalNumberSuffix($employeement_data['from_date_the_salary_is_rcv']) ." and ".MYUTIL::addOrdinalNumberSuffix($employeement_data['to_date_the_salary_is_rcv']). " of every month via ".$salary_mode_text [ $employeement_data['mode_of_getting_salary'] ]."
";
+ if(isset($employeement_data['sal_paid_regularly']) && $employeement_data['sal_paid_regularly'] == 'yes')
+ {
+ echo 'Salary has been paid regularly for last three months.
';
+ }
+ else
+ {
+ echo 'Salary has been not paid regularly for last three months becasue '.$employer_details['reason_not_sal_pay'].'.
' ;
+ }
if((isset($employeement_data['amount_paid_in_cash']) && $employeement_data['amount_paid_in_cash']) && (isset($employeement_data['amount_paid_through_bank']) && $employeement_data['amount_paid_through_bank']))
{
echo $rupee_symbol.' '.$employeement_data['amount_paid_in_cash']." paid as cash and ".$rupee_symbol.' '.$employeement_data['amount_paid_through_bank']." as bank transfer";
@@ -1204,14 +1212,14 @@ font-weight: bolder;;
echo "Applicant gets monthly gross salary of ". $rupee_symbol." ". MYUTIL::customIndianNumberFormat($employeement_data['gross_monthly_salary'])." and net monthly salary of ".$rupee_symbol." ". MYUTIL::customIndianNumberFormat($employeement_data['net_monthly_salary'])."
";
- echo $employeement_data['check_validated'] == "not validated" ? "The salary amount was not validated during visit because ".$employeement_data['why_was_it_not_validated']."
": "The salary amount was validated during visit ".$employeement_data['how_was_it_validated']."
";
+ // echo $employeement_data['check_validated'] == "not validated" ? "The salary amount was not validated during visit because ".$employeement_data['why_was_it_not_validated']."
": "The salary amount was validated during visit ".$employeement_data['how_was_it_validated']."
";
- echo $employeement_data['any_delays'] == 'yes' ? 'As per person met, sometimes there is delay in salary payment.
' : 'Generally, there is no delay in salary payment.
';
+ // echo $employeement_data['any_delays'] == 'yes' ? 'As per person met, sometimes there is delay in salary payment.
' : 'Generally, there is no delay in salary payment.
';
// echo $employeement_data['bonus_incentive'] ? "The applicant receives a bonus ( ".($employeement_data['bonus_type'] == 'others' ? $employeement_data['bonus_type_other']: $employeement_data['bonus_type']).") of ".$rupee_symbol." ".MYUTIL::customIndianNumberFormat($employeement_data['bonus_incentive'])." ".$employeement_data['bonus_frequency_master'].'.
': 'Applicant does not get any Bonus amount or Incentives.
';
- // echo $employeement_data['id_card_issued_company'] == 'yes' ? 'ID card issued by employer was seen by PD officer and same is available in zipped file enclosed with report.
' : '
ID card issued by employer was not seen because, '.$employeement_data['why_company_id_proof_not_available'].'
';
+ echo $employeement_data['id_card_issued_company'] == 'yes' ? 'ID card issued by employer was seen by PD officer and same is available in zipped file enclosed with report.
' : '
ID card issued by employer was not seen because, '.$employeement_data['why_company_id_proof_not_available'].'
';
//echo "
***********************************";
echo $employeement_data['employment_remarks'] != "" ? "".$employeement_data['employment_remarks']."
": "";
@@ -1227,7 +1235,19 @@ font-weight: bolder;;
}
else
{
- echo 'Applicant’s employment documents were not seen because'.$employeement_data['doc_not_available_specify'].'
';
+
+ $doc_not_available_resan = '';
+ foreach ($employeement_data['doc_not_available'] as $dna_key => $dna_value)
+ {
+ $doc_not_available_resan .= $dna_value.', ';
+ }
+ //$doc_not_available_resan = $employeement_data['doc_not_available_specify'] ? ($doc_not_available_resan.', ') : $doc_not_available_resan;
+ $doc_not_available_resan = $doc_not_available_resan ? ( substr_replace($doc_not_available_resan,' ',-2)) : '';
+
+ $ids = 'Applicant’s employment documents were not seen';
+ if($doc_not_available_resan){$ids .= 'because '.$doc_not_available_resan;}
+ $ids .= '
';
+ echo $ids;
}
}
@@ -2047,7 +2067,7 @@ font-weight: bolder;;
';
$vendor_form_json = json_decode($pd_processed_forms[25][0]['json'],true);
- // print_r($vendor_form_json['questions'][0]);die();
+ //print_r($vendor_form_json);die();
echo "Field Visit Report of $main_applicant_name
";
echo 'General Section
';
$vendor_gen_section_text = vendor_form::getVendorGeneralSectionContent($vendor_form_json['questions'][0],2);
@@ -2056,6 +2076,8 @@ font-weight: bolder;;
echo 'Employer information
';
$vendor_employer_info = $vendor_form_json['questions'][2];
+ // unset($vendor_employer_info['office_photographs']);
+ //print_r($vendor_employer_info);die();
if(array_key_exists('employer_details',$vendor_employer_info))
{
@@ -2071,8 +2093,8 @@ font-weight: bolder;;
else
{
echo 'During Field visit, employer/manager was not met at the visited premises.
';
- echo 'Employer’s/Manager’s Company ID card / Visiting Card was not photographed during Field visit.
';
- echo 'Salary amount was not confirmed
';
+ // echo 'Employer’s/Manager’s Company ID card / Visiting Card was not photographed during Field visit.
';
+ // echo 'Salary amount was not confirmed
';
}
if(isset($vendor_employer_info['docs_sighted']))
@@ -2092,12 +2114,15 @@ font-weight: bolder;;
$document_name = substr_replace($document_name,'', -2);
echo " $document_name were seen during Field visit and photographs of same is available in zipped file enclosed with report.
";
}
- else
- {
- echo 'Applicant’s employment documents were not seen during Field visit because (reason entered).
';
- }
}
+ else
+ {
+ $reason = '';
+ $dis = 'Applicant’s employment documents were not seen during Field visit';
+ if($reason) { $dis .= "becasue, $reason"; }; $reason .= '
.';
+ echo $dis;
+ }
$vendor_credit_manager_info = $vendor_form_json['questions'][6];
@@ -2129,9 +2154,9 @@ font-weight: bolder;;
// echo 'Submit:
';
$vendoe_final_remars = $vendor_form_json['questions'][5];
- echo 'Final Status of Field visit:'. $vendoe_final_remars['final_visit_status'] .'
';
+
echo 'Remarks:'. $vendoe_final_remars['final_comments'] .'
';
- echo ' Neighbourhood check:
';
+ echo ' Neighbourhood check:
';
echo 'Existence of organization/office confirmed by neighbour:'. ucfirst($vendoe_final_remars['company_existence_neighbour_confirmed']) .'
';
if($vendoe_final_remars['company_existence_neighbour_confirmed'] == 'yes')
{
@@ -2144,7 +2169,7 @@ font-weight: bolder;;
echo 'Existence of organization/office was not confirmed by neighbour.
';
}
-
+ echo 'Final Status of Field visit:'. $vendoe_final_remars['final_visit_status'] .'
';
echo '
';
echo 'Name of the Officer visited:'.$pd_master_details[0]['vendor_pdofficer_name'].'
';
echo 'Name of the Agency visited:'.$pd_master_details[0]['agency_name'].'
';