Integrar ajustes para MDFe no repositório original da biblioteca DFe.NET

CTe.Servicos/ConsultaProtocolo/ConsultaProtcoloServico.cs

@@ -35,7 +35,7 @@
 using CTe.Classes;
 using CTe.Classes.Servicos.Consulta;
 using CTe.Servicos.Factory;
-using CTe.Utils.Extencoes;
+using CTe.Utils.Extensoes;
 
 namespace CTe.Servicos.ConsultaProtocolo
 {

CTe.Servicos/ConsultaRecibo/ConsultaReciboServico.cs

@@ -35,7 +35,7 @@
 using CTe.Classes;
 using CTe.Classes.Servicos.Recepcao.Retorno;
 using CTe.Servicos.Factory;
-using CTe.Utils.Extencoes;
+using CTe.Utils.Extensoes;
 
 namespace CTe.Servicos.ConsultaRecibo
 {

CTe.Servicos/ConsultaStatus/StatusServico.cs

@@ -35,7 +35,7 @@
 using CTe.Classes;
 using CTe.Classes.Servicos.Status;
 using CTe.Servicos.Factory;
-using CTe.Utils.Extencoes;
+using CTe.Utils.Extensoes;
 
 namespace CTe.Servicos.ConsultaStatus
 {

CTe.Servicos/Inutilizacao/InutilizacaoServico.cs

@@ -36,7 +36,7 @@
 using CTe.Classes;
 using CTe.Classes.Servicos.Inutilizacao;
 using CTe.Servicos.Factory;
-using CTe.Utils.Extencoes;
+using CTe.Utils.Extensoes;
 using CTe.Utils.Inutilizacao;
 using DFe.Classes.Flags;
 

CTe.Utils/Evento/Extevento.cs

@@ -37,7 +37,7 @@
 using CTe.Classes;
 using CTe.Classes.Servicos.Evento;
 using CTe.Classes.Servicos.Tipos;
-using CTe.Utils.Extencoes;
+using CTe.Utils.Extensoes;
 using CTe.Utils.Validacao;
 using DFe.Utils;
 using DFe.Utils.Assinatura;

CTe.Utils/Extencoes/ExtConsReciCTe.cs → CTe.Utils/Extensoes/ExtConsReciCTe.cs

@@ -39,7 +39,7 @@
 using CTe.Utils.Validacao;
 using DFe.Utils;
 
-namespace CTe.Utils.Extencoes
+namespace CTe.Utils.Extensoes
 {
     public static class ExtConsReciCTe
     {

CTe.Utils/Extencoes/ExtconsSitCTe.cs → CTe.Utils/Extensoes/ExtconsSitCTe.cs

@@ -39,7 +39,7 @@
 using CTe.Utils.Validacao;
 using DFe.Utils;
 
-namespace CTe.Utils.Extencoes
+namespace CTe.Utils.Extensoes
 {
     public static class ExtconsSitCTe
     {

CTe.Utils/Extencoes/ExtconsStatServCte.cs → CTe.Utils/Extensoes/ExtconsStatServCte.cs

@@ -39,7 +39,7 @@
 using CTe.Utils.Validacao;
 using DFe.Utils;
 
-namespace CTe.Utils.Extencoes
+namespace CTe.Utils.Extensoes
 {
     public static class ExtconsStatServCte
     {

CTe.Utils/Extencoes/ExtevCCeCTe.cs → CTe.Utils/Extensoes/ExtevCCeCTe.cs

@@ -34,7 +34,7 @@
 using CTe.Classes.Servicos.Evento;
 using DFe.Utils;
 
-namespace CTe.Utils.Extencoes
+namespace CTe.Utils.Extensoes
 {
     public static class ExtevCCeCTe
     {

CTe.Utils/Extencoes/ExtevCancCTe.cs → CTe.Utils/Extensoes/ExtevCancCTe.cs

@@ -34,7 +34,7 @@
 using CTe.Classes.Servicos.Evento;
 using DFe.Utils;
 
-namespace CTe.Utils.Extencoes
+namespace CTe.Utils.Extensoes
 {
     public static class ExtevCancCTe
     {

CTe.Utils/Extencoes/ExtevPrestDesacordo.cs → CTe.Utils/Extensoes/ExtevPrestDesacordo.cs

@@ -34,7 +34,7 @@
 using CTe.Classes.Servicos.Evento;
 using DFe.Utils;
 
-namespace CTe.Utils.Extencoes
+namespace CTe.Utils.Extensoes
 {
     public static class ExtevPrestDesacordo
     {

CTe.Utils/Extencoes/ExtinutCTe.cs → CTe.Utils/Extensoes/ExtinutCTe.cs

@@ -40,7 +40,7 @@
 using DFe.Utils;
 using DFe.Utils.Assinatura;
 
-namespace CTe.Utils.Extencoes
+namespace CTe.Utils.Extensoes
 {
     public static class ExtinutCTe
     {

CTe.Utils/Extencoes/ExtretConsSitCTe.cs → CTe.Utils/Extensoes/ExtretConsSitCTe.cs

@@ -36,7 +36,7 @@
 using CTe.Classes.Servicos.Consulta;
 using DFe.Utils;
 
-namespace CTe.Utils.Extencoes
+namespace CTe.Utils.Extensoes
 {
     public static class ExtretConsSitCTe
     {

CTe.Utils/Extencoes/ExtretConsStatServ.cs → CTe.Utils/Extensoes/ExtretConsStatServ.cs

@@ -34,7 +34,7 @@
 using CTe.Classes.Servicos.Status;
 using DFe.Utils;
 
-namespace CTe.Utils.Extencoes
+namespace CTe.Utils.Extensoes
 {
     public static class ExtretConsStatServ
     {

CTe.Utils/Extencoes/ExtretConsStatServCte.cs → CTe.Utils/Extensoes/ExtretConsStatServCte.cs

@@ -36,7 +36,7 @@
 using CTe.Classes.Servicos.Status;
 using DFe.Utils;
 
-namespace CTe.Utils.Extencoes
+namespace CTe.Utils.Extensoes
 {
     public static class ExtretConsStatServCte
     {

DFe.Utils/ChaveFiscal.cs

@@ -59,14 +59,19 @@ public static DadosChaveFiscal ObterChave(Estado ufEmitente, DateTimeOffset data
         {
             var chave = new StringBuilder();
 
+            if (cnpjEmitente.Length < 14)
+            {
+                cnpjEmitente = cnpjEmitente.PadLeft(14, '0');
+            }
+
             chave.Append(((int)ufEmitente).ToString("D2"))
-                .Append(dataEmissao.ToString("yyMM"))
-                .Append(cnpjEmitente)
-                .Append(((int)modelo).ToString("D2"))
-                .Append(serie.ToString("D3"))
-                .Append(numero.ToString("D9"))
-                .Append(tipoEmissao.ToString())
-                .Append(cNf.ToString("D8"));
+                 .Append(dataEmissao.ToString("yyMM"))
+                 .Append(cnpjEmitente)
+                 .Append(((int)modelo).ToString("D2"))
+                 .Append(serie.ToString("D3"))
+                 .Append(numero.ToString("D9"))
+                 .Append(tipoEmissao.ToString())
+                 .Append(cNf.ToString("D8"));
 
             var digitoVerificador = ObterDigitoVerificador(chave.ToString());
 

DFe.Utils/StringExtencoes.cs

@@ -3,7 +3,7 @@
 
 namespace Shared.DFe.Utils
 {
-    public static class StringExtencoes
+    public static class StringExtensoes
     {
         public static string RemoverAcentos(this string valor)
         {

MDFe.AppTeste/MDFeTesteModel.cs

@@ -31,13 +31,14 @@
 /* http://www.zeusautomacao.com.br/                                             */
 /* Rua Comendador Francisco josé da Cunha, 111 - Itabaiana - SE - 49500-000     */
 /********************************************************************************/
+
 using DFe.Classes.Entidades;
 using DFe.Classes.Flags;
 using DFe.Utils;
 using MDFe.AppTeste.Dao;
 using MDFe.AppTeste.Entidades;
 using MDFe.AppTeste.ModelBase;
-using MDFe.Classes.Extencoes;
+using MDFe.Classes.Extensoes;
 using MDFe.Classes.Flags;
 using MDFe.Classes.Informacoes;
 using MDFe.Classes.Informacoes.Evento.CorpoEvento;
@@ -612,7 +613,7 @@ public void CriarEnviar()
             #endregion dados emitente (emit)
 
             #region modal
-            if (MDFeConfiguracao.VersaoWebService.VersaoLayout == VersaoServico.Versao100)
+            if (MDFeConfiguracao.Instancia.VersaoWebService.VersaoLayout == VersaoServico.Versao100)
             {
                 mdfe.InfMDFe.InfModal.Modal = new MDFeRodo
                 {
@@ -640,16 +641,16 @@ public void CriarEnviar()
             }
 
 
-            if (MDFeConfiguracao.VersaoWebService.VersaoLayout == VersaoServico.Versao300)
+            if (MDFeConfiguracao.Instancia.VersaoWebService.VersaoLayout == VersaoServico.Versao300)
             {
                 mdfe.InfMDFe.InfModal.Modal = new MDFeRodo
                 {
-                    infANTT = new MDFeInfANTT
+                    InfANTT = new MDFeInfANTT
                     {
                         RNTRC = config.Empresa.RNTRC,
 
                         // não é obrigatorio
-                        infCIOT = new List<infCIOT>
+                        InfCIOT = new List<infCIOT>
                         {
                             new infCIOT
                             {
@@ -692,7 +693,7 @@ public void CriarEnviar()
                         TpCar = MDFeTpCar.NaoAplicavel
                     },
 
-                    lacRodo = new List<MDFeLacre>
+                    LacRodo = new List<MDFeLacre>
                     {
                         new MDFeLacre
                         {
@@ -722,7 +723,7 @@ public void CriarEnviar()
             };
 
 
-            if (MDFeConfiguracao.VersaoWebService.VersaoLayout == VersaoServico.Versao300)
+            if (MDFeConfiguracao.Instancia.VersaoWebService.VersaoLayout == VersaoServico.Versao300)
             {
                 mdfe.InfMDFe.InfDoc.InfMunDescarga[0].InfCTe[0].Peri = new List<MDFePeri>
                 {
@@ -738,7 +739,7 @@ public void CriarEnviar()
 
             #region seg
 
-            if (MDFeConfiguracao.VersaoWebService.VersaoLayout == VersaoServico.Versao300)
+            if (MDFeConfiguracao.Instancia.VersaoWebService.VersaoLayout == VersaoServico.Versao300)
             {
                 mdfe.InfMDFe.Seg = new List<MDFeSeg>();
 
@@ -766,19 +767,19 @@ public void CriarEnviar()
 
             #region Produto Predominante
 
-            if (MDFeConfiguracao.VersaoWebService.VersaoLayout == VersaoServico.Versao300)
+            if (MDFeConfiguracao.Instancia.VersaoWebService.VersaoLayout == VersaoServico.Versao300)
             {
-                mdfe.InfMDFe.prodPred = new prodPred
+                mdfe.InfMDFe.ProdPred = new MDFeProdPred
                 {
-                    tpCarga = tpCarga.CargaGeral,
-                    xProd = "aaaaaaaaaaaaaaaaaaaaa",
-                    infLotacao = new infLotacao
+                    TpCarga = MDFeTpCarga.CargaGeral,
+                    XProd = "aaaaaaaaaaaaaaaaaaaaa",
+                    InfLotacao = new MDFeInfLotacao
                     {
-                        infLocalCarrega = new infLocalCarrega
+                        InfLocalCarrega = new MDFeInfLocalCarrega
                         {
                             CEP = "75950000"
                         },
-                        infLocalDescarrega = new infLocalDescarrega
+                        InfLocalDescarrega = new MDFeInfLocalDescarrega
                         {
                             CEP = "75950000"
                         }
@@ -804,12 +805,12 @@ public void CriarEnviar()
 
             #region dados responsavel tecnico 
 
-            mdfe.InfMDFe.infRespTec = new infRespTec
+            mdfe.InfMDFe.InfRespTec = new MDFeInfRespTec
             {
                 CNPJ = "21025760000123",
-                email = "[email protected]",
-                fone = "64981081602",
-                xContato = "roberto alves"
+                Email = "[email protected]",
+                Fone = "64981081602",
+                XContato = "roberto alves"
             };
             #endregion  
 
@@ -898,7 +899,7 @@ public void GerarESalvar()
             #endregion dados emitente (emit)
 
             #region modal
-            if (MDFeConfiguracao.VersaoWebService.VersaoLayout == VersaoServico.Versao100)
+            if (MDFeConfiguracao.Instancia.VersaoWebService.VersaoLayout == VersaoServico.Versao100)
             {
                 mdfe.InfMDFe.InfModal.VersaoModal = MDFeVersaoModal.Versao100;
                 mdfe.InfMDFe.InfModal.Modal = new MDFeRodo
@@ -927,25 +928,25 @@ public void GerarESalvar()
             }
 
 
-            if (MDFeConfiguracao.VersaoWebService.VersaoLayout == VersaoServico.Versao300)
+            if (MDFeConfiguracao.Instancia.VersaoWebService.VersaoLayout == VersaoServico.Versao300)
             {
                 mdfe.InfMDFe.InfModal.VersaoModal = MDFeVersaoModal.Versao300;
                 mdfe.InfMDFe.InfModal.Modal = new MDFeRodo
                 {
-                    infANTT = new MDFeInfANTT
+                    InfANTT = new MDFeInfANTT
                     {
                         RNTRC = config.Empresa.RNTRC,
 
                         // não é obrigatorio
-                        infCIOT = new List<infCIOT>
+                        InfCIOT = new List<infCIOT>
                         {
                             new infCIOT
                             {
                                 CIOT = "123456789123",
                                 CNPJ = "21025760000123"
                             }
                         },
-                        valePed = new MDFeValePed
+                        ValePed = new MDFeValePed
                         {
                             Disp = new List<MDFeDisp>
                                     {
@@ -954,7 +955,7 @@ public void GerarESalvar()
                                             CNPJForn = "21025760000123",
                                             CNPJPg = "21025760000123",
                                             NCompra = "838388383",
-                                            vValePed = 100.33m
+                                            VValePed = 100.33m
                                         }
                                     }
                         }
@@ -980,7 +981,7 @@ public void GerarESalvar()
                         TpCar = MDFeTpCar.NaoAplicavel
                     },
 
-                    lacRodo = new List<MDFeLacre>
+                    LacRodo = new List<MDFeLacre>
                     {
                         new MDFeLacre
                         {
@@ -1011,7 +1012,7 @@ public void GerarESalvar()
             };
 
 
-            if (MDFeConfiguracao.VersaoWebService.VersaoLayout == VersaoServico.Versao300)
+            if (MDFeConfiguracao.Instancia.VersaoWebService.VersaoLayout == VersaoServico.Versao300)
             {
                 mdfe.InfMDFe.InfDoc.InfMunDescarga[0].InfCTe[0].Peri = new List<MDFePeri>
                 {
@@ -1027,7 +1028,7 @@ public void GerarESalvar()
 
             #region seg
 
-            if (MDFeConfiguracao.VersaoWebService.VersaoLayout == VersaoServico.Versao300)
+            if (MDFeConfiguracao.Instancia.VersaoWebService.VersaoLayout == VersaoServico.Versao300)
             {
                 mdfe.InfMDFe.Seg = new List<MDFeSeg>();
 
@@ -1379,17 +1380,17 @@ private static void CarregarConfiguracoesMDFe(Configuracao config)
                 ManterDadosEmCache = config.CertificadoDigital.ManterEmCache,
             };
 
-            MDFeConfiguracao.ConfiguracaoCertificado = configuracaoCertificado;
-            MDFeConfiguracao.CaminhoSchemas = config.ConfigWebService.CaminhoSchemas;
-            MDFeConfiguracao.CaminhoSalvarXml = config.DiretorioSalvarXml;
-            MDFeConfiguracao.IsSalvarXml = config.IsSalvarXml;
+            MDFeConfiguracao.Instancia.ConfiguracaoCertificado = configuracaoCertificado;
+            MDFeConfiguracao.Instancia.CaminhoSchemas = config.ConfigWebService.CaminhoSchemas;
+            MDFeConfiguracao.Instancia.CaminhoSalvarXml = config.DiretorioSalvarXml;
+            MDFeConfiguracao.Instancia.IsSalvarXml = config.IsSalvarXml;
 
-            MDFeConfiguracao.VersaoWebService.VersaoLayout = config.ConfigWebService.VersaoLayout;
+            MDFeConfiguracao.Instancia.VersaoWebService.VersaoLayout = config.ConfigWebService.VersaoLayout;
 
-            MDFeConfiguracao.VersaoWebService.TipoAmbiente = config.ConfigWebService.Ambiente;
-            MDFeConfiguracao.VersaoWebService.UfEmitente = config.ConfigWebService.UfEmitente;
-            MDFeConfiguracao.VersaoWebService.TimeOut = config.ConfigWebService.TimeOut;
-            MDFeConfiguracao.IsAdicionaQrCode = true;
+            MDFeConfiguracao.Instancia.VersaoWebService.TipoAmbiente = config.ConfigWebService.Ambiente;
+            MDFeConfiguracao.Instancia.VersaoWebService.UfEmitente = config.ConfigWebService.UfEmitente;
+            MDFeConfiguracao.Instancia.VersaoWebService.TimeOut = config.ConfigWebService.TimeOut;
+            MDFeConfiguracao.Instancia.IsAdicionaQrCode = true;
         }
 
         protected virtual void OnSucessoSync(RetornoEEnvio e)