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

Merge pull request 'bug#al-2761' (!192) from AL-2761 into master 

Reviewed-on: adm/VentaBoletosAdm#192
Reviewed-by: Wilian Domingues <wilian@rjconsultores.com.br>
master 1.7.10
Valdir Cordeiro 2023-06-13 13:15:10 +00:00
parent 77e1667925 68c64a87d7
commit 94600df3f6
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.7.9</version>
<version>1.7.10</version>
<packaging>war</packaging>
<properties>
<modelWeb.version>1.5.2</modelWeb.version>
<flyway.version>1.4.0</flyway.version>
<modelWeb.version>1.5.3</modelWeb.version>
<flyway.version>1.4.1</flyway.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>

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

@ -425,16 +425,16 @@ public class GerarConexionPorRutaController extends MyGenericForwardComposer {
adicionaLocalidadesExcluidas();
removeLocalidadesExcluidas();
//Atualizar o indPricing alterado pela tabela
for(ParadaVOConexionRuta loc : localidadesGeradas ) {
for(ConexionCtrl conCtrl : conexoesCtrl) {
localidades: for(ConexionCtrl conCtrl : conexoesCtrl) {
for(ParadaVOConexionRuta loc : localidadesGeradas ) {
if(isMesmaConexao(loc, conCtrl)) {
conCtrl.setIndPricing(loc.getConexionCtrl().getIndPricing());
continue localidades;
}
}
}
conexionCtrlService.suscribirTodos(conexoesCtrl);
List<ConexionDescuento> conexionDescontos = new ArrayList<>();

3
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java
View File

@ -926,7 +926,8 @@ public class EditarPricingController extends PricingController {
return false;
}
if (verificarContemTodasRuta() && verificarContemTodas()) {
//Quando existe pricing conexao permite cadastrar linha e trecho todas
if ( (lsPricingConexao == null || lsPricingConexao.isEmpty()) && verificarContemTodasRuta() && verificarContemTodas()) {
Messagebox.show(
Labels.getLabel("editarPricingController.MSG.noRutaTodasYTrechosTodos"),
Labels.getLabel("editarPricingController.window.title"),

2
web/gui/pricing/editarPricingOcupaAntecipa.zul
View File

@ -72,7 +72,7 @@
converter=com.rjconsultores.ventaboletos.web.utilerias.StringDecimalToDecimalConverter}" />
<label
value="${c:l('editarPricingController.importe.value')}" />
<textbox id="importe" precision="7" scale="2"
<textbox id="importe" precision="10" scale="2"
width="80%"
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"
value="@{winEditarPricingOcupaAntecipa$composer.pricingOcupaAntecipa.importe,