diff --git a/DanfeNet.Test/Properties/AssemblyInfo.cs b/DanfeNet.Test/Properties/AssemblyInfo.cs deleted file mode 100644 index 0441fb5..0000000 --- a/DanfeNet.Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ - -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("DanfeNet.Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("DanfeNet.Test")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -[assembly: ComVisible(false)] - -[assembly: Guid("1a33bf3b-7471-4293-9276-b73913b7f2f9")] - -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/DanfeNet.Tests/DanfeNet.Tests.csproj b/DanfeNet.Tests/DanfeNet.Tests.csproj index bdff8f2..cdcacd9 100644 --- a/DanfeNet.Tests/DanfeNet.Tests.csproj +++ b/DanfeNet.Tests/DanfeNet.Tests.csproj @@ -10,18 +10,63 @@ - - - - + + + + - + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + Always + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + diff --git a/DanfeNet.Tests/DanfeXmlTests.cs b/DanfeNet.Tests/DanfeXmlTests.cs index d1357ce..e55c856 100644 --- a/DanfeNet.Tests/DanfeXmlTests.cs +++ b/DanfeNet.Tests/DanfeXmlTests.cs @@ -43,5 +43,8 @@ public void TestXml(string xmlPath) [TestMethod] public void v4_SKUSize() => TestXml("v4.00/v4_SKUSize.xml"); + + [TestMethod] + public void v4_Cancelada() => TestXml("v4.00/v4_Cancelada.xml"); } \ No newline at end of file diff --git a/DanfeNet.Tests/Xml/NFe/v4.00/v4_Cancelada.xml b/DanfeNet.Tests/Xml/NFe/v4.00/v4_Cancelada.xml new file mode 100644 index 0000000..9cd12cd --- /dev/null +++ b/DanfeNet.Tests/Xml/NFe/v4.00/v4_Cancelada.xml @@ -0,0 +1,288 @@ + + + + + 32 + 11105904 + VENDA / LICENCA DE USO / + 55 + 339 + 204803991 + 2018-09-11T10:59:04-03:00 + 2018-09-11T10:59:04-03:00 + 1 + 2 + 3550308 + 1 + 1 + 5 + 1 + 1 + 1 + 9 + 0 + 1 + + + 64542918000145 + Cyberdyne Systems Corp. + Cyberdyne + + Rua Deputado Carlos Correia + 307 + Glp:2 EUV:Sala:12CIVIT II + Siqueira Campos + 3550308 + SERRA + ES + 49075976 + 1058 + BRASIL + 0112345678 + + 270913586892 + 270913586892 + 4.11111-7 + 4742300 + 3 + + + 22257735000138 + Umbrella Corp + + Rua João Augusto Morais + S/N + 7 DISTRITO + 3550308 + São Paulo + SP + 08010150 + 1058 + BRASIL + + 1 + 361499373647 + + + 22257735000138 + Oceanic Airlines + End Entrega + N Entrega + 5 DISTRITO + 3550308 + São Paulo + SP + 08010150 + 1012345678 + 361499373647 + + + + LC + 889842132892 + PN:T5D-02932 -- SOFTWARE A + 49111090 + 0000000 + S + 6102 + un + 1.0000 + 10.82 + 10.82 + 0889842132892 + un + 1.0000 + 10.82 + 1 + 10775 + 0 + + + + + 4 + 00 + 3 + 10.82 + 12.00 + 1.30 + + + + + 01 + 10.82 + 1.65 + 0.18 + + + + + 01 + 10.82 + 7.60 + 0.82 + + + + + + + LCOM144514B + SEM GTIN + PN:T5D-02932LIC -- SOFTWARE B + 00 + 0000000 + S + 6933 + un + 1.0000 + 936.18 + 936.18 + SEM GTIN + un + 1.0000 + 936.18 + 1 + 10775 + 0 + + + + 936.18 + 3.00 + 28.09 + 3550308 + 01.05 + 1 + 2 + + + + 01 + 936.18 + 1.65 + 15.45 + + + + + 01 + 936.18 + 7.60 + 71.15 + + + + + + + 3040.82 + 360.05 + 0.00 + 0.00 + 0.00 + 0 + 0.00 + 0.00 + 0 + 0 + 3040.82 + 0.00 + 0.00 + 0.00 + 0.00 + 0.00 + 0 + 50.17 + 231.10 + 0.00 + 3977.00 + 0.00 + + + 936.18 + 936.18 + 28.09 + 15.45 + 71.15 + 2018-10-11 + + + + 0 + + 23451995000102 + Oceanic Airlines + 678084138533 + Estrada do Acampamento, 773 + São Bernardo do Campo + SP + + + 2 + 2.380 + 3.000 + + + + + 800178201 + 3977.00 + 0.00 + 3977.00 + + + 001 + 2018-10-11 + 3977.00 + + + + + 99 + 3977.00 + + 2 + + + 0.00 + + + Praca para Pagamento: Sao Paulo - SP + + + + + + + + + + + + + RGFuZmVTaGFycA== + + + RGFuZmVTaGFycA== + + + RGFuZmVTaGFycA== + + + + + + + 1 + SVRS201809031520 + 35110264542918000145553392048039911837511733 + 2018-09-11T10:59:21-03:00 + 332181142495375 + RGFuZmVTaGFycA== + 101 + Cancelada NF-e Teste + + + \ No newline at end of file diff --git a/DanfeNet/DanfeNet.csproj b/DanfeNet/DanfeNet.csproj index 2ab5f80..e92a900 100644 --- a/DanfeNet/DanfeNet.csproj +++ b/DanfeNet/DanfeNet.csproj @@ -12,7 +12,6 @@ - diff --git a/DanfeNet/DanfePagina.cs b/DanfeNet/DanfePagina.cs index a1d313d..84982f7 100644 --- a/DanfeNet/DanfePagina.cs +++ b/DanfeNet/DanfePagina.cs @@ -5,6 +5,7 @@ using DanfeNet.Elementos; using DanfeNet.Graphics; using org.pdfclown.documents; +using org.pdfclown.documents.contents.colorSpaces; using org.pdfclown.documents.contents.composition; namespace DanfeNet; @@ -137,4 +138,23 @@ public void DesenharBlocos(bool isPrimeirapagina = false) RetanguloCorpo = RetanguloDesenhavel; Gfx.Flush(); } + + + public void DesenharAvisoCancelamento() + { + var ts = new TextStack(RetanguloCorpo) + { + AlinhamentoVertical = AlinhamentoVertical.Centro, + AlinhamentoHorizontal = AlinhamentoHorizontal.Centro, + LineHeightScale = 0.9F + } + .AddLine("DOCUMENTO CANCELADO", DanfePdf.EstiloPadrao.CriarFonteRegular(48)); + + var colorRed = new DeviceRGBColor(255, 0.35, 0.35); + Gfx.PrimitiveComposer.BeginLocalState(); + Gfx.PrimitiveComposer.SetFillColor(colorRed); + ts.Draw(Gfx); + Gfx.PrimitiveComposer.End(); + } + } \ No newline at end of file diff --git a/DanfeNet/DanfePdf.cs b/DanfeNet/DanfePdf.cs index 93ba369..23ed504 100644 --- a/DanfeNet/DanfePdf.cs +++ b/DanfeNet/DanfePdf.cs @@ -180,6 +180,10 @@ private DanfePagina CriarPagina() p.DesenharAvisoHomologacao(); } + // NF-e cancelada + if (ViewModel.CodigoStatusReposta == 101) + p.DesenharAvisoCancelamento(); + return p; }