From 8b2e9053c2de4ca4360926656eb7dc2e052c6fde Mon Sep 17 00:00:00 2001 From: Sanjeev Date: Thu, 10 Jun 2021 12:13:28 +0530 Subject: [PATCH] Smart & Full PD Salaried Report - 5th pts : ps --- .../views/report_templates/JSONTOREPORT_SAL.php | 17 +++++++++-------- .../JSONTOREPORT_SAL_SMARTPD.php | 17 +++++++++-------- .../JSONTOREPORT_SAL_TELE_PD.php | 2 +- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/api/application/views/report_templates/JSONTOREPORT_SAL.php b/api/application/views/report_templates/JSONTOREPORT_SAL.php index 900fac43..492e00b8 100644 --- a/api/application/views/report_templates/JSONTOREPORT_SAL.php +++ b/api/application/views/report_templates/JSONTOREPORT_SAL.php @@ -1273,14 +1273,6 @@ defined('BASEPATH') OR exit('No direct script access allowed'); { echo "Applicant is getting ".$rupee_symbol.' '.$employeement_data['amount_paid_in_cash']." paid as cash and ".$rupee_symbol.' '.$employeement_data['amount_paid_through_bank']." as bank transfer."; } - if(isset($employeement_data['bonus_incentive'])){ - if($employeement_data['bonus_incentive'] > 0){ - 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.

'; - } - else{ - echo "Applicant does not get any Bonus amount or Incentives "; - } - } if(isset($employeement_data['sal_paid_regularly']) && $employeement_data['sal_paid_regularly'] == 'yes') { @@ -1301,6 +1293,15 @@ defined('BASEPATH') OR exit('No direct script access allowed'); // } 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'])."

"; + + if(isset($employeement_data['bonus_incentive'])){ + if($employeement_data['bonus_incentive'] > 0){ + echo $employeement_data['bonus_incentive'] ? "

The applicant receives a bonus/incentives ( ".($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.

'; + } + else{ + echo "Applicant does not get any Bonus amount or Incentives "; + } + } // 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']."

"; diff --git a/api/application/views/report_templates/JSONTOREPORT_SAL_SMARTPD.php b/api/application/views/report_templates/JSONTOREPORT_SAL_SMARTPD.php index 9dd44137..77c4a258 100644 --- a/api/application/views/report_templates/JSONTOREPORT_SAL_SMARTPD.php +++ b/api/application/views/report_templates/JSONTOREPORT_SAL_SMARTPD.php @@ -1198,14 +1198,6 @@ font-weight: bolder;; { echo "Applicant is getting ".$rupee_symbol.' '.$employeement_data['amount_paid_in_cash']." paid as cash and ".$rupee_symbol.' '.$employeement_data['amount_paid_through_bank']." as bank transfer."; } - if(isset($employeement_data['bonus_incentive'])){ - if($employeement_data['bonus_incentive'] > 0){ - 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.

'; - } - else{ - echo "Applicant does not get any Bonus amount or Incentives "; - } - } if(isset($employeement_data['sal_paid_regularly']) && $employeement_data['sal_paid_regularly'] == 'yes') { @@ -1226,6 +1218,15 @@ 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'])."

"; + + if(isset($employeement_data['bonus_incentive'])){ + if($employeement_data['bonus_incentive'] > 0){ + echo $employeement_data['bonus_incentive'] ? "

The applicant receives a bonus/incentives ( ".($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.

'; + } + else{ + echo "Applicant does not get any Bonus amount or Incentives "; + } + } // 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']."

"; diff --git a/api/application/views/report_templates/JSONTOREPORT_SAL_TELE_PD.php b/api/application/views/report_templates/JSONTOREPORT_SAL_TELE_PD.php index 5f9d2616..8afb19b7 100644 --- a/api/application/views/report_templates/JSONTOREPORT_SAL_TELE_PD.php +++ b/api/application/views/report_templates/JSONTOREPORT_SAL_TELE_PD.php @@ -1193,7 +1193,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); echo $employeement_data['any_delays'] == 'yes' ? '

As per person contacted, 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['bonus_incentive'] ? "

The applicant receives a bonus/incentive ( ".($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 "
***********************************";