diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarSecretariaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarSecretariaController.java
index 548b6e0a8..0ba0f237d 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarSecretariaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarSecretariaController.java
@@ -81,11 +81,13 @@ public class EditarSecretariaController extends MyGenericForwardComposer {
private Textbox txtSubserie;
private Button btnApagar;
private Button btnAdicionarCuponSecretaria;
+ private Button btnSalvar;
private Radio rdPrecioTotal;
private Radio rdPrecioDescuento;
private Radio rdDescuento;
private Checkbox chkValidaFolio;
private Checkbox chkValidaSerieSubserie;
+ private Checkbox chkVoucherRod;
private MyComboboxEstandar cmbEmpresa;
private static Logger log = Logger.getLogger(EditarSecretariaController.class);
@@ -217,6 +219,31 @@ public class EditarSecretariaController extends MyGenericForwardComposer {
this.btnAdicionarCuponSecretaria = btnAdicionarCuponSecretaria;
}
+ public Checkbox getChkVoucherRod() {
+ return chkVoucherRod;
+ }
+
+ public void setChkVoucherRod(Checkbox chkVoucherRod) {
+ this.chkVoucherRod = chkVoucherRod;
+ }
+
+ private void verificaVoucherRod(){
+ Secretaria voucher = secretariaService.buscarSecretariaVoucherRod();
+ if (voucher != null){
+ chkVoucherRod.setDisabled(true);
+ if (voucher.equals(secretaria)){
+ btnApagar.setVisible(false);
+ btnSalvar.setVisible(false);
+ } else {
+ btnApagar.setVisible(true);
+ btnSalvar.setVisible(true);
+ }
+ } else {
+ chkVoucherRod.setDisabled(false);
+ }
+
+ }
+
@Override
public void doAfterCompose(Component comp) throws Exception {
secretaria = (Secretaria) Executions.getCurrent().getArg().get("secretaria");
@@ -229,6 +256,7 @@ public class EditarSecretariaController extends MyGenericForwardComposer {
}
lsEmpresas = empresaService.obtenerTodosIncluindoEmpresaTodas();
super.doAfterCompose(comp);
+
empresasList.setItemRenderer(new RenderSecretariaEmpresa());
empresasList.setData(lsSecretariaEmpresa);
cuponSecretariaList.setItemRenderer(new RenderCuponSecretaria());
@@ -250,6 +278,7 @@ public class EditarSecretariaController extends MyGenericForwardComposer {
// Prenche Documento
chkValidaFolio.setChecked(secretaria.getValidafolio());
chkValidaFolio.setDisabled(Boolean.FALSE);
+ chkVoucherRod.setChecked(secretaria.getIndVoucherRod());
onClick$chkValidaFolio(null);
// Prenche Serie e subserie
chkValidaSerieSubserie.setChecked(secretaria.getValidaSerieSubSerie());
@@ -261,6 +290,8 @@ public class EditarSecretariaController extends MyGenericForwardComposer {
}
insereConstrants();
txtDescSecretaria.focus();
+
+ verificaVoucherRod();
}
public void onClick$btnRemoverEmpresa(Event ev) throws InterruptedException {
@@ -337,6 +368,7 @@ public class EditarSecretariaController extends MyGenericForwardComposer {
secretaria.setLsCuponSecretaria(lsCuponSecretaria);
secretaria.setValidafolio(chkValidaFolio.isChecked());
secretaria.setValidaSerieSubSerie(chkValidaSerieSubserie.isChecked());
+ secretaria.setIndVoucherRod(chkVoucherRod.isChecked());
if (rdDescuento.isChecked()) {
secretaria.setImprimeprecio(Secretaria.DESCUENTO_COBRAR);
} else if (rdPrecioDescuento.isChecked()) {
diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label
index 4a544fb6d..a7b3ab8b4 100644
--- a/web/WEB-INF/i3-label_es_MX.label
+++ b/web/WEB-INF/i3-label_es_MX.label
@@ -4225,6 +4225,8 @@ editarSecretariaController.btnFechar.tooltiptext = Cerrar
editarSecretariaController.lbDescSecretaria.value = Orden de compra - Secretaria
editarSecretariaController.lbCveSecretaria.value = Código secretaria
editarSecretariaController.lbValidaFolio.value = Validar numero del documento
+editarSecretariaController.lbSerieSubserie.value = Validar Série e Subsérie
+editarSecretariaController.lbVoucherRod.value = Voucher Rod
editarSecretariaController.lbPorcDescuentoOutros.value=% Outros
editarSecretariaController.lbPorcDescuentoPedagio.value=% Peaje
editarSecretariaController.lbPorcDescuentoSeguro.value=% Seguro
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index 586bb1deb..cd803efb8 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -4452,6 +4452,7 @@ editarSecretariaController.lbDescSecretaria.value = Ordem de Serviço - Secreta
editarSecretariaController.lbCveSecretaria.value = Código Secretaria
editarSecretariaController.lbValidaFolio.value = Validar Número do Documento
editarSecretariaController.lbSerieSubserie.value = Validar Série e Subsérie
+editarSecretariaController.lbVoucherRod.value = Voucher Rod
editarSecretariaController.lbPorcDescuentoOutros.value=% Outros
editarSecretariaController.lbPorcDescuentoPedagio.value=% Pedagio
editarSecretariaController.lbPorcDescuentoSeguro.value=% Seguro
diff --git a/web/gui/configuraciones_comerciales/editarSecretaria.zul b/web/gui/configuraciones_comerciales/editarSecretaria.zul
index b0ee7901a..7a29bfb3c 100644
--- a/web/gui/configuraciones_comerciales/editarSecretaria.zul
+++ b/web/gui/configuraciones_comerciales/editarSecretaria.zul
@@ -70,6 +70,12 @@
value="@{winEditarSecretaria$composer.secretaria.validaseriesubserie}"
checked="true" />
+
+
+
+