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

mergeando del main a mi rama

Browse Source
This commit is contained in:
Jaime Jimenez
2024-05-03 10:12:20 +02:00
parent 02bbc0aa09 d0b340535b
commit 4cf7ada2f4
33 changed files with 33273 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
ci4/app/Models/Clientes/ClienteUsuariosModel.php Normal file
View File

@ -0,0 +1,110 @@
<?php
namespace App\Models\Clientes;
class ClienteUsuariosModel extends \App\Models\GoBaseModel
{
protected $table = "auth_user";
/**
* Whether primary key uses auto increment.
*
* @var bool
*/
protected $useAutoIncrement = true;
const SORTABLE = [
0 => "t1.first_name",
1 => "t1.last_name",
2 => "t1.email",
];
protected $allowedFields = ["id", "first_name", "last_name", "email"];
protected $returnType = "App\Entities\Usuarios\UserEntity";
protected $useTimestamps = true;
protected $useSoftDeletes = false;
protected $createdField = "created_at";
protected $updatedField = "updated_at";
public static $labelField = "nombre";
protected $validationRules = [
"last_name" => [
"label" => "ClienteContactos.apellidos",
"rules" => "trim|max_length[500]",
],
"email" => [
"label" => "ClienteContactos.email",
"rules" => "trim|max_length[150]|valid_email|permit_empty",
],
"first_name" => [
"label" => "ClienteContactos.nombre",
"rules" => "trim|max_length[100]",
],
];
protected $validationMessages = [
"last_name" => [
"max_length" => "ClienteContactos.validation.apellidos.max_length",
],
"email" => [
"max_length" => "ClienteContactos.validation.email.max_length",
"valid_email" => "ClienteContactos.validation.email.valid_email",
],
"first_name" => [
"max_length" => "ClienteContactos.validation.nombre.max_length",
],
];
public function findAllWithClientes(string $selcols = "*", int $limit = null, int $offset = 0)
{
$sql =
"SELECT t1." .
$selcols .
", t2.nombre AS cliente_id FROM " .
$this->table .
" t1 LEFT JOIN clientes t2 ON t1.cliente_id = t2.id";
if (!is_null($limit) && intval($limit) > 0) {
$sql .= " LIMIT " . $limit;
}
if (!is_null($offset) && intval($offset) > 0) {
$sql .= " OFFSET " . $offset;
}
$query = $this->db->query($sql);
$result = $query->getResultObject();
return $result;
}
/**
* Get resource data.
*
* @param string $search
*
* @return \CodeIgniter\Database\BaseBuilder
*/
public function getResource(string $search = "", $cliente_id = -1)
{
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.id_user AS id, t1.first_name AS nombre, t1.last_name AS apellidos, t1.email AS email"
);
$builder->where('t1.id_user', $cliente_id);
return empty($search)
? $builder
: $builder
->groupStart()
->like("t1.first_name", $search)
->orLike("t1.last_name", $search)
->orLike("t1.email", $search)
->groupEnd();
}
}

2
ci4/app/Models/Presupuestos/PresupuestoEncuadernacionesModel.php
View File

