From 3fcf88aa2afde097a64e06f33e60d1f521c34f52 Mon Sep 17 00:00:00 2001
From: imnavajas <imnavajas@coit.es>
Date: Mon, 2 Oct 2023 15:27:27 +0200
Subject: [PATCH] =?UTF-8?q?A=C3=B1adiendo=20funcionalidad=20a=20servicios?=
 =?UTF-8?q?=20presupuestos?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ci4/app/Language/en/Basic.php                 |  2 +
 ci4/app/Language/es/Basic.php                 |  2 +
 .../Presupuestos/PresupuestoAcabadoModel.php  | 45 +++----------------
 .../viewCosidotapablandaForm.php              |  4 +-
 4 files changed, 14 insertions(+), 39 deletions(-)

diff --git a/ci4/app/Language/en/Basic.php b/ci4/app/Language/en/Basic.php
index 9162821a..5e06aaf9 100644
--- a/ci4/app/Language/en/Basic.php
+++ b/ci4/app/Language/en/Basic.php
@@ -12,6 +12,8 @@ return [
 			'Close' => 'Close',
 			'Dashboard' => 'Dashboard',
 			'Delete' => 'Delete',
+            'Clone' => 'Clone',
+            'Print' => 'Print',
 			'Error' => 'Error',
 			'Groups' => 'Groups',
 			'Home' => 'Home',
diff --git a/ci4/app/Language/es/Basic.php b/ci4/app/Language/es/Basic.php
index 1dcfd513..8487a1d3 100644
--- a/ci4/app/Language/es/Basic.php
+++ b/ci4/app/Language/es/Basic.php
@@ -12,6 +12,8 @@ return [
 			'Close' => 'Cerrar',
 			'Dashboard' => 'Panel de control',
 			'Delete' => 'Borrar',
+            'Clone' => 'Duplicar',
+            'Print' => 'Imprimir',
 			'Error' => 'Error',
 			'Groups' => 'Grupos',
 			'Home' => 'Inicio',
diff --git a/ci4/app/Models/Presupuestos/PresupuestoAcabadoModel.php b/ci4/app/Models/Presupuestos/PresupuestoAcabadoModel.php
index 75db712c..6d541baa 100644
--- a/ci4/app/Models/Presupuestos/PresupuestoAcabadoModel.php
+++ b/ci4/app/Models/Presupuestos/PresupuestoAcabadoModel.php
@@ -15,13 +15,11 @@ class PresupuestoAcabadoModel extends \App\Models\GoBaseModel
 
     const SORTABLE = [
         0 => "t1.nombre",
-        1 => "t1.apellidos",
-        2 => "t1.cargo",
-        3 => "t1.telefono",
-        4 => "t1.email",
+        1 => "t1.precio",
+        2 => "t1.precio_unidad"
     ];
 
-    protected $allowedFields = ["cliente_id", "cargo", "nombre", "apellidos", "telefono", "email"];
+    protected $allowedFields = ["presupuesto_id", "tarifa_acabado_id", "nombre", "precio", "precio_unidad"];
     protected $returnType = "App\Entities\Presupuestos\PresupuestoAcabadosEntity";
 
     protected $useTimestamps = true;
@@ -33,45 +31,16 @@ class PresupuestoAcabadoModel extends \App\Models\GoBaseModel
     public static $labelField = "nombre";
 
     protected $validationRules = [
-        "apellidos" => [
-            "label" => "ClienteContactos.apellidos",
-            "rules" => "trim|max_length[500]",
-        ],
-        "cargo" => [
-            "label" => "ClienteContactos.cargo",
+        "precio" => [
+            "label" => "ClienteContactos.precio",
             "rules" => "trim|max_length[100]",
         ],
-        "email" => [
-            "label" => "ClienteContactos.email",
-            "rules" => "trim|max_length[150]|valid_email|permit_empty",
-        ],
-        "nombre" => [
-            "label" => "ClienteContactos.nombre",
-            "rules" => "trim|max_length[100]",
-        ],
-        "telefono" => [
-            "label" => "ClienteContactos.telefono",
-            "rules" => "trim|max_length[20]",
-        ],
     ];
 
     protected $validationMessages = [
-        "apellidos" => [
+        "precio" => [
             "max_length" => "ClienteContactos.validation.apellidos.max_length",
         ],
-        "cargo" => [
-            "max_length" => "ClienteContactos.validation.cargo.max_length",
-        ],
-        "email" => [
-            "max_length" => "ClienteContactos.validation.email.max_length",
-            "valid_email" => "ClienteContactos.validation.email.valid_email",
-        ],
-        "nombre" => [
-            "max_length" => "ClienteContactos.validation.nombre.max_length",
-        ],
-        "telefono" => [
-            "max_length" => "ClienteContactos.validation.telefono.max_length",
-        ],
     ];
 
     public function findAllWithClientes(string $selcols = "*", int $limit = null, int $offset = 0)
@@ -117,7 +86,7 @@ class PresupuestoAcabadoModel extends \App\Models\GoBaseModel
             ? $builder
             : $builder
                 ->groupStart()
-                ->like("t1.cargo", $search)
+                ->like("t1.nombre", $search)
                 ->orLike("t1.nombre", $search)
                 ->orLike("t1.apellidos", $search)
                 ->orLike("t1.telefono", $search)
diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaForm.php b/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaForm.php
index 5aa7a7b7..92f1abc1 100644
--- a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaForm.php
+++ b/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaForm.php
@@ -24,7 +24,9 @@
                         name="save"
                         value="<?= lang("Basic.global.Save") ?>"
                     />
-                    <?= anchor(route_to("cosidotapablandaList"), lang("Basic.global.Cancel"), ["class" => "btn btn-secondary float-start",]) ?> 	
+                    <?= anchor(route_to("#"), lang("Basic.global.Print"), ["class" => "btn btn-dark float-start me-sm-3 me-1",]) ?>
+                    <?= anchor(route_to("#"), lang("Basic.global.Clone"), ["class" => "btn btn-info float-start me-sm-3 me-1",]) ?>
+                    <?= anchor(route_to("cosidotapablandaList"), lang("Basic.global.Cancel"), ["class" => "btn btn-secondary float-start",]) ?>
                 </div>
 			</form>
         </div><!-- //.card -->