Merge branch 'main' into 'dev/ui-ajustes'

# Conflicts:
#   ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php
#   ci4/app/Language/es/Tarifaacabado.php
#   ci4/app/Language/es/Tarifamanipulado.php
#   ci4/app/Language/es/Tarifapreimpresion.php
#   ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php
This commit is contained in:
Ignacio Martinez Navajas
2023-07-13 20:00:25 +00:00
25 changed files with 1164 additions and 31 deletions

View File

@ -0,0 +1,36 @@
<?php
namespace App\Entities\Configuracion;
use CodeIgniter\Entity;
class MaquinasDefectoEntity extends \CodeIgniter\Entity\Entity
{
protected $attributes = [
"id" => null,
"tipo" => null,
"ancho_min" => 0.0,
"ancho_max" => 0.0,
"alto_min" => 0.0,
"alto_max" => 0.0,
"tirada_min" => 1,
"tirada_max" => 10000,
"maquina_id" => null,
"user_created_id" => 0,
"user_updated_id" => 0,
"is_deleted" => 0,
"created_at" => null,
"updated_at" => null,
];
protected $casts = [
"ancho_min" => "float",
"ancho_max" => "float",
"alto_min" => "float",
"alto_max" => "float",
"tirada_min" => "int",
"tirada_max" => "int",
"maquina_id" => "int",
"user_created_id" => "int",
"user_updated_id" => "int",
"is_deleted" => "int",
];
}

View File

@ -12,7 +12,7 @@ class TarifaManipuladoEntity extends \CodeIgniter\Entity\Entity
"precio_min" => 0,
"importe_fijo" => 0,
"user_created_id" => 0,
"user_update_id" => 0,
"user_updated_id" => 0,
"is_deleted" => 0,
"deleted_at" => null,
"created_at" => null,
@ -22,7 +22,7 @@ class TarifaManipuladoEntity extends \CodeIgniter\Entity\Entity
"precio_min" => "float",
"importe_fijo" => "float",
"user_created_id" => "int",
"user_update_id" => "int",
"user_updated_id" => "int",
"is_deleted" => "int",
];
}

View File

@ -11,7 +11,7 @@ class TarifaacabadoEntity extends \CodeIgniter\Entity\Entity
"precio_min" => 0,
"importe_fijo" => 0,
"user_created_id" => 0,
"user_update_id" => 0,
"user_updated_id" => 0,
"is_deleted" => 0,
"deleted_at" => null,
"created_at" => null,
@ -21,7 +21,7 @@ class TarifaacabadoEntity extends \CodeIgniter\Entity\Entity
"precio_min" => "float",
"importe_fijo" => "float",
"user_created_id" => "int",
"user_update_id" => "int",
"user_updated_id" => "int",
"is_deleted" => "int",
];
}