-
-
-
-
-
- |
- Federais
-
- |
-
- Estaduais
-
+ |
+ Total do IBS/CBS
+
|
-
- Municipais
-
+ |
+ Valor Líquido da NFS-e + IBS/CBS
+
|
diff --git a/src/Dto/DpsData.php b/src/Dto/DpsData.php
index 9475ea7..ea4ab4b 100644
--- a/src/Dto/DpsData.php
+++ b/src/Dto/DpsData.php
@@ -33,6 +33,12 @@ public function __construct(
/** Descrição do serviço prestado. */
public string $discriminacao,
+ /** Optional provider phone published in the DPS. */
+ public string $prestadorTelefone = '',
+
+ /** Optional provider e-mail published in the DPS. */
+ public string $prestadorEmail = '',
+
/** Tipo de ambiente (1-Produção | 2-Homologação). */
public int $tipoAmbiente = 2,
diff --git a/src/Xml/XmlBuilder.php b/src/Xml/XmlBuilder.php
index ed6499d..9b53e7b 100644
--- a/src/Xml/XmlBuilder.php
+++ b/src/Xml/XmlBuilder.php
@@ -55,6 +55,15 @@ public function buildDps(DpsData $dps): string
$prest = $doc->createElement('prest');
$cnpj = $doc->createElement('CNPJ', $dps->cnpjPrestador);
$prest->appendChild($cnpj);
+
+ if ($dps->prestadorTelefone !== '') {
+ $prest->appendChild($doc->createElement('fone', $dps->prestadorTelefone));
+ }
+
+ if ($dps->prestadorEmail !== '') {
+ $prest->appendChild($doc->createElement('email', htmlspecialchars($dps->prestadorEmail, ENT_XML1)));
+ }
+
$prest->appendChild($this->buildRegTrib($doc, $dps));
$infDps->appendChild($prest);
diff --git a/tests/Unit/Danfse/DanfseGoldenReferenceTest.php b/tests/Unit/Danfse/DanfseGoldenReferenceTest.php
index 55d7ec5..4cccbf0 100644
--- a/tests/Unit/Danfse/DanfseGoldenReferenceTest.php
+++ b/tests/Unit/Danfse/DanfseGoldenReferenceTest.php
@@ -104,7 +104,7 @@ public function testIbsCbsReferenceRendersOnlyAuthorizedTotals(): void
self::assertStringContainsString('TRIBUTAÇÃO IBS / CBS', $html);
}
- public function testLegacyAuthorizedXmlWithoutIbsCbsKeepsLegacyLayout(): void
+ public function testAuthorizedXmlWithoutIbsCbsStillRendersRequiredV2Section(): void
{
$nfse = $this->fixtureData();
unset($nfse['infNFSe']['IBSCBS']);
@@ -113,11 +113,32 @@ public function testLegacyAuthorizedXmlWithoutIbsCbsKeepsLegacyLayout(): void
$data = $template->buildData($nfse);
$html = $template->render($nfse, new DanfseConfig());
- self::assertNull($data['ibs_cbs']);
- self::assertStringNotContainsString('TRIBUTAÇÃO IBS / CBS', $html);
+ self::assertIsArray($data['ibs_cbs']);
+ self::assertSame('-', $data['ibs_cbs']['base_calculo']);
+ self::assertSame('-', $data['ibs_cbs']['total_ibs_cbs']);
+ self::assertStringContainsString('TRIBUTAÇÃO IBS / CBS', $html);
self::assertStringContainsString('DANFSe v2.0', $html);
}
+ public function testFederalRetentionUsesOfficialV2Semantics(): void
+ {
+ $nfse = $this->fixtureData();
+ $nfse['infNFSe']['DPS']['infDPS']['valores']['trib']['tribFed']['piscofins']['tpRetPisCofins'] = '4';
+ $nfse['infNFSe']['DPS']['infDPS']['valores']['trib']['tribFed']['vRetCSLL'] = '1149.75';
+
+ $template = new DanfseTemplate();
+ $data = $template->buildData($nfse);
+ $html = $template->render($nfse, new DanfseConfig());
+
+ self::assertSame('R$ 1.149,75', $data['tributacao_federal']['contribuicoes_sociais']);
+ self::assertSame(
+ '4 - PIS/COFINS Retidos, CSLL Não Retido',
+ $data['tributacao_federal']['descricao_retencao'],
+ );
+ self::assertStringContainsString('Contribuições Sociais - Retidas', $html);
+ self::assertStringContainsString('Descrição Contrib. Sociais - Retidas', $html);
+ }
+
public function testHomologationReferenceCarriesVisibleMarker(): void
{
$nfse = $this->fixtureData();
diff --git a/tests/Unit/Danfse/DanfseTemplateTest.php b/tests/Unit/Danfse/DanfseTemplateTest.php
index 25d10cc..dfbc875 100644
--- a/tests/Unit/Danfse/DanfseTemplateTest.php
+++ b/tests/Unit/Danfse/DanfseTemplateTest.php
@@ -95,6 +95,11 @@ public function testRenderProducesHtmlWithQrCodeAndAccessKey(): void
self::assertStringContainsString('', $html);
self::assertStringContainsString('DANFSe v2.0', $html);
+ self::assertStringContainsString('Município:', $html);
+ self::assertStringContainsString('Ambiente Gerador:', $html);
+ self::assertStringContainsString('Tipo de Ambiente:', $html);
+ self::assertStringContainsString('Situação da NFS-e', $html);
+ self::assertStringContainsString('Finalidade', $html);
self::assertStringContainsString('3303302112233450000195000000000000100000000001', $html);
self::assertStringContainsString('data:image/svg+xml;base64,', $html);
// Production environment: no homologação watermark
@@ -133,11 +138,12 @@ public function testBuildDataMapsAuthorizedIbsCbsTotalsWithoutRecalculating(): v
self::assertSame('R$ 1.515,75', $data['ibs_cbs']['valor_total_nfse']);
}
- public function testRenderShowsIbsCbsSectionOnlyWhenAuthorizedXmlContainsIt(): void
+ public function testRenderShowsRequiredIbsCbsSectionEvenWithoutAuthorizedIbsCbsGroup(): void
{
$withoutIbsCbs = (new DanfseTemplate())->render($this->fixtureNfseData(), new DanfseConfig());
- self::assertStringNotContainsString('TRIBUTAÇÃO IBS / CBS', $withoutIbsCbs);
+ self::assertStringContainsString('TRIBUTAÇÃO IBS / CBS', $withoutIbsCbs);
+ self::assertStringContainsString('Exclusões e Reduções da Base de Cálculo', $withoutIbsCbs);
$nfseData = $this->fixtureNfseData();
$nfseData['infNFSe']['IBSCBS'] = [
diff --git a/tests/Unit/Xml/XmlBuilderTest.php b/tests/Unit/Xml/XmlBuilderTest.php
index 48da978..2e1a196 100644
--- a/tests/Unit/Xml/XmlBuilderTest.php
+++ b/tests/Unit/Xml/XmlBuilderTest.php
@@ -87,6 +87,21 @@ public function testBuildDpsContainsCnpjPrestador(): void
self::assertStringContainsString('11222333000181', $xml);
}
+ public function testBuildDpsPublishesOptionalProviderContact(): void
+ {
+ $xml = $this->builder->buildDps($this->makeDps(
+ prestadorTelefone: '21969203370',
+ prestadorEmail: 'adm@librecode.coop',
+ ));
+
+ $normalized = str_replace(["\n", ' '], '', $xml);
+
+ self::assertStringContainsString(
+ '
1122233300018121969203370adm@librecode.coop',
+ $normalized,
+ );
+ }
+
public function testBuildDpsContainsMunicipioIbge(): void
{
$dps = $this->makeDps(municipioIbge: '3303302');
@@ -896,6 +911,8 @@ private function makeDps(
string $valorServico = '1000.00',
string $aliquota = '5.00',
string $discriminacao = 'Consultoria em TI',
+ string $prestadorTelefone = '',
+ string $prestadorEmail = '',
string $serie = '00001',
string $numeroDps = '1',
bool $issRetido = false,
@@ -951,6 +968,8 @@ private function makeDps(
valorServico: $valorServico,
aliquota: $aliquota,
discriminacao: $discriminacao,
+ prestadorTelefone: $prestadorTelefone,
+ prestadorEmail: $prestadorEmail,
serie: $serie,
numeroDps: $numeroDps,
codigoTributacaoNacional: $codigoTributacaoNacional,