Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/maven/org.apache.santuario-xmls…
Browse files Browse the repository at this point in the history
…ec-4.0.0
  • Loading branch information
fincatto authored Jun 29, 2024
2 parents 63c460d + 9d785f2 commit f2b7fd3
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<groupId>com.github.wmixvideo</groupId>
<artifactId>nfe</artifactId>
<packaging>jar</packaging>
<version>4.0.38-SNAPSHOT</version>
<version>4.0.42-SNAPSHOT</version>
<name>nfe</name>
<description>Biblioteca de comunicacao de nota fiscal eletronica brasileira</description>
<url>https://github.com/wmixvideo/nfe</url>
Expand All @@ -28,7 +28,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>11</java.version>
<axis2.version>1.7.9</axis2.version>
<slf4j.version>2.0.7</slf4j.version>
<slf4j.version>2.0.12</slf4j.version>
<junit.version>4.13.2</junit.version>
<commons-lang3.version>3.14.0</commons-lang3.version>
<simple-xml.version>2.7.1</simple-xml.version>
Expand Down Expand Up @@ -174,7 +174,7 @@
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>3.12.1</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
Expand Down Expand Up @@ -310,7 +310,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.2</version>
<version>3.6.3</version>
<configuration>
<failOnError>false</failOnError>
<doclint>none</doclint>
Expand All @@ -327,7 +327,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.2</version>
<version>3.2.5</version>
</plugin>
</plugins>
</build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public String getCteStatusServico(final DFAmbiente ambiente) {

@Override
public String getCteQrCode(DFAmbiente ambiente) {
return DFAmbiente.HOMOLOGACAO.equals(ambiente) ? "https://hcte.fazenda.mg.gov.br/portalcte/sistema/qrcode.xhtml" : "https://cte.fazenda.mg.gov.br/portalcte/sistema/qrcode.xhtml";
return "https://cte.fazenda.mg.gov.br/portalcte/sistema/qrcode.xhtml";
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ public boolean isRejeitado() {
}

public boolean isDuplicado() {
return CODIGO_539.getCodigo() == this.codigo;
return CODIGO_539.getCodigo() == this.codigo || CODIGO_204.getCodigo() == this.codigo;
}

public int getCodigo() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ public boolean isRejeitado() {
}

public boolean isDuplicado() {
return CODIGO_539.getCodigo() == this.codigo;
return CODIGO_539.getCodigo() == this.codigo || CODIGO_204.getCodigo() == this.codigo;
}

public boolean isJaInutilizado() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public void isRejeitadoTest() {
@Test
public void isDuplicadoTest() {
Assert.assertTrue(NFRetornoStatus.CODIGO_539.isDuplicado());
Assert.assertTrue(NFRetornoStatus.CODIGO_204.isDuplicado());
Assert.assertFalse(NFRetornoStatus.CODIGO_100.isDuplicado());
}

Expand Down

0 comments on commit f2b7fd3

Please sign in to comment.