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

Revert "Merge branch 'feat/add-chat-presupuesto-cliente' into 'main'"

Browse Source 
This reverts merge request !352
This commit is contained in:
Alvaro
2024-10-23 05:18:00 +00:00
parent 47e6cbb5f7
commit 7ce2723a09
147 changed files with 5666 additions and 9809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,8 +21,6 @@ class TarifaAcabadoModel extends \App\Models\BaseModel
protected $allowedFields = [
"nombre",
"code",
"comment",
"precio_min",
"importe_fijo",
"mostrar_en_presupuesto",
@ -85,13 +83,13 @@ class TarifaAcabadoModel extends \App\Models\BaseModel
public function getResource(string $search = "")
{
$builder = $this->db->table($this->table . " t1")->select(
"t1.id AS id, t1.nombre AS nombre,t1.code AS code, t1.precio_min AS precio_min, t1.importe_fijo AS importe_fijo,
"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.acabado_cubierta AS acabado_cubierta, t1.acabado_sobrecubierta AS acabado_sobrecubierta"
);
//JJO
$builder->where("t1.is_deleted", 0);
return empty($search)
? $builder
: $builder
@ -116,9 +114,8 @@ class TarifaAcabadoModel extends \App\Models\BaseModel
return $builder->orderBy("t1.nombre", "asc")->get()->getResultObject();
}
public function getTarifaPresupuestoAcabado($tarifa_id, $tirada, $proveedor_id = -1)
{
public function getTarifaPresupuestoAcabado($tarifa_id, $tirada, $proveedor_id = -1){
$builder = $this->db
->table($this->table . " t1")
->select(
@ -131,18 +128,18 @@ class TarifaAcabadoModel extends \App\Models\BaseModel
->where("t1.is_deleted", 0)
//->where("t1.mostrar_en_presupuesto", 1)
->where("t2.is_deleted", 0);
$builder->where('t1.id =', $tarifa_id);
$builder->where('t2.tirada_min <=', $tirada);
$builder->where('t2.tirada_max >=', $tirada);
if ($proveedor_id != -1) {
if($proveedor_id != -1){
$builder->where('t2.proveedor_id', $proveedor_id);
}
return $builder->get()->getResultObject();
}
public function getNombreTarifaAcabado($id = -1)
public function getNombreTarifaAcabado($id=-1)
{
/*
Todos los servicios de encuadernacion activas que se pueden usar en presupuestos
@ -187,23 +184,4 @@ class TarifaAcabadoModel extends \App\Models\BaseModel
return $builder->orderBy("t1.id", "asc")->get()->getResultObject();
}
public function getCodeFromId($id = 0)
{
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.code AS code"
)
->where("t1.id", $id)
->where("t1.is_deleted", 0);
$data = $builder->get()->getResultObject();
if (count($data) > 0) {
return $data[0]->code;
} else {
return "";
}
}
}

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

@ -22,8 +22,6 @@ class TarifaEncuadernacionModel extends \App\Models\BaseModel
protected $allowedFields = [
"nombre",
"code",
"comment",
"mostrar_en_presupuesto",
"tipo_encuadernacion",
"servicio_encuadernacion",
@ -67,7 +65,7 @@ class TarifaEncuadernacionModel extends \App\Models\BaseModel
*/
public function getResource(string $search = "")
{
$builder = $this->db->table($this->table . " t1")->select("t1.id AS id, t1.nombre AS nombre, t1.code AS code,
$builder = $this->db->table($this->table . " t1")->select("t1.id AS id, t1.nombre AS nombre,
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");

46
ci4/app/Models/Tarifas/TarifaEnvioModel.php
View File

@ -1,5 +1,4 @@
<?php
namespace App\Models\Tarifas;
class TarifaEnvioModel extends \App\Models\BaseModel
@ -18,7 +17,7 @@ class TarifaEnvioModel extends \App\Models\BaseModel
1 => "t2.nombre",
];
protected $allowedFields = ["pais_id", "nombre", "code", "comment", "deleted_at", "is_deleted"];
protected $allowedFields = ["pais_id", "nombre","deleted_at","is_deleted"];
protected $returnType = "App\Entities\Tarifas\TarifaEnvioEntity";
protected $useTimestamps = true;
@ -74,7 +73,7 @@ class TarifaEnvioModel extends \App\Models\BaseModel
*/
public function getResource(string $search = "")
{
$builder = $this->db->table($this->table . " t1")->select("t1.id as id, t1.nombre AS nombre,t1.code AS code, t2.nombre AS pais_id");
$builder = $this->db->table($this->table . " t1")->select("t1.id as id, t1.nombre AS nombre, t2.nombre AS pais_id");
$builder->join("lg_paises t2", "t1.pais_id = t2.id", "left");
//JJO
@ -83,44 +82,43 @@ class TarifaEnvioModel extends \App\Models\BaseModel
return empty($search)
? $builder
: $builder
->groupStart()
->like("t1.nombre", $search)
->orLike("t2.code", $search)
->orLike("t2.id", $search)
->orLike("t1.pais_id", $search)
->orLike("t1.nombre", $search)
->orLike("t2.nombre", $search)
->groupEnd();
->groupStart()
->like("t1.nombre", $search)
->orLike("t2.id", $search)
->orLike("t1.pais_id", $search)
->orLike("t1.nombre", $search)
->orLike("t2.nombre", $search)
->groupEnd();
}
public function getTarifaEnvio($paisId, string $cp, $peso, $tipo_envio)
{
public function getTarifaEnvio($paisId, string $cp, $peso, $tipo_envio){
// Si el pais es españa se tienen que tener en cuenta los postales
// Se busca primero la tarifa a la que corresponde
$builder = $this->db->table($this->table . " t1")
->select("t1.id AS tarifa_envio_id, t2.importe_fijo as importe_fijo")
->join("tarifas_envios_zonas t2", "t1.id = t2.tarifa_envio_id")
->where("t1.pais_id", $paisId)
->where("t1.is_deleted", 0)
->where("t2.is_deleted", 0);
if ($paisId == 1) { // España
->select("t1.id AS tarifa_envio_id, t2.importe_fijo as importe_fijo")
->join("tarifas_envios_zonas t2", "t1.id = t2.tarifa_envio_id")
->where("t1.pais_id", $paisId)
->where("t1.is_deleted", 0)
->where("t2.is_deleted", 0);
if($paisId == 1) {// España
$builder->where("CAST(t2.cp_inicial AS UNSIGNED)<=", intval($cp))
->where("CAST(t2.cp_final AS UNSIGNED) >=", intval($cp));
->where("CAST(t2.cp_final AS UNSIGNED) >=", intval($cp));
}
$tarifas = $builder->get()->getResultObject();
$resultado = [];
$model = model('App\Models\Tarifas\TarifaEnvioPrecioModel');
foreach ($tarifas as $tarifa) {
foreach($tarifas as $tarifa){
$precio_tarifas = $model->getEnvioPrecio($tarifa->tarifa_envio_id, $peso, $tipo_envio);
foreach ($precio_tarifas as $precio_tarifa) {
foreach($precio_tarifas as $precio_tarifa){
$precio_tarifa->importe_fijo = $tarifa->importe_fijo;
array_push($resultado, $precio_tarifa);
}
}
return $resultado;
}
}

4
ci4/app/Models/Tarifas/TarifaManipuladoModel.php
View File

@ -22,8 +22,6 @@ class TarifaManipuladoModel extends \App\Models\BaseModel
protected $allowedFields = [
"nombre",
"precio_min",
"code",
"comment",
"importe_fijo",
"mostrar_en_presupuesto",
"deleted_at",
@ -82,7 +80,7 @@ class TarifaManipuladoModel extends \App\Models\BaseModel
*/
public function getResource(string $search = "")
{
$builder = $this->db->table($this->table . " t1")->select("t1.id AS id,t1.code AS code, t1.nombre AS nombre, t1.precio_min AS precio_min, t1.importe_fijo AS importe_fijo
$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");
//JJO

4
ci4/app/Models/Tarifas/TarifaextraModel.php
View File

@ -13,9 +13,7 @@ class TarifaextraModel extends \App\Models\BaseModel
protected $useAutoIncrement = true;
protected $allowedFields = [
"nombre",
"code",
"comment",
"nombre",
"precio",
"margen",
"mostrar_en_presupuesto",

20
ci4/app/Models/Tarifas/TarifapreimpresionModel.php
View File

@ -13,9 +13,7 @@ class TarifapreimpresionModel extends \App\Models\BaseModel
protected $useAutoIncrement = true;
protected $allowedFields = [
"nombre",
"code",
"comment",
"nombre",
"precio",
"margen",
"mostrar_en_presupuesto",
@ -39,14 +37,6 @@ class TarifapreimpresionModel extends \App\Models\BaseModel
"label" => "Tarifapreimpresion.nombre",
"rules" => "trim|required|max_length[255]",
],
"code" => [
"label" => "Tarifapreimpresion.code",
"rules" => "trim|required|max_length[5]",
],
"comment" => [
"label" => "Tarifapreimpresion.comment",
"rules" => "trim|max_length[255]",
],
"precio" => [
"label" => "Tarifapreimpresion.precio",
"rules" => "required|decimal",
@ -62,14 +52,6 @@ class TarifapreimpresionModel extends \App\Models\BaseModel
"max_length" => "Tarifapreimpresion.validation.nombre.max_length",
"required" => "Tarifapreimpresion.validation.nombre.required",
],
"code" => [
"max_length" => "Tarifapreimpresion.validation.code.max_length",
"required" => "Tarifapreimpresion.validation.code.required",
],
"comment" => [
"max_length" => "Tarifapreimpresion.validation.comment.max_length",
"required" => "Tarifapreimpresion.validation.comment.required",
],
"precio" => [
"decimal" => "Tarifapreimpresion.validation.precio.decimal",
"required" => "Tarifapreimpresion.validation.precio.required",