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 dev/chat

Browse Source
This commit is contained in:
Alvaro Mazuecos Nogales
2024-09-23 10:04:55 +02:00
parent d6a95f78ee 70fa74333d
commit 2fc9af9db4
25 changed files with 204 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ci4/app/Models/Compras/ProveedorModel.php
View File

@ -209,6 +209,7 @@ class ProveedorModel extends \App\Models\BaseModel
->select(
"t1.id AS value, t1.nombre AS label, t1.propiedades AS options")
->where("tipo_id", $tipoId)
->where("is_deleted", 0)
->orderBy('t1.nombre', 'asc');
return $builder->get()->getResultObject();

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

@ -283,6 +283,13 @@ class PresupuestoAcabadosModel extends \App\Models\BaseModel
$total = $precio_unidad * $tirada;
$margen = floatval($tarifa->margen);
if($tarifa->tarifa_precio_min > $total){
$total = $total-($total * $margen/100.0);
$margen = round(100.0 * (floatval($tarifa->tarifa_precio_min) - $total) / floatval($tarifa->tarifa_precio_min), 0);
$total = floatval($tarifa->tarifa_precio_min);
$precio_unidad = round(floatval($total / $tirada), 2);
}
if (!$is_POD){
$total += floatval($tarifa->tarifa_importe_fijo);
}

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

@ -324,6 +324,13 @@ class PresupuestoEncuadernacionesModel extends \App\Models\BaseModel
$total = $precio_unidad * $ejemplares;
$margen = floatval($tarifa->margen);
if($tarifa->tarifa_precio_min > $total){
$total = $total-($total * $margen/100.0);
$margen = round(100.0 * (floatval($tarifa->tarifa_precio_min) - $total) / floatval($tarifa->tarifa_precio_min), 0);
$total = floatval($tarifa->tarifa_precio_min);
$precio_unidad = round(floatval($total / $ejemplares), 2);
}
if (!$is_POD){
$total += floatval($tarifa->tarifa_importe_fijo);
}

7
ci4/app/Models/Presupuestos/PresupuestoManipuladosModel.php
View File

@ -84,6 +84,13 @@ class PresupuestoManipuladosModel extends \App\Models\BaseModel
$total = $precio_unidad * $tirada;
$margen = floatval($tarifa->margen);
if($tarifa->tarifa_precio_min > $total){
$total = $total-($total * $margen/100.0);
$margen = round(100.0 * (floatval($tarifa->tarifa_precio_min) - $total) / floatval($tarifa->tarifa_precio_min), 0);
$total = floatval($tarifa->tarifa_precio_min);
$precio_unidad = round(floatval($total / $tirada), 2);
}
if (!$is_POD){
$total += floatval($tarifa->tarifa_importe_fijo);
}

1
ci4/app/Models/Presupuestos/PresupuestoPreimpresionesModel.php
View File

@ -69,7 +69,6 @@ class PresupuestoPreimpresionesModel extends \App\Models\BaseModel
];
return $ret_array;
}
return [];
}
private function calcularTarifa($tarifa){

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

@ -15,8 +15,6 @@ class TarifaextraModel extends \App\Models\BaseModel
protected $allowedFields = [
"nombre",
"precio",
"precio_min",
"importe_fijo",
"margen",
"mostrar_en_presupuesto",
"deleted_at",
@ -39,14 +37,6 @@ class TarifaextraModel extends \App\Models\BaseModel
"label" => "Tarifaextra.nombre",
"rules" => "trim|required|max_length[255]",
],
"precio" => [
"label" => "Tarifaextra.precio",
"rules" => "required|decimal",
],
"precio_min" => [
"label" => "Tarifaextra.precioMin",
"rules" => "required|decimal",
],
"importe_fijo" => [
"label" => "Tarifaextra.importeFijo",
"rules" => "required|decimal",
@ -66,14 +56,6 @@ class TarifaextraModel extends \App\Models\BaseModel
"decimal" => "Tarifaextra.validation.precio.decimal",
"required" => "Tarifaextra.validation.precio.required",
],
"precio_min" => [
"required" => "Tarifaextra.validation.precio_min.required",
"decimal" => "Tarifaextra.validation.precio_min.decimal",
],
"importe_fijo" => [
"required" => "Tarifaextra.validation.importe_fijo.required",
"decimal" => "Tarifaextra.validation.importe_fijo.decimal",
],
"margen" => [
"required" => "Tarifaextra.validation.margen.required",
"decimal" => "Tarifaextra.validation.margen.decimal",

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

@ -15,8 +15,6 @@ class TarifapreimpresionModel extends \App\Models\BaseModel
protected $allowedFields = [
"nombre",
"precio",
"precio_min",
"importe_fijo",
"margen",
"mostrar_en_presupuesto",
"deleted_at",
@ -43,14 +41,6 @@ class TarifapreimpresionModel extends \App\Models\BaseModel
"label" => "Tarifapreimpresion.precio",
"rules" => "required|decimal",
],
"precio_min" => [
"label" => "Tarifapreimpresion.precioMin",
"rules" => "required|decimal",
],
"importe_fijo" => [
"label" => "Tarifapreimpresion.importeFijo",
"rules" => "required|decimal",
],
"margen" => [
"label" => "Tarifapreimpresion.margen",
"rules" => "required|decimal",
@ -66,14 +56,6 @@ class TarifapreimpresionModel extends \App\Models\BaseModel
"decimal" => "Tarifapreimpresion.validation.precio.decimal",
"required" => "Tarifapreimpresion.validation.precio.required",
],
"precio_min" => [
"required" => "Tarifapreimpresion.validation.precio_min.required",
"decimal" => "Tarifapreimpresion.validation.precio_min.decimal",
],
"importe_fijo" => [
"required" => "Tarifapreimpresion.validation.importe_fijo.required",
"decimal" => "Tarifapreimpresion.validation.importe_fijo.decimal",
],
"margen" => [
"required" => "Tarifapreimpresion.validation.margen.required",
"decimal" => "Tarifapreimpresion.validation.margen.decimal",