Merge branch 'wmixvideo:master' into master

wmixvideo · Jul 16, 2024 · acc91c1 · acc91c1
2 parents 440e1cf + d569082
commit acc91c1
Show file tree

Hide file tree

Showing 62 changed files with 18,122 additions and 90 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,13 +13,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.1.7
 
       - name: Install Java and Maven
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.2.1
         with:
-          java-version: '11'
-          distribution: 'adopt'
+          java-version: '17'
+          distribution: 'temurin'
+          cache: maven
 
       - name: Adding ssh key
         uses: webfactory/ssh-agent@v0.4.1
@@ -36,15 +37,17 @@ jobs:
         with:
           gpg_private_key: ${{ secrets.gpg_private_key }}
           gpg_passphrase: ${{ secrets.gpg_passphrase }}
-          nexus_username: ${{ secrets.nexus_username }}
-          nexus_password: ${{ secrets.nexus_password }}
-          maven_goals_phases: clean -B release:prepare release:perform -Darguments="-DskipTests" -P central
-
-      - name: Set up Java for publishing to GitHub Packages
-        uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'adopt'
+#          nexus_username: ${{ secrets.nexus_username }}
+#          nexus_password: ${{ secrets.nexus_password }}
+          nexus_username: ${{ secrets.OSSRH_USERNAME }}
+          nexus_password: ${{ secrets.OSSRH_TOKEN }}
+          maven_goals_phases: clean -B release:prepare release:perform -Darguments="-DskipTests" -P ossrh
+
+#      - name: Set up Java for publishing to GitHub Packages
+#        uses: actions/setup-java@v3
+#        with:
+#          java-version: '11'
+#          distribution: 'adopt'
 
       - name: Publish to GitHub Packages
         run: mvn --batch-mode deploy -P github

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <groupId>com.github.wmixvideo</groupId>
     <artifactId>nfe</artifactId>
     <packaging>jar</packaging>
-    <version>4.0.51-SNAPSHOT</version>
+    <version>4.0.57-SNAPSHOT</version>
     <name>nfe</name>
     <description>Biblioteca de comunicacao de nota fiscal eletronica brasileira</description>
     <url>https://github.com/wmixvideo/nfe</url>
@@ -226,15 +226,15 @@
 
     <profiles>
         <profile>
-            <id>central</id>
+            <id>ossrh</id>
             <distributionManagement>
                 <snapshotRepository>
                     <id>ossrh</id>
-                    <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+                    <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
                 </snapshotRepository>
                 <repository>
                     <id>ossrh</id>
-                    <url>https://oss.sonatype.org/content/repositories/releases</url>
+                    <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
                 </repository>
             </distributionManagement>
         </profile>
@@ -258,7 +258,8 @@
                         <extensions>true</extensions>
                         <configuration>
                             <serverId>ossrh</serverId>
-                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+<!--                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>-->
+                            <nexusUrl>https://s01.oss.sonatype.org</nexusUrl>
                             <autoReleaseAfterClose>true</autoReleaseAfterClose>
                         </configuration>
                     </plugin>

