diff --git a/Gerene.DFe.EscPos.Demo/Gerene.DFe.EscPos.Demo.csproj b/Gerene.DFe.EscPos.Demo/Gerene.DFe.EscPos.Demo.csproj index d5b90bb..e2ed833 100644 --- a/Gerene.DFe.EscPos.Demo/Gerene.DFe.EscPos.Demo.csproj +++ b/Gerene.DFe.EscPos.Demo/Gerene.DFe.EscPos.Demo.csproj @@ -45,33 +45,63 @@ ..\packages\ACBr.Net.Sat.1.2.7.1\lib\net452\ACBr.Net.Sat.dll - - ..\packages\Zeus.Net.NFe.NFCe.1.0.1.1007\lib\net40\DFe.Classes.dll + + ..\packages\DFeBR.EmissorNFe.0.0.1\lib\netstandard2.0\DFeBR.EmissorNFe.dll - - ..\packages\Zeus.Net.NFe.NFCe.1.0.1.1007\lib\net40\DFe.Utils.dll + + ..\packages\NetBarcode.1.0.7\lib\netstandard2.0\NetBarcode.dll - - ..\packages\Zeus.Net.NFe.NFCe.1.0.1.1007\lib\net40\DFe.Wsdl.dll + + ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll - - ..\packages\Zeus.Net.NFe.NFCe.1.0.1.1007\lib\net40\NFe.Classes.dll - - - ..\packages\Zeus.Net.NFe.NFCe.1.0.1.1007\lib\net40\NFe.Servicos.dll - - - ..\packages\Zeus.Net.NFe.NFCe.1.0.1.1007\lib\net40\NFe.Utils.dll - - - ..\packages\Zeus.Net.NFe.NFCe.1.0.1.1007\lib\net40\NFe.Wsdl.dll + + ..\packages\QRCoder.1.3.5\lib\net40\QRCoder.dll + + + ..\packages\System.Drawing.Common.4.5.0\lib\net461\System.Drawing.Common.dll + + + + ..\packages\System.Security.AccessControl.4.5.0\lib\net461\System.Security.AccessControl.dll + + + ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll + True + True + + + ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll + True + True + + + ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll + True + True + + + ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll + True + True + + + ..\packages\System.Security.Cryptography.Xml.4.5.0\lib\net461\System.Security.Cryptography.Xml.dll + + + ..\packages\System.Security.Permissions.4.5.0\lib\net461\System.Security.Permissions.dll + + + ..\packages\System.Security.Principal.Windows.4.5.0\lib\net461\System.Security.Principal.Windows.dll + + + diff --git a/Gerene.DFe.EscPos.Demo/packages.config b/Gerene.DFe.EscPos.Demo/packages.config index 36b6a7d..e43bdcc 100644 --- a/Gerene.DFe.EscPos.Demo/packages.config +++ b/Gerene.DFe.EscPos.Demo/packages.config @@ -4,6 +4,18 @@ + + + + + + + + + + + + + - \ No newline at end of file diff --git a/Gerene.DFe.EscPos/Gerene.DFe.EscPos.csproj b/Gerene.DFe.EscPos/Gerene.DFe.EscPos.csproj index 3d70d0a..8dca586 100644 --- a/Gerene.DFe.EscPos/Gerene.DFe.EscPos.csproj +++ b/Gerene.DFe.EscPos/Gerene.DFe.EscPos.csproj @@ -9,8 +9,8 @@ + - diff --git a/Gerene.DFe.EscPos/NFCePrinter.cs b/Gerene.DFe.EscPos/NFCePrinter.cs index e62db71..7e3d1f4 100644 --- a/Gerene.DFe.EscPos/NFCePrinter.cs +++ b/Gerene.DFe.EscPos/NFCePrinter.cs @@ -1,20 +1,11 @@ -using ACBr.Net.Core.Extensions; -using DFe.Classes.Flags; -using DFe.Utils; -using NFe.Utils.InformacoesSuplementares; -using Shared.DFe.Utils; -using System; -using System.Collections.Generic; +using DFeBR.EmissorNFe.Utilidade; using System.Globalization; -using System.IO; using System.Linq; -using System.Text; using System.Text.RegularExpressions; using Vip.Printer; using Vip.Printer.Enums; -using NotaFiscal = NFe.Classes.nfeProc; - +using NotaFiscal = DFeBR.EmissorNFe.Dominio.NotaFiscalEletronica.nfeProc; namespace Gerene.DFe.EscPos @@ -24,7 +15,7 @@ public sealed class NFCePrinter : IDfePrinter public NFCePrinter() { _NFCe = new NotaFiscal(); - NomeDaVia = "Via do Consumidor"; + NomeDaVia = "Via do Consumidor"; } #region IDfe @@ -43,9 +34,7 @@ public NFCePrinter() public void Imprimir(string xmlcontent) { - _NFCe = new NotaFiscal().CarregarDeXmlString(xmlcontent); - - _Printer = new Printer(NomeImpressora, TipoImpressora); + _NFCe = Utils.ConverterXMLParaClasse(xmlcontent); _Printer = new Printer(NomeImpressora, TipoImpressora); @@ -90,7 +79,7 @@ public void Imprimir(string xmlcontent) #endregion #region Homologação - if (_NFCe.NFe.infNFe.ide.tpAmb == TipoAmbiente.Homologacao) + if (_NFCe.NFe.infNFe.ide.tpAmb == DFeBR.EmissorNFe.Utilidade.Tipos.TipoAmbiente.Homologacao) { _Printer.Separator(); _Printer.AlignCenter(); @@ -349,7 +338,7 @@ public void Imprimir(string xmlcontent) _Printer.CondensedMode(PrinterModeState.On); _Printer.Append("Protocolo de autorização"); - _Printer.Append($"{_NFCe.protNFe.infProt.nProt} {_NFCe.protNFe.infProt.dhRecbto:@dd/MM/yyyy HH:mm:ss}"); + _Printer.Append($"{_NFCe.protNFe.infProt.First().nProt} {_NFCe.protNFe.infProt.First().dhRecbto:@dd/MM/yyyy HH:mm:ss}"); _Printer.CondensedMode(PrinterModeState.Off); #endregion