Skip to content

Commit efff9cb

Browse files
author
Rafael Teno Dias
committed
Correção no envio de NFSe para o provedor IssDSF.
1 parent f2523b8 commit efff9cb

8 files changed

Lines changed: 56 additions & 55 deletions

File tree

‎src/OpenAC.Net.NFSe.DANFSe.FastReport.OpenSource/OpenAC.Net.NFSe.DANFSe.FastReport.OpenSource.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5151
</PackageReference>
5252
<PackageReference Include="OpenAC.Net.Core" Version="1.6.0" />
53-
<PackageReference Include="OpenAC.Net.DFe.Core" Version="1.6.0.1" />
53+
<PackageReference Include="OpenAC.Net.DFe.Core" Version="1.6.0.2" />
5454
</ItemGroup>
5555

5656
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'net470' or '$(TargetFramework)' == 'net48'">

‎src/OpenAC.Net.NFSe.Demo/FormEdtMunicipio.Designer.cs‎

Lines changed: 12 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/OpenAC.Net.NFSe.Demo/FormEdtMunicipio.cs‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System;
2-
using System.Collections.Generic;
32
using System.Linq;
43
using System.Windows.Forms;
54
using OpenAC.Net.Core;
@@ -175,49 +174,49 @@ private void Salvar()
175174
}
176175
}
177176

178-
private void btnAtualizar_Click(object sender, EventArgs e)
177+
private void btnAtualizarProd_Click(object sender, EventArgs e)
179178
{
180-
string novoLink = "";
179+
var novoLink = "";
181180
if (InputBox.Show("Atualização de todos os endereços de produção", "Digite o link, se quiser alterar em tela, todos os campos com dados", ref novoLink).Equals(DialogResult.Cancel)) return;
182181

183-
if (!string.IsNullOrWhiteSpace(txtPEnviar.Text)) txtPEnviar.Text = novoLink;
184-
if (!string.IsNullOrWhiteSpace(txtPCancelaNFSe.Text)) txtPCancelaNFSe.Text = novoLink;
185-
if (!string.IsNullOrWhiteSpace(txtPCancelaNFSeLote.Text)) txtPCancelaNFSeLote.Text = novoLink;
186-
if (!string.IsNullOrWhiteSpace(txtPConsultaNFSeRps.Text)) txtPConsultaNFSeRps.Text = novoLink;
187-
if (!string.IsNullOrWhiteSpace(txtPConsultarSituacao.Text)) txtPConsultarSituacao.Text = novoLink;
188-
if (!string.IsNullOrWhiteSpace(txtPEnviarSincrono.Text)) txtPEnviarSincrono.Text = novoLink;
189-
if (!string.IsNullOrWhiteSpace(txtPConsultaNFSe.Text)) txtPConsultaNFSe.Text = novoLink;
190-
if (!string.IsNullOrWhiteSpace(txtPConsultrLoteRps.Text)) txtPConsultrLoteRps.Text = novoLink;
191-
if (!string.IsNullOrWhiteSpace(txtPConsultarSequencialRps.Text)) txtPConsultarSequencialRps.Text = novoLink;
192-
if (!string.IsNullOrWhiteSpace(txtPSubstituirNFSe.Text)) txtPSubstituirNFSe.Text = novoLink;
193-
if (!string.IsNullOrWhiteSpace(txtPAutenticacao.Text)) txtPAutenticacao.Text = novoLink;
182+
txtPEnviar.Text = novoLink;
183+
txtPCancelaNFSe.Text = novoLink;
184+
txtPCancelaNFSeLote.Text = novoLink;
185+
txtPConsultaNFSeRps.Text = novoLink;
186+
txtPConsultarSituacao.Text = novoLink;
187+
txtPEnviarSincrono.Text = novoLink;
188+
txtPConsultaNFSe.Text = novoLink;
189+
txtPConsultrLoteRps.Text = novoLink;
190+
txtPConsultarSequencialRps.Text = novoLink;
191+
txtPSubstituirNFSe.Text = novoLink;
192+
txtPAutenticacao.Text = novoLink;
194193
}
195194