diff --git a/src/main/java/com/fincatto/documentofiscal/nfe400/classes/NFOrigemProcesso.java b/src/main/java/com/fincatto/documentofiscal/nfe400/classes/NFOrigemProcesso.java
@@ -6,6 +6,7 @@ public enum NFOrigemProcesso {
     JUSTICA_FEDERAL("1", "Justi\u00e7a Federal"),
     JUSTICA_ESTADUAL("2", "Justi\u00e7a Estadual"),
     SECEX_RFB("3", "Secex RFB"),
+    CONFAZ("4", "CONFAZ"),
     OUTROS("9", "Outros");
 
     private final String codigo;

diff --git a/src/main/java/com/fincatto/documentofiscal/nfe400/classes/NFTipoDeducaoIcms.java b/src/main/java/com/fincatto/documentofiscal/nfe400/classes/NFTipoDeducaoIcms.java
@@ -0,0 +1,33 @@
+package com.fincatto.documentofiscal.nfe400.classes;
+
+public enum NFTipoDeducaoIcms {
+
+    NAO_DEDUZ_VALOR_ITEM("0", "Sem Dedu\u00e7\u00e3o do Valor do Item"),
+    DEDUZ_VALOR_ITEM("1", "Deduz do Valor do Item");
+
+    private final String codigo;
+    private final String descricao;
+
+    NFTipoDeducaoIcms(final String codigo, final String descricao) {
+        this.codigo = codigo;
+        this.descricao = descricao;
+    }
+
+    public String getCodigo() {
+        return this.codigo;
+    }
+
+    public static NFTipoDeducaoIcms valueOfCodigo(final String codigo) {
+        for (final NFTipoDeducaoIcms tipo : NFTipoDeducaoIcms.values()) {
+            if (tipo.getCodigo().equals(codigo)) {
+                return tipo;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public String toString() {
+        return codigo + " - " + descricao;
+    }
+}
diff --git a/src/main/java/com/fincatto/documentofiscal/nfe400/classes/nota/NFNotaInfoCartao.java b/src/main/java/com/fincatto/documentofiscal/nfe400/classes/nota/NFNotaInfoCartao.java
@@ -18,6 +18,12 @@ public class NFNotaInfoCartao extends DFBase {
 
     @Element(name = "cAut", required = false)
     private String numeroAutorizacaoOperacaoCartao;
+
+    @Element(name = "CNPJReceb", required = false)
+    private String cnpjBenefPagamento;
+
+    @Element(name = "idTermPag", required = false)
+    private String identificadorTerminalPagamento;
 
     public void setCnpj(final String cnpj) {
         DFStringValidador.cnpj(cnpj);
@@ -53,4 +59,20 @@ public void setTipoIntegracao(final NFTipoIntegracaoPagamento tipoIntegracao) {
         this.tipoIntegracao = tipoIntegracao;
     }
 
+    public String getCnpjBenefPagamento() {
+        return cnpjBenefPagamento;
+    }
+
+    public void setCnpjBenefPagamento(String cnpjBenefPagamento) {
+        this.cnpjBenefPagamento = cnpjBenefPagamento;
+    }
+
+    public String getIdentificadorTerminalPagamento() {
+        return identificadorTerminalPagamento;
+    }
+
+    public void setIdentificadorTerminalPagamento(String identificadorTerminalPagamento) {
+        this.identificadorTerminalPagamento = identificadorTerminalPagamento;
+    }
+
 }
diff --git a/...in/java/com/fincatto/documentofiscal/nfe400/classes/nota/NFNotaInfoItemImpostoICMS20.java b/...in/java/com/fincatto/documentofiscal/nfe400/classes/nota/NFNotaInfoItemImpostoICMS20.java
@@ -5,32 +5,33 @@
 import com.fincatto.documentofiscal.nfe400.classes.NFNotaInfoItemModalidadeBCICMS;
 import com.fincatto.documentofiscal.nfe400.classes.NFNotaMotivoDesoneracaoICMS;
 import com.fincatto.documentofiscal.nfe400.classes.NFOrigem;
+import com.fincatto.documentofiscal.nfe400.classes.NFTipoDeducaoIcms;
 import com.fincatto.documentofiscal.validadores.DFBigDecimalValidador;
-import org.simpleframework.xml.Element;
-
 import java.math.BigDecimal;
+import org.simpleframework.xml.Element;
 
 public class NFNotaInfoItemImpostoICMS20 extends DFBase {
+
     private static final long serialVersionUID = -7632059708755735047L;
-    
+
     @Element(name = "orig")
     private NFOrigem origem;
-    
+
     @Element(name = "CST")
     private NFNotaInfoImpostoTributacaoICMS situacaoTributaria;
-    
+
     @Element(name = "modBC")
     private NFNotaInfoItemModalidadeBCICMS modalidadeBCICMS;
-    
+
     @Element(name = "pRedBC")
     private String percentualReducaoBC;
-    
+
     @Element(name = "vBC")
     private String valorBCICMS;
-    
+
     @Element(name = "pICMS")
     private String percentualAliquota;
-    
+
     @Element(name = "vICMS")
     private String valorTributo;
 
@@ -49,6 +50,9 @@ public class NFNotaInfoItemImpostoICMS20 extends DFBase {
     @Element(name = "motDesICMS", required = false)
     private NFNotaMotivoDesoneracaoICMS desoneracao;
 
+    @Element(name = "indDeduzDeson", required = false)
+    private NFTipoDeducaoIcms indicaDeduzDesoneracao;
+
     public void setOrigem(final NFOrigem origem) {
         this.origem = origem;
     }
@@ -147,4 +151,12 @@ public String getPercentualFundoCombatePobreza() {
     public String getValorFundoCombatePobreza() {
         return this.valorFundoCombatePobreza;
     }
-}
+
+    public NFTipoDeducaoIcms getIndicaDeduzDesoneracao() {
+        return indicaDeduzDesoneracao;
+    }
+
+    public void setIndicaDeduzDesoneracao(NFTipoDeducaoIcms indicaDeduzDesoneracao) {
+        this.indicaDeduzDesoneracao = indicaDeduzDesoneracao;
+    }
+}
diff --git a/...in/java/com/fincatto/documentofiscal/nfe400/classes/nota/NFNotaInfoItemImpostoICMS30.java b/...in/java/com/fincatto/documentofiscal/nfe400/classes/nota/NFNotaInfoItemImpostoICMS30.java
@@ -5,20 +5,21 @@
 import com.fincatto.documentofiscal.nfe400.classes.NFNotaInfoItemModalidadeBCICMSST;
 import com.fincatto.documentofiscal.nfe400.classes.NFNotaMotivoDesoneracaoICMS;
 import com.fincatto.documentofiscal.nfe400.classes.NFOrigem;
+import com.fincatto.documentofiscal.nfe400.classes.NFTipoDeducaoIcms;
 import com.fincatto.documentofiscal.validadores.DFBigDecimalValidador;
-import org.simpleframework.xml.Element;
-
 import java.math.BigDecimal;
+import org.simpleframework.xml.Element;
 
 public class NFNotaInfoItemImpostoICMS30 extends DFBase {
+
     private static final long serialVersionUID = 5195970258396234982L;
-    
+
     @Element(name = "orig")
     private NFOrigem origem;
-    
+
     @Element(name = "CST")
     private NFNotaInfoImpostoTributacaoICMS situacaoTributaria;
-    
+
     @Element(name = "modBCST")
     private NFNotaInfoItemModalidadeBCICMSST modalidadeBCICMSST;
 
@@ -27,13 +28,13 @@ public class NFNotaInfoItemImpostoICMS30 extends DFBase {
 
     @Element(name = "pRedBCST", required = false)
     private String percentualReducaoBCICMSST;
-    
+
     @Element(name = "vBCST")
     private String valorBCICMSST;
-    
+
     @Element(name = "pICMSST")
     private String percentualAliquotaImpostoICMSST;
-    
+
     @Element(name = "vICMSST")
     private String valorImpostoICMSST;
 
@@ -52,6 +53,9 @@ public class NFNotaInfoItemImpostoICMS30 extends DFBase {
     @Element(name = "motDesICMS", required = false)
     private NFNotaMotivoDesoneracaoICMS desoneracao;
 
+    @Element(name = "indDeduzDeson", required = false)
+    private NFTipoDeducaoIcms indicaDeduzDesoneracao;
+
     public void setOrigem(final NFOrigem origem) {
         this.origem = origem;
     }
@@ -158,4 +162,12 @@ public String getValorBCFundoCombatePobrezaST() {
     public String getValorFundoCombatePobrezaST() {
         return this.valorFundoCombatePobrezaST;
     }
-}
+
+    public NFTipoDeducaoIcms getIndicaDeduzDesoneracao() {
+        return indicaDeduzDesoneracao;
+    }
+
+    public void setIndicaDeduzDesoneracao(NFTipoDeducaoIcms indicaDeduzDesoneracao) {
+        this.indicaDeduzDesoneracao = indicaDeduzDesoneracao;
+    }
+}
diff --git a/...in/java/com/fincatto/documentofiscal/nfe400/classes/nota/NFNotaInfoItemImpostoICMS40.java b/...in/java/com/fincatto/documentofiscal/nfe400/classes/nota/NFNotaInfoItemImpostoICMS40.java
@@ -4,10 +4,10 @@
 import com.fincatto.documentofiscal.nfe400.classes.NFNotaInfoImpostoTributacaoICMS;
 import com.fincatto.documentofiscal.nfe400.classes.NFNotaMotivoDesoneracaoICMS;
 import com.fincatto.documentofiscal.nfe400.classes.NFOrigem;
+import com.fincatto.documentofiscal.nfe400.classes.NFTipoDeducaoIcms;
 import com.fincatto.documentofiscal.validadores.DFBigDecimalValidador;
-import org.simpleframework.xml.Element;
-
 import java.math.BigDecimal;
+import org.simpleframework.xml.Element;
 
 public class NFNotaInfoItemImpostoICMS40 extends DFBase {
     private static final long serialVersionUID = -366528394939416671L;
@@ -23,6 +23,9 @@ public class NFNotaInfoItemImpostoICMS40 extends DFBase {
 
     @Element(name = "motDesICMS", required = false)
     private NFNotaMotivoDesoneracaoICMS motivoDesoneracaoICMS;
+
+    @Element(name = "indDeduzDeson", required = false)
+    private NFTipoDeducaoIcms indicaDeduzDesoneracao;
 
     public void setOrigem(final NFOrigem origem) {
         this.origem = origem;
@@ -55,4 +58,12 @@ public String getValorICMSDesoneracao() {
     public NFNotaMotivoDesoneracaoICMS getMotivoDesoneracaoICMS() {
         return this.motivoDesoneracaoICMS;
     }
+
+    public NFTipoDeducaoIcms getIndicaDeduzDesoneracao() {
+        return indicaDeduzDesoneracao;
+    }
+
+    public void setIndicaDeduzDesoneracao(NFTipoDeducaoIcms indicaDeduzDesoneracao) {
+        this.indicaDeduzDesoneracao = indicaDeduzDesoneracao;
+    }
 }