From 20b2bdc6c6a28a41de801c950b99b7302c9d384a Mon Sep 17 00:00:00 2001
From: Aldarien <aldarien85@gmail.com>
Date: Fri, 22 Dec 2023 13:17:03 -0300
Subject: [PATCH] FIX: Cuotas vigentes

---
 app/resources/views/ventas/pies/cuotas/add.blade.php |  2 +-
 app/src/Model/Venta/Pie.php                          | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/resources/views/ventas/pies/cuotas/add.blade.php b/app/resources/views/ventas/pies/cuotas/add.blade.php
index 22764c3..47cae41 100644
--- a/app/resources/views/ventas/pies/cuotas/add.blade.php
+++ b/app/resources/views/ventas/pies/cuotas/add.blade.php
@@ -23,7 +23,7 @@
                     </tr>
                 </thead>
                 <tbody id="cuotas">
-                @for ($i = count($pie->cuotas()); $i < $pie->cuotas - count($pie->cuotas()); $i ++)
+                @for ($i = count($pie->cuotas()); $i < $pie->cuotas - count($pie->cuotas(vigentes: true)); $i ++)
                     <tr>
                         <td>{{$i + 1}}</td>
                         <td>
diff --git a/app/src/Model/Venta/Pie.php b/app/src/Model/Venta/Pie.php
index 666ff59..30cfd12 100644
--- a/app/src/Model/Venta/Pie.php
+++ b/app/src/Model/Venta/Pie.php
@@ -15,16 +15,21 @@ class Pie extends Model
     public ?Pago $reajuste;
 
     public array $cuotasArray;
-    public function cuotas(bool $pagadas = false): array
+    public function cuotas(bool $pagadas = false, bool $vigentes = false): array
     {
         if ($this->asociado !== null) {
             return $this->asociado->cuotas($pagadas);
         }
-        if (!$pagadas) {
+        if (!$pagadas and !$vigentes) {
             return $this->cuotasArray;
         }
+        if ($pagadas) {
+            return array_filter($this->cuotasArray, function(Cuota $cuota) {
+                return $cuota->pago->currentEstado->tipoEstadoPago->descripcion !== 'no pagado';
+            });
+        }
         return array_filter($this->cuotasArray, function(Cuota $cuota) {
-            return $cuota->pago->currentEstado->tipoEstadoPago->descripcion !== 'no pagado';
+            return $cuota->pago->currentEstado->tipoEstadoPago->active === 1;
         });
     }