fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'bug#al-2753' (!185) from AL-2753 into master 

Reviewed-on: adm/VentaBoletosAdm#185
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
master 1.7.5
Valdir Cordeiro 2023-06-05 12:27:54 +00:00
parent d723c801b3 2d5a52824e
commit 952934cf8a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.7.4</version>
<version>1.7.5</version>
<packaging>war</packaging>
<properties>

8
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/GerarConexionPorRutaController.java
View File

@ -402,17 +402,17 @@ public class GerarConexionPorRutaController extends MyGenericForwardComposer {
conexionRutaConf.setTiempoMin(txtTiempoMin.getValue());
conexionRutaConf.setTiempoMax(txtTiempoMax.getValue());
Double desconto = txtDesconto.getValue();
Double desconto = txtDesconto.getValue() == null ? 0d : txtDesconto.getValue();
Boolean descontoAlterado = false;
BigDecimal descontoAnterior = conexionRutaConf.getDescuento();
//Valida se o desconto ja existia ou se e novo
if(descontoAnterior != null && descontoAnterior.doubleValue() != desconto) {
if(descontoAnterior != null && (desconto != null && descontoAnterior.doubleValue() != desconto)) {
conexionRutaConf.setDescuento(new BigDecimal(desconto));
descontoAlterado = true;
}
if(descontoAnterior == null) {
if(descontoAnterior == null && desconto != null) {
conexionRutaConf.setDescuento(new BigDecimal(desconto));
}
@ -440,7 +440,7 @@ public class GerarConexionPorRutaController extends MyGenericForwardComposer {
List<ConexionDescuento> conexionDescontos = new ArrayList<>();
if(isConexionGerada) {
if(desconto != 0 ) {
if(desconto != null && desconto != 0 ) {
criarNovosDescontosPorConexao(conexionDescontos);
}
} else if(descontoAlterado){ //Se nao foi gerado novas conexoes, mas foi alterado o desconto