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

fixes #AL-2782

master
valdevir 2023-08-18 20:18:46 -03:00
parent 8d7040882a
commit a28c64bd09
7 changed files with 55 additions and 20 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.12.2</version>
<version>1.13.0</version>
<packaging>war</packaging>
<properties>
<modelWeb.version>1.9.1</modelWeb.version>
<flyway.version>1.7.0</flyway.version>
<modelWeb.version>1.10.0</modelWeb.version>
<flyway.version>1.8.0</flyway.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>

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

@ -148,11 +148,9 @@ public class EditarPricingController extends PricingController {
private CategoriaService categoriaService;
@Autowired
private ParadaService paradaService;
@Autowired
private ConexionCtrlService conexionCtrlService;
private Pricing pricing;
private MyListbox pricingList;
private MyListbox pricingVigenciaList;
private MyListbox pricingImporteList;
@ -169,6 +167,8 @@ public class EditarPricingController extends PricingController {
private MyListbox pricingTipoServicioList;
private MyListbox pricingOcupaAntecipaList;
private MyListbox pricingFormapagoList;
private MyListbox conexaoCtrlList;
private List<Empresa> lsEmpresa;
private List<PricingVigencia> lsPricingVigencia;
private List<PricingImporte> lsPricingImporte;
@ -185,7 +185,12 @@ public class EditarPricingController extends PricingController {
private List<PricingRuta> lsPricingRuta;
private List<PricingTipoServicio> lsPricingTipoServicio;
private List<PricingFormapago> lsPricingFormapago;
private Combobox cmbEmpresa;
private List<ConexionCtrl> lsConexoesCtrlList;
private List<ParadaVOConexionRuta> conexoesPricingList;
private List<ParadaVOConexionRuta> conexoesPricingListApresentacao;
private List<Parada> paradasConexao;
private List<PricingConexao> lsPricingConexao;
private Radio rdTransSi;
private Radio rdTransNo;
private Radio rdExibirVendaSi;
@ -196,8 +201,10 @@ public class EditarPricingController extends PricingController {
private Radio rdReserNo;
private Radio radioImp;
private Radio radioPor;
private MyTextboxDecimal descuentoporcredondo;
private MyTextboxDecimal descuentoporcsen;
private Button btnSalvar;
private Button btnCopiar;
private Button btnNovoImporte;
@ -246,32 +253,32 @@ public class EditarPricingController extends PricingController {
private Button btnApagarCategoria;
private Button btnModificarCategoria;
private Button btnModificarFormaPago;
private boolean salvo = false;
private Boolean gravarNovo = Boolean.TRUE;
private Textbox nombrePricing;
private Intbox itxCantboleto;
private Intbox cantdiasanticipacion;
private Combobox cmbIndGeneraFeriadoFechaVenta;
private Combobox cmbIndGeneraFeriadoFechaViaje;
private Integer buscarPricingInativosAtivos;
private Image imgPricingDividirIdaEVolta;
private Checkbox chkIndSomenteAssentoSugerido;
private Checkbox chkIndPricingDividirIdaEVolta;
private Checkbox chkIndSafer;
private Checkbox chkExibePopupPricingPol;
private Combobox cmbConexaoCtrl;
private Combobox cmbIndGeneraFeriadoFechaVenta;
private Combobox cmbIndGeneraFeriadoFechaViaje;
private Combobox cmbEmpresa;
private Radio rdOcupacaoTrechoSim;
private Radio rdOcupacaoTrechoNao;
private Checkbox chkIndSafer;
private Pricing pricing;
private boolean salvo = false;
private Boolean gravarNovo = Boolean.TRUE;
private Integer buscarPricingInativosAtivos;
private List<ConexionCtrl> lsConexoesCtrlList;
private List<ParadaVOConexionRuta> conexoesPricingList;
private List<ParadaVOConexionRuta> conexoesPricingListApresentacao;
private List<Parada> paradasConexao;
private MyListbox conexaoCtrlList;
private List<PricingConexao> lsPricingConexao;
private Combobox cmbConexaoCtrl;
private void clearCombobox(Combobox combobox) {
int size = combobox.getItemCount();
@ -1005,6 +1012,8 @@ public class EditarPricingController extends PricingController {
if (cmbIndGeneraFeriadoFechaViaje.getSelectedItem() != null) {
pricing.setIndGeneraFeriadoViaje((String) cmbIndGeneraFeriadoFechaViaje.getSelectedItem().getValue());
}
chkExibePopupPricingPol.getValue();
pricing.setIndExibePopupPricingPol(chkExibePopupPricingPol.isChecked());
try {
try {

2
web/WEB-INF/i3-label_en.label
View File

@ -4418,6 +4418,8 @@ editarPricingController.label.estadiaMinima = Estadia Mínima
editarPricingController.label.qtdeDias = Qtde Dias
editarPricingController.label.regrasEstadiaMinima = Definição das regras de Estadia Mínima para Viagens de Ida e Volta
editarPricingController.MSG.cantestadiaminima = Informe a quantidades de dias mínimos de estadia
editarEmpresaController.chkExibePopupPricingPol.ajuda=Este campo permite exibir na tela do Totalbus (Cliente de Vendas) uma tela poupup com os preços diferenciados por poltronas.
editarEmpresaController.label.chkExibePopupPricingPol=Exibe Poupup Pricing Poltrona
editarPricingAutomaticoController.columnaDia.label = Qtd. Dias
editarPricingAutomaticoController.columnaPorcentaje.label = Porcentagem

2
web/WEB-INF/i3-label_es_MX.label
View File

@ -4113,6 +4113,8 @@ editarPricingController.label.estadiaMinima = Estadia Mínima
editarPricingController.label.qtdeDias = Qtde Dias
editarPricingController.label.regrasEstadiaMinima = Definição das regras de Estadia Mínima para Viagens de Ida e Volta
editarPricingController.MSG.cantestadiaminima = Informe a quantidades de dias mínimos de estadia
editarEmpresaController.chkExibePopupPricingPol.ajuda=Este campo permite exibir na tela do Totalbus (Cliente de Vendas) uma tela poupup com os preços diferenciados por poltronas.
editarEmpresaController.label.chkExibePopupPricingPol=Exibe Poupup Pricing Poltrona
editarPricingAutomaticoController.columnaDia.label = Numero de días
editarPricingAutomaticoController.columnaPorcentaje.label = Porcentaje

2
web/WEB-INF/i3-label_pt_BR.label
View File

@ -4436,6 +4436,8 @@ editarPricingController.label.estadiaMinima = Estadia Mínima
editarPricingController.label.qtdeDias = Qtde Dias
editarPricingController.label.regrasEstadiaMinima = Definição das regras de Estadia Mínima para Viagens de Ida e Volta
editarPricingController.MSG.cantestadiaminima = Informe a quantidades de dias mínimos de estadia
editarEmpresaController.chkExibePopupPricingPol.ajuda=Este campo permite exibir na tela de selecionar poltrona do Totalbus (Cliente de Vendas) uma tela poupup com os preços diferenciados por poltronas.
editarEmpresaController.label.chkExibePopupPricingPol=Exibe Poupup Pricing Poltrona:
editarPricingAutomaticoController.columnaDia.label = Qtd. Dias
editarPricingAutomaticoController.columnaPorcentaje.label = Porcentagem

11
web/gui/gestao_pricing/editarGP_PricingAsiento.zul
View File

@ -47,6 +47,17 @@
<textbox id="nombImagen" constraint="no empty"
value="@{winEditarGP_PricingAsiento$composer.pricingAsiento.nombImagen}" maxlength="20"/>
</row>
<row>
<hlayout>
<label value="${c:l('editarEmpresaController.label.chkExibePopupPricingPol')}"/>
<image src="/gui/img/Question_mark_1.png" tooltiptext="${c:l('editarEmpresaController.chkExibePopupPricingPol.ajuda')}"
style="cursor: help" />
     </hlayout>
<checkbox
id="chkExibePopupPricingPol"
value="@{winEditarGP_PricingAsiento$composer.pricingAsiento.indExibePopupPricingPol}" />
</row>
</rows>
</grid>
</window>

9
web/gui/pricing/editarPricing.zul
View File

@ -706,6 +706,15 @@
<button disabled="${arg.isReadOnly}"
id="btnModificarAsiento"
label="${c:l('editarPricingController.btnModificar.value')}" />
<hlayout>
<label value="${c:l('editarEmpresaController.label.chkExibePopupPricingPol')}"/>
<checkbox
id="chkExibePopupPricingPol"
checked="@{winEditarPricing$composer.pricing.indExibePopupPricingPol}" />
<image src="/gui/img/Question_mark_1.png" tooltiptext="${c:l('editarEmpresaController.chkExibePopupPricingPol.ajuda')}"
style="cursor: help" />
     </hlayout>
</hbox>
</toolbar>
<listbox id="pricingAsientoList"