diff --git a/ci4/app/Entities/Tarifas/TarifaextraEntity.php b/ci4/app/Entities/Tarifas/TarifaextraEntity.php index 2ff79cd9..ac6b35eb 100755 --- a/ci4/app/Entities/Tarifas/TarifaextraEntity.php +++ b/ci4/app/Entities/Tarifas/TarifaextraEntity.php @@ -9,8 +9,6 @@ class TarifaextraEntity extends \CodeIgniter\Entity\Entity "id" => null, "nombre" => null, "precio" => null, - "precio_min" => 0, - "importe_fijo" => 0, "margen" => 0, "mostrar_en_presupuesto" => 1, "user_created_id" => 1, @@ -22,8 +20,6 @@ class TarifaextraEntity extends \CodeIgniter\Entity\Entity ]; protected $casts = [ "precio" => "float", - "precio_min" => "float", - "importe_fijo" => "float", "margen" => "float", "mostrar_en_presupuesto" => "int", "user_created_id" => "int", diff --git a/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php b/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php index 3f749913..a6ea7177 100755 --- a/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php +++ b/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php @@ -9,8 +9,6 @@ class TarifapreimpresionEntity extends \CodeIgniter\Entity\Entity "id" => null, "nombre" => null, "precio" => null, - "precio_min" => 0, - "importe_fijo" => 0, "margen" => 0, "mostrar_en_presupuesto" => 1, "user_created_id" => 1, @@ -22,8 +20,6 @@ class TarifapreimpresionEntity extends \CodeIgniter\Entity\Entity ]; protected $casts = [ "precio" => "float", - "precio_min" => "float", - "importe_fijo" => "float", "margen" => "float", "mostrar_en_presupuesto" => "int", "user_created_id" => "int", diff --git a/ci4/app/Language/en/Tarifamanipulado.php b/ci4/app/Language/en/Tarifamanipulado.php index da383fea..85d90b74 100755 --- a/ci4/app/Language/en/Tarifamanipulado.php +++ b/ci4/app/Language/en/Tarifamanipulado.php @@ -13,7 +13,7 @@ return [ 'nombre' => 'Name', 'precioMax' => 'Price Max', 'precioMin' => 'Price Min', - 'precioMin' => 'Min Price', + 'importeMinimo' => 'Min Price', 'importeFijo' => 'Fixed amount', 'mostrar_en_presupuesto' => 'Show in budget', 'margen' => 'Margin', diff --git a/ci4/app/Language/es/Tarifamanipulado.php b/ci4/app/Language/es/Tarifamanipulado.php index 9e391d46..20079ddb 100755 --- a/ci4/app/Language/es/Tarifamanipulado.php +++ b/ci4/app/Language/es/Tarifamanipulado.php @@ -10,6 +10,7 @@ return [ 'id' => 'ID', 'moduleTitle' => 'Tarifas Manipulado', 'nombre' => 'Nombre', + 'importeMinimo' => 'Importe mínimo', 'precioMax' => 'Precio T. Mín', 'precioMin' => 'Precio T. Máx', 'importeFijo' => 'Importe Fijo', diff --git a/ci4/app/Models/Presupuestos/PresupuestoManipuladosModel.php b/ci4/app/Models/Presupuestos/PresupuestoManipuladosModel.php index f2dc2638..8612e8a4 100755 --- a/ci4/app/Models/Presupuestos/PresupuestoManipuladosModel.php +++ b/ci4/app/Models/Presupuestos/PresupuestoManipuladosModel.php @@ -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); } diff --git a/ci4/app/Models/Presupuestos/PresupuestoPreimpresionesModel.php b/ci4/app/Models/Presupuestos/PresupuestoPreimpresionesModel.php index 0f3ccb20..a2828855 100755 --- a/ci4/app/Models/Presupuestos/PresupuestoPreimpresionesModel.php +++ b/ci4/app/Models/Presupuestos/PresupuestoPreimpresionesModel.php @@ -69,7 +69,6 @@ class PresupuestoPreimpresionesModel extends \App\Models\BaseModel ]; return $ret_array; } - return []; } private function calcularTarifa($tarifa){ @@ -78,12 +77,6 @@ class PresupuestoPreimpresionesModel extends \App\Models\BaseModel $precio = $precio * (1+ floatval($tarifa->margen)/100.0); $margen = $tarifa->margen; - if($tarifa->tarifa_precio_min > $precio){ - $precio = $precio-($precio * $margen/100.0); - $margen = round(100.0 * (floatval($tarifa->tarifa_precio_min) - $precio) / floatval($tarifa->tarifa_precio_min), 0); - $precio = floatval($tarifa->tarifa_precio_min); - } - return [$precio, $margen]; } diff --git a/ci4/app/Models/Presupuestos/PresupuestoServiciosExtraModel.php b/ci4/app/Models/Presupuestos/PresupuestoServiciosExtraModel.php index e157eb25..60927b0e 100755 --- a/ci4/app/Models/Presupuestos/PresupuestoServiciosExtraModel.php +++ b/ci4/app/Models/Presupuestos/PresupuestoServiciosExtraModel.php @@ -78,12 +78,6 @@ class PresupuestoServiciosExtraModel extends \App\Models\BaseModel $precio = $precio * (1+ floatval($tarifa->margen)/100.0); $margen = $tarifa->margen; - if($tarifa->tarifa_precio_min > $precio){ - $precio = $precio-($precio * $margen/100.0); - $margen = round(100.0 * (floatval($tarifa->tarifa_precio_min) - $precio) / floatval($tarifa->tarifa_precio_min), 0); - $precio = floatval($tarifa->tarifa_precio_min); - } - return [$precio, $margen]; } diff --git a/ci4/app/Models/Tarifas/TarifaextraModel.php b/ci4/app/Models/Tarifas/TarifaextraModel.php index 1ba6c8d2..476550f7 100755 --- a/ci4/app/Models/Tarifas/TarifaextraModel.php +++ b/ci4/app/Models/Tarifas/TarifaextraModel.php @@ -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", @@ -101,8 +83,7 @@ class TarifaextraModel extends \App\Models\BaseModel $builder = $this->db ->table($this->table . " t1") ->select( - "t1.id AS tarifa_extra_id, t1.nombre AS tarifa_extra_nombre, t1.precio AS precio, t1.margen AS margen, - t1.precio_min AS tarifa_precio_min, t1.importe_fijo AS importe_fijo" + "t1.id AS tarifa_extra_id, t1.nombre AS tarifa_extra_nombre, t1.precio AS precio, t1.margen AS margen" ) ->where("t1.is_deleted", 0); //->where("t1.mostrar_en_presupuesto", 1) diff --git a/ci4/app/Models/Tarifas/TarifapreimpresionModel.php b/ci4/app/Models/Tarifas/TarifapreimpresionModel.php index e9ec2b35..6bb1391f 100755 --- a/ci4/app/Models/Tarifas/TarifapreimpresionModel.php +++ b/ci4/app/Models/Tarifas/TarifapreimpresionModel.php @@ -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", @@ -101,8 +83,7 @@ class TarifapreimpresionModel extends \App\Models\BaseModel $builder = $this->db ->table($this->table . " t1") ->select( - "t1.id AS tarifa_preimpresion_id, t1.nombre AS tarifa_preimpresion_nombre, t1.precio AS precio, t1.margen AS margen, - t1.precio_min AS tarifa_precio_min, t1.importe_fijo AS importe_fijo" + "t1.id AS tarifa_preimpresion_id, t1.nombre AS tarifa_preimpresion_nombre, t1.precio AS precio, t1.margen AS margen" ) ->where("t1.is_deleted", 0); //->where("t1.mostrar_en_presupuesto", 1) diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/extra/_tarifaextraFormItems.php b/ci4/app/Views/themes/vuexy/form/tarifas/extra/_tarifaextraFormItems.php index 7980c60e..a51d2a8b 100644 --- a/ci4/app/Views/themes/vuexy/form/tarifas/extra/_tarifaextraFormItems.php +++ b/ci4/app/Views/themes/vuexy/form/tarifas/extra/_tarifaextraFormItems.php @@ -31,34 +31,6 @@ > -