jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 'mod/autoroute'

Browse Source 
terminado añadir usuarios y fechas a pedidos. añadido inaplazable. color en...

See merge request jjimenez/safekat!695
This commit is contained in:
Ignacio Martinez Navajas
2025-04-12 20:18:05 +00:00
parent a31e0bddb6 7350e193e5
commit abc8db6b8b
46 changed files with 965 additions and 1134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ci4/app/Entities/Facturas/FacturaLineaEntity.php
View File

@ -12,7 +12,6 @@ class FacturaLineaEntity extends \CodeIgniter\Entity\Entity
'pedido_maquetacion_id' => null,
'descripcion' => null,
'cantidad' => null,
'precio_unidad' => null,
'iva' => null,
'base' => null,
'total_iva' => null,
@ -29,7 +28,6 @@ class FacturaLineaEntity extends \CodeIgniter\Entity\Entity
'pedido_linea_impresion_id' => 'int',
'pedido_maquetacion_id' => 'int',
'cantidad' => 'float',
'precio_unidad' => 'float',
'iva' => 'float',
'base' => 'float',
'total_iva' => 'float',

6
ci4/app/Entities/Pedidos/PedidoEntity.php
View File

@ -18,6 +18,7 @@ class PedidoEntity extends \CodeIgniter\Entity\Entity
"total_precio" => null,
"total_tirada" => null,
"estado" => null,
"inaplazable" => null,
"user_created_id" => null,
"user_updated_id" => null,
"user_validated_id" => null,
@ -25,6 +26,11 @@ class PedidoEntity extends \CodeIgniter\Entity\Entity
"fecha_impresion" => null,
"fecha_encuadernado" => null,
"fecha_entrega_externo" => null,
"fecha_entrega_real_change_user_id" => null,
"fecha_impresion_change_user_id" => null,
"fecha_encuadernado_change_user_id" => null,
"fecha_entrega_change_externo_user_id" => null,
"inaplazable_change_user_id" => null,
"created_at" => null,
"updated_at" => null,
"validated_at" => null,

3
ci4/app/Entities/Pedidos/PedidoLineaEntity.php
View File

@ -16,6 +16,8 @@ class PedidoLineaEntity extends \CodeIgniter\Entity\Entity
"user_updated_id" => null,
"created_at" => null,
"updated_at" => null,
"cantidad" => null,
"descripcion" => null,
];
@ -23,6 +25,7 @@ class PedidoLineaEntity extends \CodeIgniter\Entity\Entity
"pedido_id" => "int",
"presupuesto_id" => "int",
"ubicacion_id" => "int",
"cantidad" => "int",
];
public function ubicacion() : UbicacionesEntity
{

10
ci4/app/Entities/Produccion/OrdenTrabajoEntity.php
View File

@ -2,17 +2,15 @@
namespace App\Entities\Produccion;
use App\Controllers\Produccion\Ordentrabajo;
use App\Database\Migrations\OrdenTrabajoDatesTable;
use App\Entities\Pedidos\PedidoEntity;
use App\Entities\Usuarios\UserEntity;
use App\Entities\Usuarios\UsersEntity;
use App\Models\OrdenTrabajo\OrdenTrabajoDate;
use App\Models\OrdenTrabajo\OrdenTrabajoFileModel;
use App\Models\OrdenTrabajo\OrdenTrabajoTarea;
use App\Models\OrdenTrabajo\OrdenTrabajoUser;
use App\Models\Pedidos\PedidoModel;
use App\Models\UserModel;
use App\Models\Usuarios\UserModel;
use CodeIgniter\Entity\Entity;
use Picqer\Barcode\Renderers\PngRenderer;
use Picqer\Barcode\Types\TypeCode128;
@ -123,7 +121,7 @@ class OrdenTrabajoEntity extends Entity
$m = model(OrdenTrabajoFileModel::class);
return $m->where('orden_trabajo_id',$this->attributes['id'])->findAll() ?? [];
}
public function pedidoEsperaBy() : ?UsersEntity
public function pedidoEsperaBy() : ?UserEntity
{
$m = model(UserModel::class);
if($this->attributes['pedido_espera_by']){
@ -132,7 +130,7 @@ class OrdenTrabajoEntity extends Entity
return null;
}
}
public function getPedidoEsperaBy(): ?UsersEntity
public function getPedidoEsperaBy(): ?UserEntity
{
return $this->pedidoEsperaBy();
}