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

Merge branch 'master' into AL-1983

master
wallace.henrique 2022-12-29 12:08:54 -03:00
parent 80bc714e87 cd1a21fb9f
commit 7e42f1289d
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pom.xml
View File

@ -1,9 +1,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<properties>
<ventaboletosadm.version>1.0.25</ventaboletosadm.version>
<modelWeb.version>1.0.18</modelWeb.version>
<flyway.version>1.0.8</flyway.version>
</properties>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.0.24</version> <version>${ventaboletosadm.version}</version>
<packaging>war</packaging> <packaging>war</packaging>
<distributionManagement> <distributionManagement>
@ -55,13 +62,13 @@
<dependency> <dependency>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ModelWeb</artifactId> <artifactId>ModelWeb</artifactId>
<version>1.0.17</version> <version>${modelWeb.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>Flyway</artifactId> <artifactId>Flyway</artifactId>
<version>1.0.8</version> <version>${flyway.version}</version>
</dependency> </dependency>
<dependency> <dependency>

8
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarEstacionController.java
View File

@ -272,14 +272,6 @@ public class EditarEstacionController extends MyGenericForwardComposer {
private List<String> getTiposImpressora() { private List<String> getTiposImpressora() {
List<String> tiposImpressora = new ArrayList<String>(); List<String> tiposImpressora = new ArrayList<String>();
for (TipoImpressora tipo : TipoImpressora.values()) { for (TipoImpressora tipo : TipoImpressora.values()) {
if (tipo.equals(TipoImpressora.MACON)) {
boolean isVendaMacon = ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.IS_VENDA_MACON.getDescricao(), Boolean.TRUE);
if (!isVendaMacon) {
continue;
}
}
tiposImpressora.add(tipo.getNome()); tiposImpressora.add(tipo.getNome());
} }
return tiposImpressora; return tiposImpressora;