From dabbda005bef92c95c75f6c28a15518ef85502e1 Mon Sep 17 00:00:00 2001 From: "daniel.zauli" Date: Wed, 20 Sep 2017 19:52:34 +0000 Subject: [PATCH] fixes bug #9472 commit 2 de 2 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@74055 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../sendaAmigo/EditarClienteController.java | 32 +++++++++++++++++++ web/WEB-INF/i3-label_es_MX.label | 1 + web/WEB-INF/i3-label_pt_BR.label | 1 + web/gui/senda_amigo/editarCliente.zul | 6 ++++ 4 files changed, 40 insertions(+) diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarClienteController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarClienteController.java index f0639f37f..07216f180 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarClienteController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarClienteController.java @@ -147,6 +147,10 @@ public class EditarClienteController extends MyGenericForwardComposer { private MyComboboxParada cmbParadaDestino; private MyComboboxParadaCve cmbParadaDestinoCve; private Parada destino; + + private Checkbox chkVender1porCorrida; + private Boolean boolVender1porCorrida; + private Checkbox chkINDLUNES; private Boolean boolINDLUNES; private Checkbox chkINDMARTES; @@ -575,6 +579,9 @@ public class EditarClienteController extends MyGenericForwardComposer { cmbParadaDestino.setDisabled(false); cmbParadaDestinoCve.setConstraint(""); cmbParadaDestinoCve.setDisabled(false); + + chkVender1porCorrida.setDisabled(false); + chkINDLUNES.setDisabled(false); chkINDMARTES.setDisabled(false); chkINDMIERCOLES.setDisabled(false); @@ -608,6 +615,11 @@ public class EditarClienteController extends MyGenericForwardComposer { cmbParadaDestinoCve.setConstraint(""); cmbParadaDestinoCve.setValue(""); cmbParadaDestinoCve.setDisabled(true); + + chkVender1porCorrida.setChecked(false); + chkVender1porCorrida.setDisabled(true); + boolVender1porCorrida = null; + chkINDLUNES.setChecked(false); chkINDLUNES.setDisabled(true); boolINDLUNES = null; @@ -673,6 +685,9 @@ public class EditarClienteController extends MyGenericForwardComposer { cmbParadaDestino.setDisabled(false); cmbParadaDestinoCve.setConstraint(""); cmbParadaDestinoCve.setDisabled(false); + + chkVender1porCorrida.setDisabled(false); + chkINDLUNES.setDisabled(false); chkINDMARTES.setDisabled(false); chkINDMIERCOLES.setDisabled(false); @@ -706,6 +721,11 @@ public class EditarClienteController extends MyGenericForwardComposer { cmbParadaDestinoCve.setConstraint(""); cmbParadaDestinoCve.setValue(""); cmbParadaDestinoCve.setDisabled(true); + + chkVender1porCorrida.setChecked(false); + chkVender1porCorrida.setDisabled(true); + boolVender1porCorrida = null; + chkINDLUNES.setChecked(false); chkINDLUNES.setDisabled(true); boolINDLUNES = null; @@ -976,6 +996,14 @@ public class EditarClienteController extends MyGenericForwardComposer { } + public Boolean getBoolVender1porCorrida() { + return boolVender1porCorrida; + } + + public void setBoolVender1porCorrida(Boolean boolVender1porCorrida) { + this.boolVender1porCorrida = boolVender1porCorrida; + } + public Boolean getBoolINDLUNES() { return boolINDLUNES; } @@ -1221,6 +1249,7 @@ public class EditarClienteController extends MyGenericForwardComposer { clienteDescuento.setINDJUEVES(chkINDJUEVES.isChecked()); clienteDescuento.setINDVIERNES(chkINDVIERNES.isChecked()); clienteDescuento.setINDSABADO(chkINDSABADO.isChecked()); + clienteDescuento.setINDVENDER1PORCORRIDA(chkVender1porCorrida.isChecked()); } if (null != cantMaxMes.getValue()) { @@ -1420,6 +1449,7 @@ public class EditarClienteController extends MyGenericForwardComposer { cmbParadaDestino.setModel(new BindingListModelList(new ArrayList(), true)); cmbParadaDestinoCve.setSelectedItem(null); cmbParadaDestinoCve.setModel(new BindingListModelList(new ArrayList(), true)); + chkVender1porCorrida.setChecked(false); chkINDLUNES.setChecked(false); chkINDMARTES.setChecked(false); chkINDMIERCOLES.setChecked(false); @@ -1450,6 +1480,7 @@ public class EditarClienteController extends MyGenericForwardComposer { cmbParadaDestino.setInitialValue(cd.getDestino()); cmbParadaDestinoCve.setText(cd.getDestino().getCveparada()); destino = cd.getDestino(); + chkVender1porCorrida.setChecked(cd.getINDVENDER1PORCORRIDA()); chkINDLUNES.setChecked(cd.getINDLUNES()); chkINDMARTES.setChecked(cd.getINDMARTES()); chkINDMIERCOLES.setChecked(cd.getINDMIERCOLES()); @@ -1461,6 +1492,7 @@ public class EditarClienteController extends MyGenericForwardComposer { cantMaxMes.setValue(cantMaxMesInt); datInicial.setValue(cd.getFecIni()); datFinal.setValue(cd.getFecFin()); + boolVender1porCorrida = cd.getINDVENDER1PORCORRIDA(); boolINDLUNES = cd.getINDLUNES(); boolINDMARTES = cd.getINDMARTES(); boolINDMIERCOLES = cd.getINDMIERCOLES(); diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 38cbe5090..fc05e50dc 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -1556,6 +1556,7 @@ editarConfiguracionReservacionController.lbTiempoPrevio = Prévio reservar editarConfiguracionReservacionController.lbTiempoPrevioInternet = Prévio reservar en internet editarConfiguracionReservacionController.lbNumAsientosCorrida.value = Numero de asientos editarConfiguracionReservacionController.lbDias.value = Dias de la Semana +editarConfiguracionReservacionController.lbchkVender1porCorrida.value = Vender 1 por viagem editarConfiguracionReservacionController.lbLun.value = Lunes editarConfiguracionReservacionController.lbMar.value = Martes editarConfiguracionReservacionController.lbMie.value = Miércoles diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 2ed61a963..ab8ba1890 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -1706,6 +1706,7 @@ editarConfiguracionReservacionController.lbTiempoPrevio = Prévio reservar editarConfiguracionReservacionController.lbTiempoPrevioInternet = Prévio reservar em internet editarConfiguracionReservacionController.lbNumAsientosCorrida.value = Número de poltronas editarConfiguracionReservacionController.lbDias.value = Dias da Semana +editarConfiguracionReservacionController.lbchkVender1porCorrida.value = Vender 1 por viagem editarConfiguracionReservacionController.lbLun.value = Segunda editarConfiguracionReservacionController.lbMar.value = Terça editarConfiguracionReservacionController.lbMie.value = Quarta diff --git a/web/gui/senda_amigo/editarCliente.zul b/web/gui/senda_amigo/editarCliente.zul index d2e9b02ed..cfe1a559a 100644 --- a/web/gui/senda_amigo/editarCliente.zul +++ b/web/gui/senda_amigo/editarCliente.zul @@ -315,6 +315,12 @@ + +