mirror of
https://git.imnavajas.es/jjimenez/safekat.git
synced 2025-07-25 22:52:08 +00:00
Merge branch 'main' into 'dev/delete-ui'
# Conflicts: # ci4/app/Controllers/Tarifas/Tarifaacabado.php # ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaList.php # ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaAcabadoList.php # ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php
This commit is contained in:
@ -8,11 +8,11 @@ class TarifaAcabadoLinea extends \CodeIgniter\Entity\Entity
|
||||
protected $attributes = [
|
||||
"id" => null,
|
||||
"tarifa_acabado_id" => 0,
|
||||
"tirada_min" => 0,
|
||||
"tirada_max" => 0,
|
||||
"paginas_min" => 0,
|
||||
"paginas_max" => 0,
|
||||
"precio_min" => 0,
|
||||
"precio_max" => 0,
|
||||
"precio_unidad" => 0,
|
||||
"margen" => 0,
|
||||
"user_created_id" => 0,
|
||||
"user_updated_id" => 0,
|
||||
"is_deleted" => 0,
|
||||
@ -25,7 +25,7 @@ class TarifaAcabadoLinea extends \CodeIgniter\Entity\Entity
|
||||
"tirada_max" => "int",
|
||||
"precio_min" => "float",
|
||||
"precio_max" => "float",
|
||||
"precio_unidad" => "float",
|
||||
"margen" => "float",
|
||||
"user_created_id" => "int",
|
||||
"user_updated_id" => "int",
|
||||
"is_deleted" => "int",
|
||||
|
||||
28
ci4/app/Entities/Tarifas/TarifaEncuadernacionEntity.php
Normal file
28
ci4/app/Entities/Tarifas/TarifaEncuadernacionEntity.php
Normal file
@ -0,0 +1,28 @@
|
||||
<?php
|
||||
|
||||
namespace App\Entities\Tarifas;
|
||||
|
||||
use CodeIgniter\Entity;
|
||||
|
||||
class TarifaEncuadernacionEntity extends \CodeIgniter\Entity\Entity
|
||||
{
|
||||
protected $attributes = [
|
||||
"id" => null,
|
||||
"nombre" => null,
|
||||
"precio_min" => 0,
|
||||
"importe_fijo" => 0,
|
||||
"user_created_id" => 0,
|
||||
"user_updated_id" => 0,
|
||||
"is_deleted" => 0,
|
||||
"deleted_at" => null,
|
||||
"created_at" => null,
|
||||
"updated_at" => null,
|
||||
];
|
||||
protected $casts = [
|
||||
"precio_min" => "float",
|
||||
"importe_fijo" => "float",
|
||||
"user_created_id" => "int",
|
||||
"user_updated_id" => "int",
|
||||
"is_deleted" => "int",
|
||||
];
|
||||
}
|
||||
33
ci4/app/Entities/Tarifas/TarifaEncuadernacionLinea.php
Normal file
33
ci4/app/Entities/Tarifas/TarifaEncuadernacionLinea.php
Normal file
@ -0,0 +1,33 @@
|
||||
<?php
|
||||
namespace App\Entities\Tarifas;
|
||||
|
||||
use CodeIgniter\Entity;
|
||||
|
||||
class TarifaEncuadernacionLinea extends \CodeIgniter\Entity\Entity
|
||||
{
|
||||
protected $attributes = [
|
||||
"id" => null,
|
||||
"tarifa_encuadernacion_id" => 0,
|
||||
"paginas_min" => 0,
|
||||
"paginas_max" => 0,
|
||||
"precio_min" => 0,
|
||||
"precio_max" => 0,
|
||||
"margen" => 0,
|
||||
"user_created_id" => 0,
|
||||
"user_updated_id" => 0,
|
||||
"is_deleted" => 0,
|
||||
"created_at" => null,
|
||||
"updated_at" => null,
|
||||
];
|
||||
protected $casts = [
|
||||
"tarifa_encuadernacion_id" => "int",
|
||||
"paginas_min" => "float",
|
||||
"paginas_max" => "float",
|
||||
"precio_min" => "float",
|
||||
"precio_max" => "float",
|
||||
"margen" => "float",
|
||||
"user_created_id" => "int",
|
||||
"user_updated_id" => "int",
|
||||
"is_deleted" => "int",
|
||||
];
|
||||
}
|
||||
@ -8,11 +8,11 @@ class TarifaManipuladoLinea extends \CodeIgniter\Entity\Entity
|
||||
protected $attributes = [
|
||||
"id" => null,
|
||||
"tarifa_manipulado_id" => 0,
|
||||
"tirada_min" => 0,
|
||||
"tirada_max" => 0,
|
||||
"paginas_min" => 0,
|
||||
"paginas_max" => 0,
|
||||
"precio_min" => 0,
|
||||
"precio_max" => 0,
|
||||
"precio_unidad" => 0,
|
||||
"margen" => 0,
|
||||
"user_created_id" => 0,
|
||||
"user_updated_id" => 0,
|
||||
"is_deleted" => 0,
|
||||
@ -21,11 +21,11 @@ class TarifaManipuladoLinea extends \CodeIgniter\Entity\Entity
|
||||
];
|
||||
protected $casts = [
|
||||
"tarifa_manipulado_id" => "int",
|
||||
"tirada_min" => "float",
|
||||
"tirada_max" => "float",
|
||||
"paginas_min" => "float",
|
||||
"paginas_max" => "float",
|
||||
"precio_min" => "float",
|
||||
"precio_max" => "float",
|
||||
"precio_unidad" => "float",
|
||||
"margen" => "float",
|
||||
"user_created_id" => "int",
|
||||
"user_updated_id" => "int",
|
||||
"is_deleted" => "int",
|
||||
|
||||
@ -8,9 +8,10 @@ class TarifapreimpresionEntity extends \CodeIgniter\Entity\Entity
|
||||
protected $attributes = [
|
||||
"id" => null,
|
||||
"nombre" => null,
|
||||
"precio" => null,
|
||||
"precio_pagina" => null,
|
||||
"precio_min" => 0,
|
||||
"importe_fijo" => 0,
|
||||
"margen" => 0,
|
||||
"user_created_id" => 1,
|
||||
"user_update_id" => 1,
|
||||
"is_deleted" => 0,
|
||||
@ -19,9 +20,10 @@ class TarifapreimpresionEntity extends \CodeIgniter\Entity\Entity
|
||||
"updated_at" => null,
|
||||
];
|
||||
protected $casts = [
|
||||
"precio" => "float",
|
||||
"precio_pagina" => "float",
|
||||
"precio_min" => "float",
|
||||
"importe_fijo" => "float",
|
||||
"margen" => "float",
|
||||
"user_created_id" => "int",
|
||||
"user_update_id" => "int",
|
||||
"is_deleted" => "int",
|
||||
|
||||
Reference in New Issue
Block a user