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

falta botones exportar, etc

Browse Source
This commit is contained in:
Jaime Jimenez
2023-09-04 09:05:48 +02:00
parent 56b233af1f
commit 289d89851b
11 changed files with 112 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ci4/app/Models/Tarifas/TarifaEnvioPrecioModel.php
View File

@ -18,7 +18,8 @@ class TarifaEnvioPrecioModel extends \App\Models\GoBaseModel
2 => "t1.peso_min",
3 => "t1.peso_max",
4 => "t1.precio",
5 => "t1.precio_adicional"
5 => "t1.precio_adicional",
5 => "t1.margen"
];
protected $allowedFields = [
@ -29,6 +30,7 @@ class TarifaEnvioPrecioModel extends \App\Models\GoBaseModel
"peso_max",
"precio",
"precio_adicional",
"margen",
"deleted_at",
"is_deleted",
];
@ -60,9 +62,13 @@ class TarifaEnvioPrecioModel extends \App\Models\GoBaseModel
"label" => "TarifasEnviosPrecios.precioAdicional",
"rules" => "required|decimal",
],
"margen" => [
"label" => "TarifasEnviosPrecios.margen",
"rules" => "required|decimal",
],
"tipo_envio" => [
"label" => "TarifasEnviosPrecios.tipoEnvio",
"rules" => "required|in_list[a domicilio,cajas,palets]",
"rules" => "required|in_list[cajas,palets]",
],
];
@ -83,6 +89,10 @@ class TarifaEnvioPrecioModel extends \App\Models\GoBaseModel
"decimal" => "TarifasEnviosPrecios.validation.precio_adicional.decimal",
"required" => "TarifasEnviosPrecios.validation.precio_adicional.required",
],
"margen" => [
"decimal" => "TarifasEnviosPrecios.margen.margen.decimal",
"required" => "TarifasEnviosPrecios.margen.margen.required",
],
"tipo_envio" => [
"in_list" => "TarifasEnviosPrecios.validation.tipo_envio.in_list",
"required" => "TarifasEnviosPrecios.validation.tipo_envio.required",
@ -116,17 +126,17 @@ class TarifaEnvioPrecioModel extends \App\Models\GoBaseModel
*
* @return \CodeIgniter\Database\BaseBuilder
*/
public function getResource(string $search = "", $zona_envio_id = -1)
public function getResource(string $search = "", $tarifa_envio_id = -1)
{
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.id AS id, t1.tipo_envio AS tipo_envio, t1.peso_min AS peso_min, t1.peso_max AS peso_max, t1.precio AS precio,
t1.precio_adicional AS precio_adicional, t2.id AS tarifa_envio, t3.id AS proveedor_id, t3.nombre AS proveedor"
t1.precio_adicional AS precio_adicional, t1.margen AS margen, t2.id AS tarifa_envio, t3.id AS proveedor_id, t3.nombre AS proveedor"
);
$builder->join("tarifas_envios_zonas t2", "t1.zona_envio_id = t2.id", "left");
$builder->join("tarifas_envios_zonas t2", "t1.tarifa_envio_id = t2.id", "left");
$builder->join("lg_proveedores t3", "t1.proveedor_id = t3.id", "left");
$builder->where("t1.zona_envio_id", $zona_envio_id);
$builder->where("t1.tarifa_envio_id", $tarifa_envio_id);
//JJO
$builder->where("t1.is_deleted", 0);
@ -140,12 +150,14 @@ class TarifaEnvioPrecioModel extends \App\Models\GoBaseModel
->orLike("t1.peso_max", $search)
->orLike("t1.precio", $search)
->orLike("t1.precio_adicional", $search)
->orLike("t1.margen", $search)
->orLike("t3.nombre", $search)
->orLike("t1.tipo_envio", $search)
->orLike("t1.peso_min", $search)
->orLike("t1.peso_max", $search)
->orLike("t1.precio", $search)
->orLike("t1.precio_adicional", $search)
->orLike("t1.margen", $search)
->orLike("t3.nombre", $search)
->groupEnd();
}
@ -163,7 +175,7 @@ class TarifaEnvioPrecioModel extends \App\Models\GoBaseModel
->table($this->table)
->select("id, proveedor_id, tipo_envio, peso_min, peso_max")
->where("is_deleted", 0)
->where("zona_envio_id", $zona_id)
->where("tarifa_envio_id", $zona_id)
->get()->getResultObject();
@ -190,7 +202,7 @@ class TarifaEnvioPrecioModel extends \App\Models\GoBaseModel
->table($this->table)
->set(['deleted_at' => $datetime->format('Y-m-d H:i:s'),
'is_deleted' => $delete_flag])
->where('zona_envio_id',$zona_id)
->where('tarifa_envio_id',$zona_id)
->update();
return $builder;