196195
private void btnAtualizarHom_Click(object sender, EventArgs e)
197196
{
198-
string novoLink = "";
197+
var novoLink = "";
199198
if (InputBox.Show("Atualização de todos os endereços de homologação", "Digite o link, se quiser alterar em tela, todos os campos com dados", ref novoLink).Equals(DialogResult.Cancel)) return;
200199

201-
if (!string.IsNullOrWhiteSpace(txtHEnviar.Text)) txtPEnviar.Text = novoLink;
202-
if (!string.IsNullOrWhiteSpace(txtHCancelaNFSe.Text)) txtPCancelaNFSe.Text = novoLink;
203-
if (!string.IsNullOrWhiteSpace(txtHCancelaNFSeLote.Text)) txtPCancelaNFSeLote.Text = novoLink;
204-
if (!string.IsNullOrWhiteSpace(txtHConsultaNFSeRps.Text)) txtPConsultaNFSeRps.Text = novoLink;
205-
if (!string.IsNullOrWhiteSpace(txtHConsultarSituacao.Text)) txtPConsultarSituacao.Text = novoLink;
206-
if (!string.IsNullOrWhiteSpace(txtHEnviarSincrono.Text)) txtPEnviarSincrono.Text = novoLink;
207-
if (!string.IsNullOrWhiteSpace(txtHConsultaNFSe.Text)) txtPConsultaNFSe.Text = novoLink;
208-
if (!string.IsNullOrWhiteSpace(txtHConsultrLoteRps.Text)) txtPConsultrLoteRps.Text = novoLink;
209-
if (!string.IsNullOrWhiteSpace(txtHConsultarSequencialRps.Text)) txtPConsultarSequencialRps.Text = novoLink;
210-
if (!string.IsNullOrWhiteSpace(txtHSubstituirNFSe.Text)) txtPSubstituirNFSe.Text = novoLink;
211-
if (!string.IsNullOrWhiteSpace(txtHAutenticacao.Text)) txtPAutenticacao.Text = novoLink;
200+
txtHEnviar.Text = novoLink;
201+
txtHCancelaNFSe.Text = novoLink;
202+
txtHCancelaNFSeLote.Text = novoLink;
203+
txtHConsultaNFSeRps.Text = novoLink;
204+
txtHConsultarSituacao.Text = novoLink;
205+
txtHEnviarSincrono.Text = novoLink;
206+
txtHConsultaNFSe.Text = novoLink;
207+
txtHConsultrLoteRps.Text = novoLink;
208+
txtHConsultarSequencialRps.Text = novoLink;
209+
txtHSubstituirNFSe.Text = novoLink;
210+
txtHAutenticacao.Text = novoLink;
212211
}
213212

214213
private Control[] CreateControl(ParametroProvider parametro)
215214
{
216215
return parametro.Tipo switch
217216
{
218-
TipoParametro.Text => [new TextBox() { Tag = parametro, Dock = DockStyle.Top},
219-
new Label() { Text = parametro.Nome.ToFriendlyCase(), Dock = DockStyle.Top, }],
220-
TipoParametro.Boolean => [new CheckBox() { Text= parametro.Nome.ToFriendlyCase(), Dock = DockStyle.Top, Tag = parametro }],
217+
TipoParametro.Text => [new TextBox { Tag = parametro, Dock = DockStyle.Top},
218+
new Label { Text = parametro.Nome.ToFriendlyCase(), Dock = DockStyle.Top, }],
219+
TipoParametro.Boolean => [new CheckBox { Text= parametro.Nome.ToFriendlyCase(), Dock = DockStyle.Top, Tag = parametro }],
221220
_ => throw new NotImplementedException(),
222221
};
223222
}

‎src/OpenAC.Net.NFSe.Demo/OpenAC.Net.NFSe.Demo.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="NLog" Version="5.3.3" />
14+
<PackageReference Include="NLog" Version="5.3.4" />
1515
<PackageReference Include="NLog.Windows.Forms" Version="5.2.3" />
1616
<PackageReference Include="OpenAC.Net.Core" Version="1.6.0" />
17-
<PackageReference Include="OpenAC.Net.DFe.Core" Version="1.6.0.1" />
17+
<PackageReference Include="OpenAC.Net.DFe.Core" Version="1.6.0.2" />
1818
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
1919
</ItemGroup>
2020

‎src/OpenAC.Net.NFSe.Test/OpenAC.Net.NFSe.Test.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="OpenAC.Net.DFe.Core" Version="1.6.0.1" />
14-
<PackageReference Include="xunit" Version="2.9.0" />
13+
<PackageReference Include="OpenAC.Net.DFe.Core" Version="1.6.0.2" />
14+
<PackageReference Include="xunit" Version="2.9.1" />
1515
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
<PrivateAssets>all</PrivateAssets>

‎src/OpenAC.Net.NFSe/OpenAC.Net.NFSe.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
<PackageLicenseFile>LICENSE</PackageLicenseFile>
2121
<PackageReadmeFile>README.md</PackageReadmeFile>
2222
<NeutralLanguage>pt-BR</NeutralLanguage>
23-
<AssemblyVersion>1.6.0</AssemblyVersion>
24-
<FileVersion>1.6.0</FileVersion>
25-
<Version>1.6.0</Version>
23+
<AssemblyVersion>1.6.0.1</AssemblyVersion>
24+
<FileVersion>1.6.0.1</FileVersion>
25+
<Version>1.6.0.1</Version>
2626
<PublishRepositoryUrl>true</PublishRepositoryUrl>
2727
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2828
<DebugType>embedded</DebugType>
@@ -40,7 +40,7 @@
4040
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4141
</PackageReference>
4242
<PackageReference Include="OpenAC.Net.Core" Version="1.6.0" />
43-
<PackageReference Include="OpenAC.Net.DFe.Core" Version="1.6.0.1" />
43+
<PackageReference Include="OpenAC.Net.DFe.Core" Version="1.6.0.2" />
4444
</ItemGroup>
4545

4646
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'net470' or '$(TargetFramework)' == 'net48'">