@ -297,7 +297,7 @@ class PresupuestoEncuadernacionesModel extends \App\Models\GoBaseModel
private function calcularTarifa($tarifa, $paginas, $ejemplares, $is_POD=false){
$precio_unidad = floatval($tarifa->precio_min) - (floatval($tarifa->precio_min) - floatval($tarifa->precio_max))/($tarifa->paginas_max - $tarifa->paginas_min) * ($paginas - $tarifa->paginas_min);
$precio_unidad = floatval($tarifa->precio_max) - (floatval($tarifa->precio_max) - floatval($tarifa->precio_min))/($tarifa->paginas_max - $tarifa->paginas_min) * ($paginas - $tarifa->paginas_min);
if ($paginas > $tarifa->paginas_max)
$precio_unidad = $tarifa->precio_max;
$precio_unidad = $precio_unidad* (1+ floatval($tarifa->margen)/100.0);

35
ci4/app/Models/Tarifas/TarifaEncuadernacionModel.php
View File

@ -14,18 +14,14 @@ class TarifaEncuadernacionModel extends \App\Models\GoBaseModel
const SORTABLE = [
0 => "t1.nombre",
1 => "t1.precio_min",
2 => "t1.importe_fijo",
3 => "t1.mostrar_en_presupuesto",
4 => "t1.tipo_encuadernacion",
5 => "t1.servicio_encuadernacion",
1 => "t1.mostrar_en_presupuesto",
2 => "t1.tipo_encuadernacion",
3 => "t1.servicio_encuadernacion",
];
protected $allowedFields = [
"nombre",
"precio_min",
"importe_fijo",
"mostrar_en_presupuesto",
"tipo_encuadernacion",
"servicio_encuadernacion",
@ -51,30 +47,13 @@ class TarifaEncuadernacionModel extends \App\Models\GoBaseModel
"label" => "Tarifaencuadernacion.nombre",
"rules" => "trim|required|max_length[255]",
],
"precio_min" => [
"label" => "Tarifaencuadernacion.precioMin",
"rules" => "required|decimal",
],
"importe_fijo" => [
"label" => "Tarifaencuadernacion.importeFijo",
"rules" => "required|decimal",
],
];
protected $validationMessages = [
"nombre" => [
"max_length" => "Tarifaencuadernacion.validation.nombre.max_length",
"required" => "Tarifaencuadernacion.validation.nombre.required",
],
"precio_min" => [
"required" => "Tarifaencuadernacion.validation.precio_min.required",
"decimal" => "Tarifaencuadernacion.validation.precio_min.decimal",
],
"importe_fijo" => [
"required" => "Tarifaencuadernacion.validation.importe_fijo.required",
"decimal" => "Tarifaencuadernacion.validation.importe_fijo.decimal",
],
]
];
/**
@ -87,7 +66,7 @@ class TarifaEncuadernacionModel extends \App\Models\GoBaseModel
public function getResource(string $search = "")
{
$builder = $this->db->table($this->table . " t1")->select("t1.id AS id, t1.nombre AS nombre,
t1.precio_min AS precio_min, t1.importe_fijo AS importe_fijo, t1.mostrar_en_presupuesto AS mostrar_en_presupuesto,
t1.mostrar_en_presupuesto AS mostrar_en_presupuesto,
t1.tipo_encuadernacion AS tipo_encuadernacion, t1.servicio_encuadernacion AS servicio_encuadernacion,
t1.por_horas AS por_horas");
@ -144,7 +123,7 @@ class TarifaEncuadernacionModel extends \App\Models\GoBaseModel
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.id AS tarifa_enc_id, t1.nombre AS tarifa_enc_nombre, t1.precio_min AS tarifa_precio_min, t1.importe_fijo AS tarifa_importe_fijo,
"t1.id AS tarifa_enc_id, t1.nombre AS tarifa_enc_nombre, t2.precio_min AS tarifa_precio_min, t2.importe_fijo AS tarifa_importe_fijo,
t2.id AS tarifa_tirada_id, t2.proveedor_id AS proveedor_id, t5.nombre AS proveedor_nombre, t2.tirada_min AS tirada_min, t2.tirada_max AS tirada_max,
t3.id AS tarifa_linea_id, t3.paginas_libro_min AS paginas_min, t3.paginas_libro_max AS paginas_max, t3.precio_min AS precio_min, t3.precio_max AS precio_max, t3.margen AS margen,
t4.ancho_min AS ancho_min, t4.ancho_max AS ancho_max, t4.alto_min AS alto_min, t4.alto_max AS alto_max"
@ -180,7 +159,7 @@ class TarifaEncuadernacionModel extends \App\Models\GoBaseModel
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.id AS tarifa_enc_id, t1.nombre AS tarifa_enc_nombre, t1.precio_min AS tarifa_precio_min, t1.importe_fijo AS tarifa_importe_fijo,
"t1.id AS tarifa_enc_id, t1.nombre AS tarifa_enc_nombre, t2.precio_min AS tarifa_precio_min, t2.importe_fijo AS tarifa_importe_fijo,
t2.id AS tarifa_tirada_id, t2.proveedor_id AS proveedor_id, t5.nombre AS proveedor_nombre, t2.tirada_min AS tirada_min, t2.tirada_max AS tirada_max,
t3.id AS tarifa_linea_id, t3.tiempo_min AS tiempo_min, t3.tiempo_max AS tiempo_max, t3.precio_hora AS precio_hora, t3.margen AS margen"
)

35
ci4/app/Models/Tarifas/TarifaEncuadernacionTiradaModel.php
View File

@ -16,7 +16,8 @@ class TarifaEncuadernacionTiradaModel extends \App\Models\GoBaseModel
0 => "t3.nombre",
1 => "t1.tirada_min",
2 => "t1.tirada_max",
3 => "t1.precio_min",
4 => "t1.importe_fijo",
];
protected $allowedFields = [
@ -24,6 +25,8 @@ class TarifaEncuadernacionTiradaModel extends \App\Models\GoBaseModel
"tirada_min",
"tirada_max",
"proveedor_id",
"precio_min",
"importe_fijo",
"user_created_id",
"user_updated_id",
"is_deleted",
@ -49,7 +52,15 @@ class TarifaEncuadernacionTiradaModel extends \App\Models\GoBaseModel
"tirada_min" => [
"label" => "TarifaEncuadernacionTiradas.tiradaMin",
"rules" => "required|integer",
]
],
"precio_min" => [
"label" => "Tarifaencuadernacion.precioMin",
"rules" => "required|decimal",
],
"importe_fijo" => [
"label" => "Tarifaencuadernacion.importeFijo",
"rules" => "required|decimal",
],
];
protected $validationMessages = [
@ -60,7 +71,15 @@ class TarifaEncuadernacionTiradaModel extends \App\Models\GoBaseModel
"tirada_min" => [
"integer" => "TarifaEncuadernacionTiradas.validation.tirada_min.integer",
"required" => "TarifaEncuadernacionTiradas.validation.tirada_min.required",
]
],
"precio_min" => [
"required" => "Tarifaencuadernacion.validation.precio_min.required",
"decimal" => "Tarifaencuadernacion.validation.precio_min.decimal",
],
"importe_fijo" => [
"required" => "Tarifaencuadernacion.validation.importe_fijo.required",
"decimal" => "Tarifaencuadernacion.validation.importe_fijo.decimal",
],
];
/**
@ -75,8 +94,10 @@ class TarifaEncuadernacionTiradaModel extends \App\Models\GoBaseModel
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.id AS id, t1.tarifa_encuadernacion_id AS tarifa_encuadernacion_id, t1.tirada_min AS tirada_min,
t1.tirada_max AS tirada_max, t3.nombre AS proveedor, t3.id AS proveedor_id, t2.id AS tarifa_encuadernacion"
"t1.id AS id, t1.tarifa_encuadernacion_id AS tarifa_encuadernacion_id,
t1.precio_min AS precio_min, t1.importe_fijo AS importe_fijo,
t1.tirada_min AS tirada_min, t1.tirada_max AS tirada_max,
t3.nombre AS proveedor, t3.id AS proveedor_id, t2.id AS tarifa_encuadernacion"
);
//JJO
$builder->where('tarifa_encuadernacion_id', $tarifa_encuadernacion_id);
@ -92,10 +113,14 @@ class TarifaEncuadernacionTiradaModel extends \App\Models\GoBaseModel
->groupStart()
->Like("t1.tirada_min", $search)
->orLike("t1.tirada_max", $search)
->orLike("t1.precio_min", $search)
->orLike("t1.importe_fijo", $search)
->orLike("t3.nombre", $search)
->orLike("t1.tirada_min", $search)
->orLike("t1.tirada_max", $search)
->orLike("t3.nombre", $search)
->orLike("t1.precio_min", $search)
->orLike("t1.importe_fijo", $search)
->groupEnd();
}