From 30dca49f11fc16c63becb6e280087c76f4a87514 Mon Sep 17 00:00:00 2001 From: celio Date: Mon, 7 Oct 2024 18:27:32 -0300 Subject: [PATCH 1/2] fixes bug#AL-4905 --- pom.xml | 2 +- .../pricing/EditarPricingController.java | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index e7ef939b3..4528f545e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.152.2 + 1.152.3 war diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java index 950714dc0..8006b18b1 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java @@ -605,7 +605,9 @@ public class EditarPricingController extends PricingController { if (pricing.getIndreservable() == Boolean.FALSE) { rdReserNo.setChecked(true); } - if (pricing.getDescuentoporcentaje() != null) { + Boolean isDescPorcentagem = isDescPorcentagem(); + + if (isDescPorcentagem) { radioPor.setChecked(true); } @@ -618,7 +620,7 @@ public class EditarPricingController extends PricingController { chkIndSafer.setChecked(pricing.getIndSafer()); } - if (lsPricingImporte.size() > 0) { + if (!isDescPorcentagem) { radioImp.setChecked(true); onClick$radioImp(null); } else { @@ -736,6 +738,11 @@ public class EditarPricingController extends PricingController { } } + private boolean isDescPorcentagem() { + return (pricing.getDescuentoporcentaje() != null || pricing.getDescuentoporcredondo() != null) + && (lsPricingImporte == null || lsPricingImporte.isEmpty() || lsPricingImporte.size() < 0); + } + private void incluirCategoria(Categoria categoria) { if (categoria != null && verificarCategoriaNaoAdicionada(categoria)) { PricingCategoria pc = new PricingCategoria(); From 17ac99ab5e4d51fc321bffffa4defce2b9cabfda Mon Sep 17 00:00:00 2001 From: celio Date: Mon, 7 Oct 2024 18:31:52 -0300 Subject: [PATCH 2/2] =?UTF-8?q?altera=C3=A7=C3=A3o=20para=20primitivo.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/gui/controladores/pricing/EditarPricingController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java index 8006b18b1..3312d30c1 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java @@ -605,7 +605,7 @@ public class EditarPricingController extends PricingController { if (pricing.getIndreservable() == Boolean.FALSE) { rdReserNo.setChecked(true); } - Boolean isDescPorcentagem = isDescPorcentagem(); + boolean isDescPorcentagem = isDescPorcentagem(); if (isDescPorcentagem) { radioPor.setChecked(true);