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 feat/xml-pedido

Browse Source
This commit is contained in:
amazuecos
2024-09-02 23:36:42 +02:00
parent 93714ac955 403c742bf3
commit 7097ef72cc
23 changed files with 472 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ci4/app/Models/Presupuestos/PresupuestoAcabadosModel.php
View File

@ -17,11 +17,12 @@ class PresupuestoAcabadosModel extends \App\Models\BaseModel
const SORTABLE = [
0 => "t2.nombre",
1 => "t1.precio_unidad",
2 => "t1.precio_total"
1 => "t1.proveedor_id",
2 => "t1.precio_unidad",
3 => "t1.precio_total"
];
protected $allowedFields = ["presupuesto_id", "tarifa_acabado_id", "nombre", "precio_total", "precio_unidad", "margen", "cubierta", "sobrecubierta"];
protected $allowedFields = ["presupuesto_id", "tarifa_acabado_id", "proveedor_id", "nombre", "precio_total", "precio_unidad", "margen", "cubierta", "sobrecubierta"];
protected $returnType = "App\Entities\Presupuestos\PresupuestoAcabadosEntity";
protected $useTimestamps = true;
@ -46,10 +47,29 @@ class PresupuestoAcabadosModel extends \App\Models\BaseModel
],
];
public function getPrecioTarifa($tarifa_acabado_id, $tirada, $POD){
public function getProveedoresForSelector($tarifa_acabado_id, $tirada){
$proveedores = [];
$modelTarifa = model('App\Models\Tarifas\Acabados\TarifaAcabadoModel');
$tarifa_value = $modelTarifa->getTarifaPresupuestoAcabado($tarifa_acabado_id, $tirada);
if (count($tarifa_value)>0) {
foreach($tarifa_value as $tarifa)
array_push($proveedores,
(object)[
'id'=> $tarifa->proveedor_id,
'text'=> $tarifa->proveedor_nombre,
]);
}
return $proveedores;
}
public function getPrecioTarifa($tarifa_acabado_id, $tirada, $proveedor_id, $POD){
$modelTarifa = model('App\Models\Tarifas\Acabados\TarifaAcabadoModel');
$tarifa_value = $modelTarifa->getTarifaPresupuestoAcabado($tarifa_acabado_id, $tirada);
$tarifa_value = $modelTarifa->getTarifaPresupuestoAcabado($tarifa_acabado_id, $tirada, $proveedor_id);
if (count($tarifa_value)>0) {
$result_data = $this->calcularTarifa($tarifa_value[0], $tirada, $POD<$tirada?false:true);
@ -59,6 +79,8 @@ class PresupuestoAcabadosModel extends \App\Models\BaseModel
'precio_unidad'=> $result_data[0],
'total'=> $result_data[1],
'margen'=> $result_data[2],
'proveedor' => $tarifa_value[0]->proveedor_nombre,
'proveedor_id' => $tarifa_value[0]->proveedor_id,
];
return $ret_array;
}
@ -119,6 +141,8 @@ class PresupuestoAcabadosModel extends \App\Models\BaseModel
foreach($tarifas as $tarifa){
$proveedor = $tarifa->proveedor_id=='undefined'?'NULL':$tarifa->proveedor_id;
$builder = $this->db
->table($this->table . " t1");
$builder->select("id");
@ -132,6 +156,7 @@ class PresupuestoAcabadosModel extends \App\Models\BaseModel
->table($this->table . " t1")
->where('presupuesto_id', $presupuesto_id)
->where('tarifa_acabado_id', $tarifa->tarifa_id)
->set('proveedor_id', $proveedor)
->set('precio_unidad', $tarifa->precio_unidad)
->set('precio_total', $tarifa->precio_total)
->set('margen', $tarifa->margen)
@ -146,6 +171,7 @@ class PresupuestoAcabadosModel extends \App\Models\BaseModel
->table($this->table . " t1")
->set('presupuesto_id', $presupuesto_id)
->set('tarifa_acabado_id', $tarifa->tarifa_id)
->set('proveedor_id', $proveedor, false)
->set('precio_unidad', $tarifa->precio_unidad)
->set('precio_total', $tarifa->precio_total)
->set('margen', $tarifa->margen)
@ -169,11 +195,13 @@ class PresupuestoAcabadosModel extends \App\Models\BaseModel
->table($this->table . " t1")
->select(
"t1.id AS id, t1.tarifa_acabado_id AS tarifa_acabado_id, t1.precio_unidad AS precio_unidad,
t1.precio_total AS precio_total, t1.margen AS margen, t2.nombre AS nombre, t1.cubierta AS cubierta, t1.sobrecubierta AS sobrecubierta"
t1.precio_total AS precio_total, t1.margen AS margen, t2.nombre AS nombre, t1.cubierta AS cubierta, t1.sobrecubierta AS sobrecubierta,
t1.proveedor_id AS proveedor_id, t3.nombre AS proveedor,"
);
$builder->where('t1.presupuesto_id', $presupuesto_id);
$builder->join("lg_tarifa_acabado t2", "t1.tarifa_acabado_id = t2.id", "left");
$builder->join("lg_proveedores t3", "t1.proveedor_id = t3.id", "left");
return $builder;
}

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

@ -162,7 +162,7 @@ class PresupuestoModel extends \App\Models\BaseModel
],
"pais_id" => [
"label" => "Presupuestos.paisId",
"rules" => "required|integer|greater_than[0]",
"rules" => "integer",
],
"cliente_id" => [
"label" => "Presupuestos.clienteId",

91
ci4/app/Models/Tarifas/Acabados/TarifaAcabadoLineaModel.php
View File

@ -1,6 +1,9 @@
<?php
namespace App\Models\Tarifas\Acabados;
use function PHPUnit\Framework\isNan;
use function PHPUnit\Framework\isNull;
class TarifaAcabadoLineaModel extends \App\Models\BaseModel
{
protected $table = "tarifa_acabado_lineas";
@ -13,14 +16,16 @@ class TarifaAcabadoLineaModel extends \App\Models\BaseModel
protected $useAutoIncrement = true;
const SORTABLE = [
0 => "t1.tirada_min",
1 => "t1.tirada_max",
2 => "t1.precio_min",
3 => "t1.precio_max",
4 => "t1.margen",
0 => "t3.nombre",
1 => "t1.tirada_min",
2 => "t1.precio_max",
3 => "t1.tirada_max",
4 => "t1.precio_min",
5 => "t1.margen",
];
protected $allowedFields = [
"proveedor_id",
"tirada_min",
"tirada_max",
"precio_min",
@ -126,12 +131,12 @@ class TarifaAcabadoLineaModel extends \App\Models\BaseModel
*
* @return \CodeIgniter\Database\BaseBuilder
*/
public function getResource(string $search = "", $tarifa_acabado_id = -1)
public function getResource($search = [], $tarifa_acabado_id = -1)
{
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.id AS id, t1.tirada_min AS tirada_min, t1.tirada_max AS tirada_max, t1.precio_min AS precio_min, t1.precio_max AS precio_max, t1.margen AS margen, t2.id AS tarifa_acabado"
"t1.id AS id, t1.proveedor_id AS proveedor_id, t3.nombre AS proveedor_nombre, t1.tirada_min AS tirada_min, t1.tirada_max AS tirada_max, t1.precio_min AS precio_min, t1.precio_max AS precio_max, t1.margen AS margen, t2.id AS tarifa_acabado"
);
//JJO
@ -139,21 +144,66 @@ class TarifaAcabadoLineaModel extends \App\Models\BaseModel
$builder->where("t1.is_deleted", 0);
$builder->join("lg_tarifa_acabado t2", "t1.tarifa_acabado_id = t2.id", "left");
$builder->join("lg_proveedores t3", "t1.proveedor_id = t3.id", "left");
return empty($search)
? $builder
: $builder
->groupStart()
->like("t1.tirada_min", $search)
->orLike("t1.tirada_max", $search)
->orLike("t1.precio_min", $search)
->orLike("t1.precio_max", $search)
->orLike("t1.tirada_min", $search)
->orLike("t1.tirada_max", $search)
->orLike("t1.precio_min", $search)
->orLike("t1.precio_max", $search)
->groupEnd();
if (empty($search))
return $builder;
else {
$filterEnabled = 0;
foreach ($search as $col_search) {
if($col_search[0] != 0){
if(strlen($col_search[2]) > 1){
$values = explode(",",$col_search[2]);
$min_val = floatval($values[0]);
$max_val = floatval($values[1]);
if(!is_nan($min_val) && !is_null($min_val) && strlen($values[0]) > 0){
if($filterEnabled == 0){
$builder->groupStart();
$filterEnabled = 1;
}
$builder->where(self::SORTABLE[$col_search[0]] . " >=", $min_val);
}
if(!is_nan($max_val) && !is_null($max_val) && strlen($values[1]) > 0){
if($filterEnabled == 0){
$builder->groupStart();
$filterEnabled = 1;
}
$builder->where(self::SORTABLE[$col_search[0]] . " <", $max_val);
}
}
}
else{
if(strlen($col_search[2]) > 1){
$values = explode(",",$col_search[2]);
if(count($values) > 1){
foreach ($values as $value) {
if($filterEnabled == 0){
$builder->groupStart();
$filterEnabled = 1;
}
$builder->orWhere("t1.proveedor_id", $value);
}
}
else{
if($filterEnabled == 0){
$builder->groupStart();
$filterEnabled = 1;
}
$builder->where("t1.proveedor_id", $col_search[2]);
}
}
}
}
if($filterEnabled == 1){
$builder->groupEnd();
}
return $builder;
}
}
public function findLineasForTarifaAcabado(int $tarifaacabado_id){
@ -181,6 +231,7 @@ class TarifaAcabadoLineaModel extends \App\Models\BaseModel
->select("id, tirada_min, tirada_max")
->where("is_deleted", 0)
->where("tarifa_acabado_id", $id_tarifa_acabado)
->where("proveedor_id", $data["proveedor_id"])
->get()->getResultObject();

8
ci4/app/Models/Tarifas/Acabados/TarifaAcabadoModel.php
View File

@ -114,16 +114,17 @@ class TarifaAcabadoModel extends \App\Models\BaseModel
return $builder->orderBy("t1.nombre", "asc")->get()->getResultObject();
}
public function getTarifaPresupuestoAcabado($tarifa_id, $tirada){
public function getTarifaPresupuestoAcabado($tarifa_id, $tirada, $proveedor_id = -1){
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.id AS tarifa_acabado_id, t1.nombre AS tarifa_acabado_nombre, t1.precio_min AS tarifa_precio_min, t1.importe_fijo AS tarifa_importe_fijo,
t1.acabado_cubierta AS acabado_cubierta, t1.acabado_sobrecubierta AS acabado_sobrecubierta, t2.id AS tarifa_linea_id, t2.tirada_min AS tirada_min, t2.tirada_max AS tirada_max,
t2.precio_min AS precio_min, t2.precio_max AS precio_max, t2.margen AS margen"
t2.precio_min AS precio_min, t2.precio_max AS precio_max, t2.margen AS margen, t2.proveedor_id AS proveedor_id, t3.nombre AS proveedor_nombre"
)
->join("tarifa_acabado_lineas t2", "t1.id = t2.tarifa_acabado_id", "left")
->join("lg_proveedores t3", "t2.proveedor_id = t3.id", "left")
->where("t1.is_deleted", 0)
//->where("t1.mostrar_en_presupuesto", 1)
->where("t2.is_deleted", 0);
@ -132,6 +133,9 @@ class TarifaAcabadoModel extends \App\Models\BaseModel
$builder->where('t2.tirada_min <=', $tirada);
$builder->where('t2.tirada_max >=', $tirada);
if($proveedor_id != -1){
$builder->where('t2.proveedor_id', $proveedor_id);
}
return $builder->get()->getResultObject();
}