‎src/OpenAC.Net.NFSe/Providers/ISSDSF/ProviderISSDSF.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ protected override void PrepararEnviar(RetornoEnviar retornoWebservice, NotaServ
460460

461461
protected override void AssinarEnviar(RetornoEnviar retornoWebservice)
462462
{
463-
retornoWebservice.XmlEnvio = XmlSigning.AssinarXml(retornoWebservice.XmlEnvio, "ns1:ReqEnvioLoteRPS", "Lote", "", Certificado, comments: true);
463+
retornoWebservice.XmlEnvio = XmlSigning.AssinarXml(retornoWebservice.XmlEnvio, "ns1:ReqEnvioLoteRPS", "Lote", "", Certificado);
464464
}
465465

466466
protected override void TratarRetornoEnviar(RetornoEnviar retornoWebservice, NotaServicoCollection notas)
@@ -508,7 +508,7 @@ protected override void PrepararEnviarSincrono(RetornoEnviar retornoWebservice,
508508

509509
protected override void AssinarEnviarSincrono(RetornoEnviar retornoWebservice)
510510
{
511-
retornoWebservice.XmlEnvio = XmlSigning.AssinarXml(retornoWebservice.XmlEnvio, "ns1:ReqEnvioLoteRPS", "Lote", "", Certificado, true);
511+
retornoWebservice.XmlEnvio = XmlSigning.AssinarXml(retornoWebservice.XmlEnvio, "ns1:ReqEnvioLoteRPS", "Lote", "", Certificado);
512512
}
513513

514514
protected override void TratarRetornoEnviarSincrono(RetornoEnviar retornoWebservice, NotaServicoCollection notas)
@@ -707,7 +707,7 @@ protected override void PrepararConsultarNFSeRps(RetornoConsultarNFSeRps retorno
707707

708708
protected override void AssinarConsultarNFSeRps(RetornoConsultarNFSeRps retornoWebservice)
709709
{
710-
retornoWebservice.XmlEnvio = XmlSigning.AssinarXml(retornoWebservice.XmlEnvio, "ns1:ReqConsultaNFSeRPS", "Lote", Certificado, true);
710+
retornoWebservice.XmlEnvio = XmlSigning.AssinarXml(retornoWebservice.XmlEnvio, "ns1:ReqConsultaNFSeRPS", "Lote", Certificado);
711711
}
712712

713713
protected override void TratarRetornoConsultarNFSeRps(RetornoConsultarNFSeRps retornoWebservice, NotaServicoCollection notas)
@@ -754,7 +754,7 @@ protected override void PrepararConsultarNFSe(RetornoConsultarNFSe retornoWebser
754754

755755
protected override void AssinarConsultarNFSe(RetornoConsultarNFSe retornoWebservice)
756756
{
757-
retornoWebservice.XmlEnvio = XmlSigning.AssinarXml(retornoWebservice.XmlEnvio, "ns1:ReqConsultaNotas", "Cabecalho", Certificado, true);
757+
retornoWebservice.XmlEnvio = XmlSigning.AssinarXml(retornoWebservice.XmlEnvio, "ns1:ReqConsultaNotas", "Cabecalho", Certificado);
758758
}
759759

760760
protected override void TratarRetornoConsultarNFSe(RetornoConsultarNFSe retornoWebservice, NotaServicoCollection notas)
@@ -801,7 +801,7 @@ protected override void PrepararCancelarNFSe(RetornoCancelar retornoWebservice)
801801

802802
protected override void AssinarCancelarNFSe(RetornoCancelar retornoWebservice)
803803
{
804-
retornoWebservice.XmlEnvio = XmlSigning.AssinarXml(retornoWebservice.XmlEnvio, "ns1:ReqCancelamentoNFSe", "Lote", Certificado, true);
804+
retornoWebservice.XmlEnvio = XmlSigning.AssinarXml(retornoWebservice.XmlEnvio, "ns1:ReqCancelamentoNFSe", "Lote", Certificado);
805805
}
806806

807807
protected override void TratarRetornoCancelarNFSe(RetornoCancelar retornoWebservice, NotaServicoCollection notas)
@@ -868,7 +868,7 @@ protected override void PrepararCancelarNFSeLote(RetornoCancelarNFSeLote retorno
868868

869869
protected override void AssinarCancelarNFSeLote(RetornoCancelarNFSeLote retornoWebservice)
870870
{
871-
retornoWebservice.XmlEnvio = XmlSigning.AssinarXml(retornoWebservice.XmlEnvio, "ns1:ReqCancelamentoNFSe", "Lote", Certificado, true);
871+
retornoWebservice.XmlEnvio = XmlSigning.AssinarXml(retornoWebservice.XmlEnvio, "ns1:ReqCancelamentoNFSe", "Lote", Certificado);
872872
}
873873

874874
protected override void TratarRetornoCancelarNFSeLote(RetornoCancelarNFSeLote retornoWebservice, NotaServicoCollection notas)

‎src/OpenAC.Net.NFSe/Resources/Municipios.nfse‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)