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

Merge pull request 'Fixes bug#AL-4551' (!643) from AL-4551 into master 

Reviewed-on: adm/VentaBoletosAdm#643
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master 1.120.8
Valdir Cordeiro 2024-08-09 19:41:22 +00:00
parent 6453d33adb e41a256e78
commit bd31aec834
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -76,7 +76,7 @@
<dependency> <dependency>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>Flyway</artifactId> <artifactId>Flyway</artifactId>
<version> >${flyway.version}</version> <version>${flyway.version}</version>
</dependency> </dependency>
<dependency> <dependency>

2
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/expressos/CargarPlacaBusExpresoController.java
View File

@ -34,7 +34,7 @@ public class CargarPlacaBusExpresoController extends MyGenericForwardComposer{
trayecto = (TrayectosExpresos) Executions.getCurrent().getArg().get("trayecto"); trayecto = (TrayectosExpresos) Executions.getCurrent().getArg().get("trayecto");
//winCotizarExpresso = (Window) Executions.getCurrent().getArg().get("winCotizarExpresso"); //winCotizarExpresso = (Window) Executions.getCurrent().getArg().get("winCotizarExpresso");
txtRuta.setValue(trayecto.getDescTrayecto()); txtRuta.setValue(trayecto.getDescTrayecto() == null ? "" : trayecto.getDescTrayecto());
} }
public void onClick$btnGuardar(Event event) throws Exception { public void onClick$btnGuardar(Event event) throws Exception {

3
src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderExpresosPorCotizar.java
View File

@ -136,7 +136,8 @@ public class RenderExpresosPorCotizar implements ListitemRenderer {
lc.appendChild(btnCotizar); break; lc.appendChild(btnCotizar); break;
case 2: case 2:
String pagoCreditoConstante = constanteService.buscarPorNomeConstante("FORMAPAGOCREDITO_ID").getValorconstante(); Constante constante = constanteService.buscarPorNomeConstante("FORMAPAGOCREDITO_ID");
String pagoCreditoConstante = constante == null ? "" : constante.getValorconstante();
if(expresos.getFormaPagoId() == null || expresos.getFormaPagoId() != Integer.valueOf(pagoCreditoConstante)) { if(expresos.getFormaPagoId() == null || expresos.getFormaPagoId() != Integer.valueOf(pagoCreditoConstante)) {
Button btnPagoCredito = new Button("Pago Crédito"); Button btnPagoCredito = new Button("Pago Crédito");