diff --git a/app/Console/Commands/CrearPedidosAprobadosViewCommand.php b/app/Console/Commands/CrearPedidosAprobadosViewCommand.php
index d4b08ac..378756b 100644
--- a/app/Console/Commands/CrearPedidosAprobadosViewCommand.php
+++ b/app/Console/Commands/CrearPedidosAprobadosViewCommand.php
@@ -36,7 +36,7 @@ class CrearPedidosAprobadosViewCommand extends Command
      *
      * @return int
      */
-    public function handle()
+    public function handle(): int
     {
     	DB::statement("
             CREATE OR REPLACE VIEW pedidos_aprobados
diff --git a/app/Filtros/Filtro.php b/app/Filtros/Filtro.php
index ea55739..737f27b 100644
--- a/app/Filtros/Filtro.php
+++ b/app/Filtros/Filtro.php
@@ -5,12 +5,15 @@ namespace App\Filtros;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
 use Illuminate\Database\Eloquent\Builder;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+use Throwable;
+use TypeError;
 
 class Filtro extends Model
 {
-    protected $request;
+    protected Request $request;
     protected $builder;
-    protected $MENSAJES_ERROR = [
+    protected array $MENSAJES_ERROR = [
     	'ARGUMENTO' => 'Argumento inválido para el parámetro %s. Revise la documentación.'
     ];
 
@@ -22,10 +25,10 @@ class Filtro extends Model
     /**
      * Apply all existing filters, if available.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $builder
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @param Builder $builder
+     * @return Builder
      */
-    public function aplicar(Builder $builder)
+    public function aplicar(Builder $builder): Builder
     {
         $this->builder = $builder;
 
@@ -47,11 +50,11 @@ class Filtro extends Model
 
             //Llamar métodos sin argumentos
             if ($valor === null|| (is_a($valor,'String') && trim($valor)=='')){ $this->$metodo(); continue; }
-            
+
             //Llamar métodos con argumentos
             try {
                 $this->$metodo($valor);
-            } catch (\Throwable $th) {
+            } catch (Throwable $th) {
                 if (is_a($th,'TypeError') ) { throw new HttpException(400, sprintf($this->MENSAJES_ERROR['ARGUMENTO'],$filtro)); }
                 throw $th;
             }
@@ -63,7 +66,7 @@ class Filtro extends Model
     //Buscar un término en el nombre
     public function nombre(String $valor)
     {
-        $this->builder->where('nombre', "LIKE", "%" . $valor . "%")->orderByRaw("IF(nombre = '{$valor}',2,IF(nombre LIKE '{$valor}%',1,0)) DESC");
+        $this->builder->where('nombre', "LIKE", "%" . $valor . "%")->orderByRaw("IF(nombre = '$valor',2,IF(nombre LIKE '$valor%',1,0)) DESC");
     }
 
     public function alfabetico(String $order = 'asc')
diff --git a/app/Filtros/FiltroDeProducto.php b/app/Filtros/FiltroDeProducto.php
index 93672c2..d7e7dc3 100644
--- a/app/Filtros/FiltroDeProducto.php
+++ b/app/Filtros/FiltroDeProducto.php
@@ -1,7 +1,6 @@
 <?php
 
 namespace App\Filtros;
-use Illuminate\Database\Eloquent\Builder;
 
 class FiltroDeProducto extends Filtro {
 
@@ -10,4 +9,4 @@ class FiltroDeProducto extends Filtro {
         $this->builder->where('categoria', $valor);
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Filtros/FiltroDeSubpedido.php b/app/Filtros/FiltroDeSubpedido.php
index 6fa8198..c889860 100644
--- a/app/Filtros/FiltroDeSubpedido.php
+++ b/app/Filtros/FiltroDeSubpedido.php
@@ -2,7 +2,7 @@
 
 namespace App\Filtros;
 
-use Illuminate\Database\Eloquent\Model;
+use TypeError;
 
 class FiltroDeSubpedido extends Filtro
 {
diff --git a/app/GrupoDeCompra.php b/app/GrupoDeCompra.php
index 482e2a3..655af8a 100644
--- a/app/GrupoDeCompra.php
+++ b/app/GrupoDeCompra.php
@@ -7,6 +7,7 @@ use App\Helpers\TransporteHelper;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Mpdf\Mpdf;
@@ -23,7 +24,7 @@ class GrupoDeCompra extends Model
         return $this->hasMany(Subpedido::class);
     }
 
-    public function toggleDevoluciones()
+    public function toggleDevoluciones(): bool
     {
         $this->devoluciones_habilitadas = !$this->devoluciones_habilitadas;
         $this->save();
@@ -117,7 +118,7 @@ class GrupoDeCompra extends Model
         $mpdf->Output($filename, "D");
     }
 
-    function pedidoParaPdf()
+    function pedidoParaPdf(): array
     {
         $productos = $this->productosPedidos(true);
         $pedido = [];
@@ -135,8 +136,6 @@ class GrupoDeCompra extends Model
             $pedido['productos'][] = $productoParaPdf;
         }
 
-        Log::debug($pedido);
-
         return $pedido;
     }
 
@@ -173,7 +172,7 @@ class GrupoDeCompra extends Model
     }
 
     //Asume que los productos están gruadados en orden de fila
-    public static function obtenerTemplateDeFilasVacias(int $columns)
+    public static function obtenerTemplateDeFilasVacias(int $columns): array
     {
         $productosFilaID = Producto::productosFilaID();
         $productosIDNombre = Producto::productosIDNombre();
@@ -197,7 +196,7 @@ class GrupoDeCompra extends Model
         CsvHelper::generarCsv('csv/exports/' . $this->nombre . '.csv', $records);
     }
 
-    public function generarColumnaCantidades()
+    public function generarColumnaCantidades(): array
     {
         $productos_en_pedido = $this->productosPedidos();
 
@@ -208,7 +207,7 @@ class GrupoDeCompra extends Model
         }
 
         $records = $this->obtenerTemplateDeFilasVacias(1);
-        $productos_id_fila = Producto::productosIdFila();
+        $productos_id_fila = Producto::productosIDFila();
         foreach ($productos_en_pedido as $id => $producto_pedido) {
             $fila = $productos_id_fila[$id];
             $records[$fila][1] = $producto_pedido->cantidad_pedida;
@@ -232,7 +231,7 @@ class GrupoDeCompra extends Model
         $pedidos = $this->pedidosAprobados();
         // Generar tabla vacía con una columna por núcleo
         $records = $this->obtenerTemplateDeFilasVacias($pedidos->count());
-        $productos_id_fila = Producto::productosIdFila();
+        $productos_id_fila = Producto::productosIDFila();
 
         foreach ($productos_en_pedido as $id => $producto_pedido) {
             $fila = $productos_id_fila[$id];
@@ -270,7 +269,7 @@ class GrupoDeCompra extends Model
             ->orderBy('nombre');
     }
 
-    public static function transportePorBarrio()
+    public static function transportePorBarrio(): array
     {
         $result = [];
         $barrios = GrupoDeCompra::barriosMenosPrueba()->get();
@@ -283,9 +282,9 @@ class GrupoDeCompra extends Model
     }
 
     /**
-     * @return \Illuminate\Support\Collection
+     * @return Collection
      */
-    public function productosPedidos($excluirBarriales = false): \Illuminate\Support\Collection
+    public function productosPedidos($excluirBarriales = false): Collection
     {
         $query = DB::table('pedidos_aprobados')
             ->where('grupo_de_compra_id', $this->id);
diff --git a/app/Helpers/CsvHelper.php b/app/Helpers/CsvHelper.php
index 96bce8f..95f2cfd 100644
--- a/app/Helpers/CsvHelper.php
+++ b/app/Helpers/CsvHelper.php
@@ -13,7 +13,7 @@ use League\Csv\Writer;
 class CsvHelper
 {
     public static function getRecords($filePath): Iterator {
-        $csv = Reader::createFromPath(resource_path($filePath), 'r');
+        $csv = Reader::createFromPath(resource_path($filePath));
         try {
             $csv->setDelimiter("|");
             $csv->setEnclosure("'");
@@ -34,7 +34,7 @@ class CsvHelper
             }
             $writer->insertAll($contenido);
         } catch (CannotInsertRecord $e) {
-            var_export($e->getRecords());
+            Log::error($e->getMessage(), $e->getTrace());
         }
     }
 }
diff --git a/app/Helpers/TransporteHelper.php b/app/Helpers/TransporteHelper.php
index 52c6c6b..49ec37f 100644
--- a/app/Helpers/TransporteHelper.php
+++ b/app/Helpers/TransporteHelper.php
@@ -3,7 +3,6 @@
 namespace App\Helpers;
 
 use App\CanastaLog;
-use Exception;
 use Illuminate\Support\Facades\Log;
 
 class TransporteHelper
diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
index 764f7a7..44165ac 100644
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@@ -3,8 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\GrupoDeCompra;
-use Illuminate\Http\Request;
-use Response;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
 class AdminController extends Controller
 {
@@ -18,16 +17,18 @@ class AdminController extends Controller
     }
 
     public function exportarPedidosAPdf(GrupoDeCompra $gdc) {
-        return $gdc->exportarPedidosAPdf();
+        $gdc->exportarPedidosAPdf();
     }
 
-    public function exportarPedidoACSV(GrupoDeCompra $gdc) {
+    public function exportarPedidoACSV(GrupoDeCompra $gdc): BinaryFileResponse
+    {
         $gdc->exportarPedidoEnCSV();
         $file = resource_path('csv/exports/'.$gdc->nombre.'.csv');
         return response()->download($file);
     }
 
-    public function exportarPedidoConNucleosACSV(GrupoDeCompra $gdc) {
+    public function exportarPedidoConNucleosACSV(GrupoDeCompra $gdc): BinaryFileResponse
+    {
         $gdc->exportarPedidoConNucleosEnCSV();
         $file = resource_path('csv/exports/'.$gdc->nombre.'-completo.csv');
         return response()->download($file);
diff --git a/app/Http/Controllers/Api/ProductoController.php b/app/Http/Controllers/Api/ProductoController.php
index 57f27fd..ed66c1f 100644
--- a/app/Http/Controllers/Api/ProductoController.php
+++ b/app/Http/Controllers/Api/ProductoController.php
@@ -10,24 +10,11 @@ use App\Producto;
 
 class ProductoController extends Controller
 {
-    /**
-     * Mostrar una lista de productos.
-     *
-     * @param App\Filtros\FiltroDeProducto $filtros
-     * @param \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
     public function index(FiltroDeProducto $filtros, Request $request)
     {
         return ProductoResource::collection(Producto::filtrar($filtros)->paginate(Producto::getPaginar($request)));
     }
 
-    /**
-     * Display the specified resource.
-     *
-     * @param  \App\Producto  $producto
-     * @return \Illuminate\Http\Response
-     */
     public function show(Producto $producto)
     {
         return new ProductoResource($producto);
diff --git a/app/Http/Controllers/Api/SubpedidoController.php b/app/Http/Controllers/Api/SubpedidoController.php
index 4bd090a..d17d571 100644
--- a/app/Http/Controllers/Api/SubpedidoController.php
+++ b/app/Http/Controllers/Api/SubpedidoController.php
@@ -15,13 +15,6 @@ use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class SubpedidoController extends Controller
 {
-    /**
-     * Mostrar una lista de productos.
-     *
-     * @param App\Filtros\FiltroDeSubpedido $filtros
-     * @param \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
     public function index(FiltroDeSubpedido $filtros, Request $request)
     {
         return Subpedido::filtrar($filtros)->get();
@@ -32,12 +25,6 @@ class SubpedidoController extends Controller
         return SubpedidoResource::collection(Subpedido::filtrar($filtros)->get());
     }
 
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
     public function store(Request  $request)
     {
         $validado = $this->validateSubpedido();
@@ -51,7 +38,8 @@ class SubpedidoController extends Controller
         return $s;
     }
 
-    protected function validateSubpedido(){
+    protected function validateSubpedido(): array
+    {
         return request()->validate([
             'nombre'                => 'required|max:255',
             'grupo_de_compra_id'    => [
@@ -61,12 +49,6 @@ class SubpedidoController extends Controller
         ]);
     }
 
-    /**
-     * Display the specified resource.
-     *
-     * @param  \App\Subpedido  $subpedido
-     * @return \Illuminate\Http\Response
-     */
     public function show(Subpedido $subpedido)
     {
         return new SubpedidoResource($subpedido);
diff --git a/app/Http/Controllers/ComprasController.php b/app/Http/Controllers/ComprasController.php
index e23ad43..2aef574 100644
--- a/app/Http/Controllers/ComprasController.php
+++ b/app/Http/Controllers/ComprasController.php
@@ -5,7 +5,9 @@ namespace App\Http\Controllers;
 use App\GrupoDeCompra;
 use App\Helpers\CanastaHelper;
 use App\Producto;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
 class ComprasController
 {
@@ -15,13 +17,15 @@ class ComprasController
         return view('compras_pedidos');
     }
 
-    public function descargarPedidos() {
+    public function descargarPedidos(): BinaryFileResponse
+    {
         Producto::planillaTotales();
         $file = resource_path('csv/exports/pedidos-por-barrio.csv');
         return response()->download($file);
     }
 
-    public function descargarNotas() {
+    public function descargarNotas(): BinaryFileResponse
+    {
         Producto::planillaNotas();
         $file = resource_path('csv/exports/notas-por-barrio.csv');
         return response()->download($file);
@@ -36,7 +40,7 @@ class ComprasController
         return view('auth/compras_login');
     }
 
-    public function cargarCanasta(Request $request)
+    public function cargarCanasta(Request $request): JsonResponse
     {
         $request->validate([
             'data' => 'required|file|mimes:csv,txt|max:2048',
@@ -47,10 +51,11 @@ class ComprasController
 
         return response()->json([
             'message' => 'Canasta cargada exitosamente',
-        ], 200);
+        ]);
     }
 
-    public function descargarCanastaEjemplo() {
+    public function descargarCanastaEjemplo(): BinaryFileResponse
+    {
         $file = resource_path('csv/productos.csv');
         return response()->download($file);
     }
diff --git a/app/Http/Controllers/ProductoController.php b/app/Http/Controllers/ProductoController.php
index c7577d6..99391d8 100644
--- a/app/Http/Controllers/ProductoController.php
+++ b/app/Http/Controllers/ProductoController.php
@@ -2,8 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-
 class ProductoController extends Controller
 {
     /**
@@ -16,11 +14,6 @@ class ProductoController extends Controller
         $this->middleware(['auth','subpedido']);
     }
 
-    /**
-     * Show the application dashboard.
-     *
-     * @return \Illuminate\Contracts\Support\Renderable
-     */
     public function index()
     {
         return view('productos');
diff --git a/app/Http/Middleware/Admin.php b/app/Http/Middleware/Admin.php
index 6eed291..df3fdb1 100644
--- a/app/Http/Middleware/Admin.php
+++ b/app/Http/Middleware/Admin.php
@@ -3,18 +3,12 @@
 namespace App\Http\Middleware;
 
 use Closure;
-use Auth;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Http\Request;
 
 class Admin
 {
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed
-     */
-    public function handle($request, Closure $next)
+    public function handle(Request $request, Closure $next)
     {
         $user = Auth::user();
         if ($user->is_admin) {
diff --git a/app/Http/Middleware/Subpedido.php b/app/Http/Middleware/Subpedido.php
index 66e8051..3319847 100644
--- a/app/Http/Middleware/Subpedido.php
+++ b/app/Http/Middleware/Subpedido.php
@@ -3,17 +3,18 @@
 namespace App\Http\Middleware;
 
 use Closure;
+use Illuminate\Http\Request;
 
 class Subpedido
 {
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
+     * @param Request $request
+     * @param Closure $next
      * @return mixed
      */
-    public function handle($request, Closure $next)
+    public function handle(Request $request, Closure $next)
     {
         if (!session('subpedido_nombre') || !session('subpedido_id')) {
             return redirect()->route('subpedidos.create');
diff --git a/app/Http/Resources/GrupoDeCompraResource.php b/app/Http/Resources/GrupoDeCompraResource.php
index 3ff9cce..58a025b 100644
--- a/app/Http/Resources/GrupoDeCompraResource.php
+++ b/app/Http/Resources/GrupoDeCompraResource.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources;
 
+use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class GrupoDeCompraResource extends JsonResource
@@ -9,10 +10,10 @@ class GrupoDeCompraResource extends JsonResource
     /**
      * Transform the resource into an array.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  Request  $request
      * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,
@@ -23,8 +24,8 @@ class GrupoDeCompraResource extends JsonResource
             'total_barrial' => number_format($this->totalBarrial(),2),
             'total_devoluciones' => number_format($this->totalDevoluciones(),2),
             'total_a_transferir' => number_format($this->totalATransferir(),2),
-            'total_transporte' => number_format($this->totalTransporte(),0),
-            'cantidad_transporte' => number_format($this->cantidadTransporte(),0),
+            'total_transporte' => number_format($this->totalTransporte()),
+            'cantidad_transporte' => number_format($this->cantidadTransporte()),
         ];
     }
 }
diff --git a/app/Http/Resources/ProductoResource.php b/app/Http/Resources/ProductoResource.php
index 4040989..677af54 100644
--- a/app/Http/Resources/ProductoResource.php
+++ b/app/Http/Resources/ProductoResource.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources;
 
+use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class ProductoResource extends JsonResource
@@ -9,10 +10,10 @@ class ProductoResource extends JsonResource
     /**
      * Transform the resource into an array.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  Request  $request
      * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,
diff --git a/app/Http/Resources/SubpedidoResource.php b/app/Http/Resources/SubpedidoResource.php
index d0da61f..98fd733 100644
--- a/app/Http/Resources/SubpedidoResource.php
+++ b/app/Http/Resources/SubpedidoResource.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources;
 
+use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class SubpedidoResource extends JsonResource
@@ -9,10 +10,10 @@ class SubpedidoResource extends JsonResource
     /**
      * Transform the resource into an array.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  Request  $request
      * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,
@@ -21,8 +22,8 @@ class SubpedidoResource extends JsonResource
             'productos' => $this->productos,
             'aprobado' => (bool) $this->aprobado,
             'total' => number_format($this->total(),2),
-            'total_transporte' => number_format($this->totalTransporte(),0),
-            'cantidad_transporte' => number_format($this->cantidadTransporte(),0),
+            'total_transporte' => number_format($this->totalTransporte()),
+            'cantidad_transporte' => number_format($this->cantidadTransporte()),
             'total_sin_devoluciones' => number_format($this->totalSinDevoluciones(),2),
             'devoluciones_total' => number_format($this->devoluciones_total,2),
             'devoluciones_notas' => $this->devoluciones_notas
diff --git a/app/Producto.php b/app/Producto.php
index 96065c2..d7d727b 100644
--- a/app/Producto.php
+++ b/app/Producto.php
@@ -5,7 +5,10 @@ namespace App;
 use App\Filtros\FiltroDeProducto;
 use App\Helpers\CsvHelper;
 use App\Helpers\TransporteHelper;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
@@ -15,50 +18,45 @@ class Producto extends Model
 {
     public $timestamps = false;
     protected $fillable = ["nombre", "precio", "presentacion", "stock", "categoria"];
-    static $paginarPorDefecto = 10;
+    static int $paginarPorDefecto = 10;
 
-    public function subpedidos()
+    public function subpedidos(): BelongsToMany
     {
         return $this->belongsToMany('App\Subpedido', 'productos_subpedidos')->withPivot(["cantidad", "notas"]);
     }
 
-    public function proveedor()
+    public function proveedor(): BelongsTo
     {
         return $this->belongsTo('App\Proveedor');
     }
 
-    public function pagaTransporte()
-    {
-        return !($this->bono || Str::contains($this->categoria, 'SUBSIDIADO'));
-    }
-
     //Este método permite que se apliquen los filtros al hacer una request (por ejemplo, de búsqueda)
-    public function scopeFiltrar($query, FiltroDeProducto $filtros)
+    public function scopeFiltrar($query, FiltroDeProducto $filtros): Builder
     {
         return $filtros->aplicar($query);
     }
 
-    public static function getPaginar(Request $request)
+    public static function getPaginar(Request $request): int
     {
         return $request->has('paginar') && intval($request->input('paginar')) ? intval($request->input('paginar')) : self::$paginarPorDefecto;
     }
 
     public static function productosFilaID()
     {
-        return Producto::pluck('id', 'fila',)->all();
+        return Producto::pluck('id', 'fila')->all();
     }
 
     public static function productosIDFila()
     {
-        return Producto::pluck('fila', 'id',)->all();
+        return Producto::pluck('fila', 'id')->all();
     }
 
     public static function productosIDNombre()
     {
-        return Producto::pluck('nombre', 'id',)->all();
+        return Producto::pluck('nombre', 'id')->all();
     }
 
-    static public function cantidadesPorBarrio()
+    static public function cantidadesPorBarrio(): Collection
     {
         $barrios = GrupoDeCompra::barriosMenosPrueba()
             ->pluck('id', 'nombre');
diff --git a/app/Proveedor.php b/app/Proveedor.php
index 20af175..07dbc40 100644
--- a/app/Proveedor.php
+++ b/app/Proveedor.php
@@ -3,14 +3,15 @@
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class Proveedor extends Model
 {
   public $timestamps = false;
   protected $fillable = [ "nombre","direccion","telefono","correo","comentario" ];
   protected $table = 'proveedores';
-  
-  public function productos()
+
+  public function productos(): HasMany
   {
     return $this->hasMany('App\Producto');
   }
diff --git a/app/Subpedido.php b/app/Subpedido.php
index 0915b3f..0370020 100644
--- a/app/Subpedido.php
+++ b/app/Subpedido.php
@@ -3,40 +3,30 @@
 namespace App;
 
 use App\Helpers\TransporteHelper;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Support\Facades\DB;
-use Log;
 use App\Filtros\FiltroDeSubpedido;
 
 class Subpedido extends Model
 {
-    const COSTO_TRANSPORTE = 15;
     public $timestamps = false;
     protected $fillable = ['grupo_de_compra_id', 'aprobado', 'nombre', 'devoluciones_total', 'devoluciones_notas'];
 
-    public function productos()
+    public function productos(): BelongsToMany
     {
         return $this->belongsToMany('App\Producto')->withPivot(["cantidad", "total", "notas"]);
     }
 
-    //Bonos del MPS, Sororo, etc. NO devuelve bonos de transporte
-    private function bonos()
-    {
-        return $this->productos()->where('bono', 1);
-    }
-
-    public function productosSinBonos()
-    {
-        return $this->productos()->where('bono', false);
-    }
-
-    public function grupoDeCompra()
+    public function grupoDeCompra(): BelongsTo
     {
         return $this->belongsTo('App\GrupoDeCompra');
     }
 
     // Permite que se apliquen los filtros al hacer una request (por ejemplo, de búsqueda)
-    public function scopeFiltrar($query, FiltroDeSubpedido $filtros)
+    public function scopeFiltrar($query, FiltroDeSubpedido $filtros): Builder
     {
         return $filtros->aplicar($query);
     }
diff --git a/app/User.php b/app/User.php
index 9d9c786..5f45a74 100644
--- a/app/User.php
+++ b/app/User.php
@@ -2,7 +2,7 @@
 
 namespace App;
 
-use Illuminate\Contracts\Auth\MustVerifyEmail;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 
@@ -38,7 +38,7 @@ class User extends Authenticatable
     ];
 
 
-    public function grupoDeCompra()
+    public function grupoDeCompra(): BelongsTo
     {
         return $this->belongsTo('App\GrupoDeCompra');
     }
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index 741edea..2955bd8 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -1,9 +1,10 @@
 <?php
 
-/** @var \Illuminate\Database\Eloquent\Factory $factory */
+/** @var Factory $factory */
 
 use App\User;
 use Faker\Generator as Faker;
+use Illuminate\Database\Eloquent\Factory;
 use Illuminate\Support\Str;
 
 /*
diff --git a/routes/api.php b/routes/api.php
index 145e22b..1da4274 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -1,8 +1,5 @@
 <?php
 
-use App\Filtros\FiltroDeProducto;
-use App\Filtros\FiltroDeSubpedido;
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Route;
 use App\GrupoDeCompra;
 use App\Producto;
diff --git a/routes/web.php b/routes/web.php
index 78ec7c2..87ab4af 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,6 +1,9 @@
 <?php
 
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Facades\URL;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 /*
 |--------------------------------------------------------------------------
@@ -26,10 +29,9 @@ Route::get('/productos', 'ProductoController@index')->name('productos.index');
 Route::get('/admin', 'AdminController@show')->name('admin_login.show');
 
 Route::get('/admin/obtener_sesion', function() {
-    $sesion = [
+    return [
         'gdc' => session("admin_gdc")
     ];
-    return $sesion;
 })->name('admin_obtener_sesion');
 
 Route::middleware(['auth', 'admin'])->group( function () {
@@ -64,14 +66,13 @@ Route::middleware('auth')->group( function() {
 		})->name('guardarSesion');
 
 		Route::get('obtener_sesion', function() {
-			$sesion = [
-				'subpedido' => [
-					'nombre' => session("subpedido_nombre"),
-					'id' => session("subpedido_id")
-				],
+            return [
+                'subpedido' => [
+                    'nombre' => session("subpedido_nombre"),
+                    'id' => session("subpedido_id")
+                ],
                 'gdc' => session("gdc")
-			];
-	        return $sesion;
+            ];
 		})->name('obtenerSesion');
 	});
 });