diff --git a/app/Http/Controllers/ReporteController.php b/app/Http/Controllers/ReporteController.php index f0b2ba4..3d60552 100644 --- a/app/Http/Controllers/ReporteController.php +++ b/app/Http/Controllers/ReporteController.php @@ -779,7 +779,7 @@ private function cargaDetalle($item, &$itemArray){ $this->cargador($value, $itemArray, true); $salarioEmpresa = intval(str_replace(".", "", $value["Empresa"])); break; - case Lang::get('reportReport.concept_concept_annual_cash'): + case Lang::get('reportReport.concept_annual_cash'): $this->cargador($value, $itemArray, false); break; case Lang::get('reportReport.variable_pay'): @@ -1448,7 +1448,7 @@ private function segmenter( &$collection, $segmento, $dbCargo); - // Efectivo Total Anual + // Efectivo Anual Garantizado $detalle = $detalle->map(function($item){ $item['efectivo_total_anual'] = $item['efectivo_anual_garantizado'] + $item['plus_rendimiento']+ @@ -1474,7 +1474,7 @@ private function segmenter( &$collection, $this->pusher( $collection, $countCasos, - Lang::get('reportReport.concept_annual_cash_total'), + Lang::get('reportReport.concept_annual_cash'), $efectivoTotalMin, $efectivoTotalMax, $efectivoTotalProm, @@ -1668,7 +1668,7 @@ private function segmenter( &$collection, $this->pusher( $collection, $countCasos, - Lang::get('reportReport.concept_annual_cash_total'), + Lang::get('reportReport.concept_annual_cash'), $efectivoMin, $efectivoMax, $efectivoProm, diff --git a/resources/lang/en/reportReport.php b/resources/lang/en/reportReport.php index 78de080..5aba989 100644 --- a/resources/lang/en/reportReport.php +++ b/resources/lang/en/reportReport.php @@ -25,7 +25,7 @@ "title_national" => "Local", "title_international" => "International", "chart_salary" => "Monthly Base Salary", - "chart_annual_cash" => "Annual Guaranted Cash", + "chart_annual_cash" => "Annual Guaranteed Cash", "chart_total_comp" => "Annual Total Compensation", "concept_salary" => "Monthly Base Salary", "concept_annual_salary" => "Annual Base Salary", diff --git a/resources/views/report/report.blade.php b/resources/views/report/report.blade.php index 67d99d1..3aa5a08 100644 --- a/resources/views/report/report.blade.php +++ b/resources/views/report/report.blade.php @@ -37,7 +37,12 @@ @endif