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

fixed bug#17782 

dev:Thiago
qua:Wallysson

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@99954 d1611594-4594-4d17-8e1d-87c2c4800839
master
frederico 2020-01-29 17:47:18 +00:00
parent f59070ab25
commit 1e5e44d1f2
2 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java
View File

@ -146,7 +146,6 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
private Combobox cmbEstadoImposto; private Combobox cmbEstadoImposto;
private Combobox cmbCidade; private Combobox cmbCidade;
private Combobox cmbCRT; private Combobox cmbCRT;
private Row rowEquivalencia;
private List<Estado> lsEstados; private List<Estado> lsEstados;
private List<Estado> lsTodosEstados; private List<Estado> lsTodosEstados;
private List<Ciudad> lsCidades; private List<Ciudad> lsCidades;
@ -263,6 +262,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
private CKeditor messageConteudoEmail; private CKeditor messageConteudoEmail;
private CKeditor messageConteudoEmailFiscal; private CKeditor messageConteudoEmailFiscal;
private CKeditor messageCupomEmbarque; private CKeditor messageCupomEmbarque;
private Row rowNumFolio;
private static final String EMAIL_PATTERN = "^[_A-Za-z0-9-\\+]+(\\.[_A-Za-z0-9-]+)*@" private static final String EMAIL_PATTERN = "^[_A-Za-z0-9-\\+]+(\\.[_A-Za-z0-9-]+)*@"
+ "[A-Za-z0-9-]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,})$"; + "[A-Za-z0-9-]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,})$";
@ -435,9 +435,6 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
} }
} }
if (!ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.MOSTRAR_EQUIVALENCIA.getDescricao())) {
rowEquivalencia.setVisible(Boolean.FALSE);
}
comEmpCategoriaList.setItemRenderer(new RenderComEmpCategoria()); comEmpCategoriaList.setItemRenderer(new RenderComEmpCategoria());
if (empresa.getComEmpCategorias() != null) { if (empresa.getComEmpCategorias() != null) {
@ -461,6 +458,11 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
} }
carrergarParametrosComissao(); carrergarParametrosComissao();
if (!getGeneraNumfoliosistemaVtaInternetImp()) {
rowNumFolio.setVisible(false);
}
} }
public void onClick$chkAutenticacao(Event ev) { public void onClick$chkAutenticacao(Event ev) {
@ -1523,6 +1525,10 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
public Boolean getGeneraNumfoliosistemaVtaInternetImp() { public Boolean getGeneraNumfoliosistemaVtaInternetImp() {
return UsuarioLogado.getUsuarioLogado().isPermisoClave(ConstantesFuncionSistema.CLAVE_GENERA_FOLIOSISTEMA_VTA_INT_IMP_POSTERIOR); return UsuarioLogado.getUsuarioLogado().isPermisoClave(ConstantesFuncionSistema.CLAVE_GENERA_FOLIOSISTEMA_VTA_INT_IMP_POSTERIOR);
} }
public Boolean desabilitarEquivalencia() {
return !ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.MOSTRAR_EQUIVALENCIA.getDescricao());
}
public Checkbox getChkHabilitarFidelidade() { public Checkbox getChkHabilitarFidelidade() {
return chkHabilitarFidelidade; return chkHabilitarFidelidade;

35
web/gui/catalogos/editarEmpresa.zul
View File

@ -183,32 +183,34 @@
</groupbox> </groupbox>
</row> </row>
<row id="rowEquivalencia"> <row>
<groupbox > <groupbox>
<caption label="${c:l('lb.Equivalencia')}" />            <caption label="${c:l('lb.Equivalencia')}" />           
            <hlayout>                           <hlayout>              
<textbox id="txtEquivalencia" <textbox id="txtEquivalencia"
width="100px" maxlength="10" width="100px" maxlength="10"
value="@{winEditarEmpresa$composer.empresa.equivalenciaId}" value="@{winEditarEmpresa$composer.empresa.equivalenciaId}"
disabled = "@{winEditarEmpresa$composer.desabilitarEquivalencia}"
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" /> use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
<image src="/gui/img/Question_mark_1.png" tooltiptext="${c:l('lb.Equivalencia')}" <image src="/gui/img/Question_mark_1.png" tooltiptext="${c:l('lb.Equivalencia')}"
style="cursor: help" /> style="cursor: help" />
            </hlayout>             </hlayout>
</groupbox> </groupbox>
<groupbox visible="@{winEditarEmpresa$composer.generaNumfoliosistemaVtaInternetImp}" > <groupbox >
<caption label="${c:l('editarEmpresaController.generaNumfoliosistemaVtaInternetImp')}" />            <caption label="${c:l('editarEmpresaController.permitirImpressaoGratuidade')}" />           
            <hlayout>                           <hlayout>              
<checkbox <checkbox
id="chkIndgennumfoliovtaintimpost" id="chkPermitirImpressaoGratuidade"
value="@{winEditarEmpresa$composer.empresa.indgennumfoliovtaintimpost}" /> value="@{winEditarEmpresa$composer.empresa.indImprimeGratuidade}" />
<image src="/gui/img/Question_mark_1.png" tooltiptext="${c:l('editarEmpresaController.generaNumfoliosistemaVtaInternetImp.ajuda')}" <image src="/gui/img/Question_mark_1.png" tooltiptext="${c:l('editarEmpresaController.permitirImpressaoGratuidade.ajuda')}"
style="cursor: help" /> style="cursor: help" />
            </hlayout>             </hlayout>
</groupbox> </groupbox>
</row> </row>
<row> <row id="rowNumFolio">
<groupbox visible="@{winEditarEmpresa$composer.generaNumfoliosistemaVtaInternetImp}" > <groupbox >
<caption label="${c:l('editarEmpresaController.obrigarInformarNomePassageiro')}" />            <caption label="${c:l('editarEmpresaController.obrigarInformarNomePassageiro')}" />           
            <hlayout>                           <hlayout>              
<checkbox <checkbox
@ -218,13 +220,14 @@
style="cursor: help" /> style="cursor: help" />
            </hlayout>             </hlayout>
</groupbox> </groupbox>
<groupbox >
<caption label="${c:l('editarEmpresaController.permitirImpressaoGratuidade')}" />            <groupbox>
<caption label="${c:l('editarEmpresaController.generaNumfoliosistemaVtaInternetImp')}" />           
            <hlayout>                           <hlayout>              
<checkbox <checkbox
id="chkPermitirImpressaoGratuidade" id="chkIndgennumfoliovtaintimpost"
value="@{winEditarEmpresa$composer.empresa.indImprimeGratuidade}" /> value="@{winEditarEmpresa$composer.empresa.indgennumfoliovtaintimpost}" />
<image src="/gui/img/Question_mark_1.png" tooltiptext="${c:l('editarEmpresaController.permitirImpressaoGratuidade.ajuda')}" <image src="/gui/img/Question_mark_1.png" tooltiptext="${c:l('editarEmpresaController.generaNumfoliosistemaVtaInternetImp.ajuda')}"
style="cursor: help" /> style="cursor: help" />
            </hlayout>             </hlayout>
</groupbox> </groupbox>