diff --git a/src/com/rjconsultores/ventaboletos/enums/TipoImpressora.java b/src/com/rjconsultores/ventaboletos/enums/TipoImpressora.java index c9de660ec..d213eb968 100644 --- a/src/com/rjconsultores/ventaboletos/enums/TipoImpressora.java +++ b/src/com/rjconsultores/ventaboletos/enums/TipoImpressora.java @@ -11,7 +11,8 @@ public enum TipoImpressora { DARUMA(4, Labels.getLabel("editarEstacionController.tipoImpressora.darumaFiscal"), true), DARUMA_BLINDADA(5, Labels.getLabel("editarEstacionController.tipoImpressora.darumaFiscalBlindada"), true), STOCK_CENTRAL(6, Labels.getLabel("editarEstacionController.tipoImpressora.stockCentral"), true), - BPE(7, Labels.getLabel("editarEstacionController.tipoImpressora.bpe"), true); + BPE(7, Labels.getLabel("editarEstacionController.tipoImpressora.bpe"), true), + MACON(8, Labels.getLabel("editarEstacionController.tipoImpressora.macon"), true); private final int codigo; private final String nome; diff --git a/src/com/rjconsultores/ventaboletos/utilerias/ApplicationProperties.java b/src/com/rjconsultores/ventaboletos/utilerias/ApplicationProperties.java index 240d2ceb4..c29fbed64 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/ApplicationProperties.java +++ b/src/com/rjconsultores/ventaboletos/utilerias/ApplicationProperties.java @@ -136,7 +136,12 @@ public class ApplicationProperties { */ public boolean isCustomHabilitado(String key, String defaultValue) { String property = getValuefromCustom(key, defaultValue); - return property.equals("1"); + return property.equals("1") ; + } + + public boolean isCustomHabilitado(String key, Boolean defaultValue) { + String property = getValuefromCustom(key, defaultValue.toString()); + return property.equals("true") ; } private InputStream readImagefromCustom(String imagene) throws FileNotFoundException, IOException { diff --git a/src/com/rjconsultores/ventaboletos/utilerias/CustomEnum.java b/src/com/rjconsultores/ventaboletos/utilerias/CustomEnum.java index 3e4244107..d5198c88d 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/CustomEnum.java +++ b/src/com/rjconsultores/ventaboletos/utilerias/CustomEnum.java @@ -153,7 +153,9 @@ public enum CustomEnum { IS_DESABILITA_USUARIO_ADMINISTRADORES_PERFIL("dasabilitaUsuarioAdministradoresPerfil"), - INTEGRACION_SAFER("integracion.safer"); + INTEGRACION_SAFER("integracion.safer"), + + IS_VENDA_MACON("IsVendaMacon"); private String descricao;