Skip to content

Commit

Permalink
correccion calculo TEA naviera
Browse files Browse the repository at this point in the history
  • Loading branch information
elsoftpy committed Sep 17, 2024
1 parent 76c7b76 commit 971158a
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 7 deletions.
5 changes: 3 additions & 2 deletions app/Detalle_encuesta.php
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,9 @@ public function getAdicionalesNavierasAttribute(){
$this->adicional_amarre +
$this->adicional_tipo_combustible +
$this->adicional_embarque +
$this->adicional_carga;

$this->adicional_carga +
$this->plus_rendimiento;

return $adicionales;

}
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/HomeController.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public function index()
$dbEncuestas = Cabecera_encuesta::where('empresa_id', $dbEmpresa->id)
->orderBy('id', 'DESC')
->get();
$dbEncuestaAnt = $dbEncuestas->get(1);
$dbEncuestaAnt = $dbEncuestas->get(1);

$club = $this->club($dbEmpresa->rubro_id);
return view('clientes.home')->with('dbEmpresa', $dbEmpresa)
Expand Down
6 changes: 5 additions & 1 deletion app/Http/Controllers/ReporteController.php
Original file line number Diff line number Diff line change
Expand Up @@ -1350,6 +1350,7 @@ public function resultadosExcel(Request $request){
$item->adicional_tipo_combustible +
$item->adicional_embarque +
$item->adicional_carga +
$item->plus_rendimiento +
( ( $item->fallo_caja +
$item->fallo_caja_ext +
$item->gratificacion_contrato +
Expand All @@ -1375,7 +1376,10 @@ public function resultadosExcel(Request $request){
// Efectivo Total Anual
if($rubro == 4){
$efectivoTotalAnual = $item->salario_anual +
$item->aguinaldo;
$item->aguinaldo +
$adicional +
$item->bono_anual +
$item->incentivo_largo_plazo;
}else{
$efectivoTotalAnual = $efectivoAnual +
$adicional +
Expand Down
4 changes: 2 additions & 2 deletions app/Traits/ClubsTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function club($rubro, $getImagen = null){
$club = "CARSA";
break;
case 30:
$imagen = "images/caratula-agro.PNG";
$imagen = "images/logo-carsa.png";
$club = "CARSA - sin svr";
break;
case 31:
Expand Down Expand Up @@ -146,7 +146,7 @@ public function club($rubro, $getImagen = null){
$club = "CARSA";
break;
case 30:
$imagen = "images/caratula-agro.PNG";
$imagen = "images/logo-carsa.png";
$club = "CARSA - sin svr";
break;
case 31:
Expand Down
5 changes: 4 additions & 1 deletion app/Traits/ReportTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,10 @@ public function segmenter( &$collection,
// Efectivo Total Anual
$detalle = $detalle->map(function($item){
$item['efectivo_total_anual'] = $item['salario_base'] * 12 +
$item['aguinaldo'];
$item['aguinaldo'] +
$item['adicionales_naviera'] +
$item['bono_anual'] +
$item['incentivo_largo_plazo'];
return $item;
});

Expand Down

0 comments on commit 971158a

Please sign in to comment.