From 1fb9977094d689fe7c9ffeb01d42504f5837ae3b Mon Sep 17 00:00:00 2001
From: jaimejimenezortega <jaime0jimenez0ortega@gmail.com>
Date: Fri, 28 Jun 2024 20:45:41 +0200
Subject: [PATCH] a

---
 ci4/app/Language/en/Facturas.php                       |  2 --
 ci4/app/Language/es/Facturas.php                       |  2 --
 ci4/app/Models/Facturas/FacturaModel.php               |  4 +---
 .../themes/vuexy/form/facturas/viewFacturasList.php    | 10 ----------
 4 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/ci4/app/Language/en/Facturas.php b/ci4/app/Language/en/Facturas.php
index a03f164c..2645b729 100644
--- a/ci4/app/Language/en/Facturas.php
+++ b/ci4/app/Language/en/Facturas.php
@@ -51,8 +51,6 @@ return [
     'cheque' => 'Check',
     'compensada' => 'Compensated',
     'confirming' => 'Confirming',
-    'contado' => 'Cash',
-    'contrareembolso' => 'Cash on Delivery',
     'giroDocimiliado' => 'Direct Debit',
     'pagare' => 'Promissory Note',
     'transferencia' => 'Transfer',
diff --git a/ci4/app/Language/es/Facturas.php b/ci4/app/Language/es/Facturas.php
index 51458323..39bc6aa9 100644
--- a/ci4/app/Language/es/Facturas.php
+++ b/ci4/app/Language/es/Facturas.php
@@ -51,8 +51,6 @@ return [
         'cheque' => 'Cheque',
         'compensada' => 'Compensada',
         'confirming' => 'Confirming',
-        'contado' => 'Contado',
-        'contrareembolso' => 'Contrareembolso',
         'giroDomiciliado' => 'Giro domiciliado',
         'pagare' => 'Pagaré',
         'transferencia' => 'Transferencia',
diff --git a/ci4/app/Models/Facturas/FacturaModel.php b/ci4/app/Models/Facturas/FacturaModel.php
index 40b56d25..94895a80 100644
--- a/ci4/app/Models/Facturas/FacturaModel.php
+++ b/ci4/app/Models/Facturas/FacturaModel.php
@@ -72,9 +72,7 @@ class FacturaModel extends \App\Models\BaseModel {
                 "t1.id AS id, t1.numero AS numero, t1.fecha_factura_at AS fecha_factura_at, 
                 t2.nombre AS cliente, t1.base AS base, t1.total AS total, t1.pendiente AS pendiente,
                 t1.creditoAsegurado AS creditoAsegurado, t1.estado AS estado, t1.estado_pago AS estado_pago,
-                t4.nombre AS forma_pago, t3.fecha_vencimiento_at AS venciemento, 
-                DAFEDIFF(days, NOW(), t3.fecha_vencimiento_at) AS dias"
-                //'DATEDIFF((SELECT MIN(facturas_pagos.fecha_vencimiento_at) FROM facturas_pagos WHERE facturas_pagos.deleted_at is null and factura_id = facturas.id), facturas.fecha_factura_at) 
+                t4.nombre AS forma_pago, t3.fecha_vencimiento_at AS venciemento"
             );
 
         $builder->join("clientes t2", "t2.id = t1.cliente_id", "left");
diff --git a/ci4/app/Views/themes/vuexy/form/facturas/viewFacturasList.php b/ci4/app/Views/themes/vuexy/form/facturas/viewFacturasList.php
index 9c93d492..3ebdfc4b 100644
--- a/ci4/app/Views/themes/vuexy/form/facturas/viewFacturasList.php
+++ b/ci4/app/Views/themes/vuexy/form/facturas/viewFacturasList.php
@@ -27,7 +27,6 @@
                                 <th><?= lang('Facturas.estadoPago') ?></th>
                                 <th><?= lang('Facturas.formaPago') ?></th>
                                 <th><?= lang('Facturas.vencimiento') ?></th>
-                                <th><?= lang('Facturas.dias') ?></th>
                                 <th class="text-nowrap"><?= lang('Basic.global.Action') ?></th>
 							</tr>
 						</thead>
@@ -158,14 +157,6 @@
                             return '<?= lang('Facturas.confirming') ?>';
                             break;
 
-                        case "contado":
-                            return '<?= lang('Facturas.contado') ?>';
-                            break;
-
-                        case "contrareembolso":
-                            return '<?= lang('Facturas.contrareembolso') ?>';
-                            break;
-
                         case "giroDomiciliado":
                             return '<?= lang('Facturas.giroDomiciliado') ?>';
                             break;
@@ -186,7 +177,6 @@
                 }
             },
             { 'data': vencimiento },
-            { 'data': dias }
             { 'data': actionBtns }
         ]
     });