diff --git a/ci4/app/Language/es/Tarifapreimpresion.php b/ci4/app/Language/es/Tarifapreimpresion.php index 80a0562a..f98cd490 100755 --- a/ci4/app/Language/es/Tarifapreimpresion.php +++ b/ci4/app/Language/es/Tarifapreimpresion.php @@ -7,6 +7,9 @@ return [ 'id' => 'ID', 'moduleTitle' => 'Tarifas Preimpresión', 'nombre' => 'Nombre', + 'code' => 'Código', + 'comment' => 'Comentario', + 'comment_placeholder' => 'Inserte un comentario', 'precio' => 'Precio', 'precioMin' => 'Precio Mínimo', 'importeFijo' => 'Importe Fijo', @@ -25,7 +28,16 @@ return [ 'required' => 'El campo {field} es obligatorio.', ], + 'code' => [ + 'max_length' => 'El campo {field} no puede exceder {param} caracteres en longitud.', + 'required' => 'El campo {field} es obligatorio.', + ], + 'comment' => [ + 'max_length' => 'El campo {field} no puede exceder {param} caracteres en longitud.', + 'required' => 'El campo {field} es obligatorio.', + + ], 'precio' => [ 'decimal' => 'El campo {field} debe contener un número decimal.', 'required' => 'El campo {field} es obligatorio.', diff --git a/ci4/app/Models/Tarifas/TarifapreimpresionModel.php b/ci4/app/Models/Tarifas/TarifapreimpresionModel.php index f59852be..56ed6999 100755 --- a/ci4/app/Models/Tarifas/TarifapreimpresionModel.php +++ b/ci4/app/Models/Tarifas/TarifapreimpresionModel.php @@ -43,6 +43,10 @@ class TarifapreimpresionModel extends \App\Models\BaseModel "label" => "Tarifapreimpresion.code", "rules" => "trim|required|max_length[5]", ], + "comment" => [ + "label" => "Tarifapreimpresion.comment", + "rules" => "trim|max_length[255]", + ], "precio" => [ "label" => "Tarifapreimpresion.precio", "rules" => "required|decimal", @@ -58,10 +62,14 @@ class TarifapreimpresionModel extends \App\Models\BaseModel "max_length" => "Tarifapreimpresion.validation.nombre.max_length", "required" => "Tarifapreimpresion.validation.nombre.required", ], - "nombre" => [ + "code" => [ "max_length" => "Tarifapreimpresion.validation.code.max_length", "required" => "Tarifapreimpresion.validation.code.required", ], + "comment" => [ + "max_length" => "Tarifapreimpresion.validation.comment.max_length", + "required" => "Tarifapreimpresion.validation.comment.required", + ], "precio" => [ "decimal" => "Tarifapreimpresion.validation.precio.decimal", "required" => "Tarifapreimpresion.validation.precio.required", diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php b/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php index 9080ce83..47df4f08 100644 --- a/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php +++ b/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php @@ -5,62 +5,83 @@ * + type="text" + id="nombre" + name="nombre" + required + maxLength="255" + class="form-control" + value="nombre) ?>"> + +
+ +
-
+ type="number" + id="precio" + name="precio" + required + maxLength="31" + step="0.01" + class="form-control" + value="precio) ?>">
- +
+ type="text" + id="margen" + name="margen" + required + class="form-control" + value="margen) ?>">
+ +
+ + +
+
mostrar_en_presupuesto == true ? 'checked' : ''; ?> - > + class="form-check-input" mostrar_en_presupuesto == true ? 'checked' : ''; ?>>
- \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php b/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php index 62334363..64c69e67 100644 --- a/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php +++ b/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php @@ -16,6 +16,7 @@ + @@ -28,6 +29,9 @@ nombre) || strlen($item->nombre) < 51 ? esc($item->nombre) : character_limiter(esc($item->nombre), 50) ?> + + code) ?> + precio) ?>