From 3ed21d43562fccbe19343ce282dd7a7c74189841 Mon Sep 17 00:00:00 2001 From: Velz2020 Date: Fri, 3 Jan 2020 13:28:57 +0530 Subject: [PATCH] SAL REPORT REMODIFIED --- api/application/controllers/PD_Controller.php | 4 +- api/application/libraries/AWS_S3.php | 2 +- .../report_templates/JSONTOREPORT_SAL.php | 81 ++++++++++--------- 3 files changed, 44 insertions(+), 43 deletions(-) diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 83e1cd01..815f7d80 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -4897,7 +4897,7 @@ public function getPDFormDetailsJSON_post() { //$result_array[0]['content'] $where_condition_array = array("pd_id" => $pdid); - $temp_array['is_zip_created'] = 1; + $temp_array['is_img_pdf_created'] = 1; $id = $this->PD_Model->updateRecords($temp_array,PDTRIGGER,$where_condition_array); unlink($output_file2); } @@ -4905,7 +4905,6 @@ public function getPDFormDetailsJSON_post() $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucketname,$key,'+30 minutes'); - $response_data['dataStatus'] = true; $response_data['status'] = REST_Controller::HTTP_OK; $response_data['records'] = $singed_uri; @@ -5791,6 +5790,7 @@ public function getPDFormDetailsJSON_post() public function codeigniterViewTest_post() { + //print_r($this->aws_s3->createNewBucket('len3'));die(); //satellite_image::getSatelliteImage(886);die(); //echo $this->assignPDTempalate(1325);die(); //$this->getSatelliteImage(342);die();//velmurugan.s@venbainfotech.com diff --git a/api/application/libraries/AWS_S3.php b/api/application/libraries/AWS_S3.php index 4f5c290b..c01a43ba 100644 --- a/api/application/libraries/AWS_S3.php +++ b/api/application/libraries/AWS_S3.php @@ -75,7 +75,7 @@ class AWS_S3 } catch (AwsException $e) { $result = false; - log_message('ERRROR',$e); + log_message('ERROR',$e); } return $result; diff --git a/api/application/views/report_templates/JSONTOREPORT_SAL.php b/api/application/views/report_templates/JSONTOREPORT_SAL.php index 761c9201..0ebe3a83 100644 --- a/api/application/views/report_templates/JSONTOREPORT_SAL.php +++ b/api/application/views/report_templates/JSONTOREPORT_SAL.php @@ -1132,61 +1132,62 @@ defined('BASEPATH') OR exit('No direct script access allowed'); 'both bank transfer and cash','bank_transfer' => 'bank transfer'); + $salary_mode_text = array('both_bank_transfer_cash' => 'both bank and cash','bank_transfer' => 'bank transfer'); if(isset($pd_processed_forms[12])) { $employeement_data = json_decode($pd_processed_forms[12][0]['processed_json'],true); } - //print_r($employeement_data); + //print_r($employeement_data); die(); if(count($employeement_data)) { - echo "

Employement Information

" ; - echo "

Employer Name : ". $employeement_data['employer_name'] ."

" ; + echo "

Employment Information

" ; + echo "

Employer Name : ". explode('-', $employeement_data['employer_name'])[1] ."

" ; echo "

Company Profile : ". $employeement_data['employer_in_brief'] ."

" ; - echo !($employeement_data['total_business_experience'] == $employeement_data['how_long_year'])? ("

Out of ".$employeement_data['total_business_experience']." Yr(s) of total experience, t") :"

T"; - echo "he 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." ; - echo $employeement_data['total_business_previous_experience'] ? ("
Previous Work Experience : ".$employeement_data['total_business_previous_experience']) : '';echo "

"; - echo "

During PD visit, ". ($employeement_data['was_met'] == 'no'? 'the employer was not met.' : $employeement_data['name_person_met'].' '.$employeement_data['designation_person_met_master'] .' the firm has been met'); - echo ($employeement_data['confirm_salary'] == 'no'? ' and salary amount was not confirmed because '.$employeement_data['sal_amount_was_not_confirmed'] : ' and '.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($employeement_data['confirm_salary_amount']).' ('.(MYUTIL::numtowords($employeement_data['confirm_salary_amount'])).') was confirmed as salary.'); - if($employeement_data['attendance_seen'] == $employeement_data['sal_reg_seen'] ) - { - if($employeement_data['attendance_seen'] == 'no') - { - echo " During PD visit, both Attendance Register and Salary register were not seen.

"; - } - else - { - echo " During PD visit, both Attendance Register and Salary register were seen.

"; - } - } - else - { - echo " During PD visit, Attendance Register ".($employeement_data['attendance_seen'] == 'no'? ' was not seen ' : 'was seen ').' and '.($employeement_data['sal_reg_seen'] == 'no' ? 'Salary register was not seen. ': 'Salary register was seen .') ."

"; - } + + 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." ; + + echo "Applicant has total work experience of ". $employeement_data['how_long_month']." years.

"; + + echo $employeement_data['total_business_previous_experience'] ? ("

Previously, applicant : ".$employeement_data['total_business_previous_experience']) : ''; + + echo $employeement_data['was_met'] == 'no'? "

No one was met at the visited premises who could confirm the employment details of loan applicant.

":"

During PD visit, ".$employeement_data['name_person_met'].' ( '. ($employeement_data['others_person_met'] ? $employeement_data['others_person_met'] : $employeement_data['designation_person_met_master']) .' ) was met at the visited premises.'; + + echo ($employeement_data['confirm_salary'] == 'no'? '

Salary amount was not confirmed because '.$employeement_data['sal_amount_was_not_confirmed'].'

' : '

Salary amount confirmed by person met is '.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($employeement_data['confirm_salary_amount']).'.

'); + + + echo $employeement_data['attendance_seen'] == 'no' ? "

Attendance Register was not seen during visit.

": "

Attendance register was seen during visit.

"; + + echo $employeement_data['sal_reg_seen'] == 'no' ? "

Salary register was not seen during visit.

": "

Salary register was seen during visit.

"; + + - echo "

Salary is 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 as ".$salary_mode_text [ $employeement_data['mode_of_getting_salary'] ]." and "; + 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['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']."(".MYUTIL::numtowords($employeement_data['amount_paid_in_cash']).") entire salary is paid as and ".$rupee_symbol.' '.$employeement_data['amount_paid_through_bank']."(".MYUTIL::numtowords($employeement_data['amount_paid_through_bank']).") as bank transfer"; - } - else if(isset($employeement_data['amount_paid_in_cash']) && $employeement_data['amount_paid_in_cash']) - { - echo "entire salary is paid as cash."; - } - else if(isset($employeement_data['amount_paid_through_bank']) && $employeement_data['amount_paid_through_bank']) - { - echo "entire salary is paid as bank transfer."; + echo $rupee_symbol.' '.$employeement_data['amount_paid_in_cash']." paid as cash and ".$rupee_symbol.' '.$employeement_data['amount_paid_through_bank']." as bank transfer"; } + // else if(isset($employeement_data['amount_paid_in_cash']) && $employeement_data['amount_paid_in_cash']) + // { + // echo "entire salary is paid as cash."; + // } + // else if(isset($employeement_data['amount_paid_through_bank']) && $employeement_data['amount_paid_through_bank']) + // { + // echo "entire salary is paid as bank transfer."; + // } - echo "applicant gets ". $rupee_symbol."". MYUTIL::customIndianNumberFormat($employeement_data['gross_monthly_salary'])." (".MYUTIL::numtowords($employeement_data['gross_monthly_salary']).") monthly gross salary and ".$rupee_symbol."". MYUTIL::customIndianNumberFormat($employeement_data['net_monthly_salary'])." (".MYUTIL::numtowords($employeement_data['net_monthly_salary']).") monthly net salary."; - echo $employeement_data['net_monthly_salary'] == 'Yes' ? 'there is a delay in salary payment.' : 'Generally there is no delay in salary payment.'; - echo "

"; + 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['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'])." ( " .MYUTIL::numtowords($employeement_data['bonus_incentive']).") "." ".$employeement_data['bonus_frequency_master'].'.': ''; - echo "

"; - echo "

".$employeement_data['id_card_issued_company'] == 'yes' ? 'ID card issued by employer was seen by PD officer.(image attatched end of the report)': 'ID card issued by employer was not seen by PD officer.'."

"; + 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['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 "
***********************************"; }