Skip to content

fix(danfse): separar destinatário e intermediário e corrigir grade dos participantes (#118) #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vitormattos merged 2 commits into from
Oct 12, 2026
Merged

fix(danfse): separar destinatário e intermediário e corrigir grade dos participantes (#118) #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aecafba
fix(danfse): render distinct parties and authorized participant locat…
vitormattos Oct 12, 2026
43aa9a0
fix(danfse): honor authorized indDest before recipient group (#118)
vitormattos Oct 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 101 additions & 36 deletions src/Danfse/DanfseTemplate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ public function buildData(array $nfse): array
$enderEmit = $this->node($emit, 'enderNac');
$toma = $this->node($infDps, 'toma');
$endToma = $this->node($toma, 'end');
$dest = $this->node($infDps, 'IBSCBS', 'dest');
$interm = $this->node($infDps, 'interm');
$endInterm = $this->node($interm, 'end');
$serv = $this->node($infDps, 'serv');
Expand All @@ -93,6 +94,26 @@ public function buildData(array $nfse): array
$ibsCbsValores = $this->node($ibsCbs, 'valores');
$ibsCbsTotais = $this->node($ibsCbs, 'totCIBS');

// The authorized DPS is the primary source for the provider. The
// authorized infNFSe/emit enriches omitted legacy address/name data.
$provider = $this->personDetails($prest);
$provider['nome'] = $this->val($prest, 'xNome') ?: $this->val($emit, 'xNome') ?: '-';
$provider['cnpj_cpf'] = $this->formattedDocument($prest);
$provider['im'] = $this->val($prest, 'IM') ?: $this->val($emit, 'IM') ?: '-';
$provider['telefone'] = $this->formatter->phone($this->val($prest, 'fone') ?: $this->val($emit, 'fone'));
$provider['email'] = strtolower($this->val($prest, 'email') ?: $this->val($emit, 'email'));
if ($this->node($prest, 'end') === []) {
$provider['endereco'] = $this->address($enderEmit);
$provider['municipio'] = $this->cityWithUf(
$this->val($infNfse, 'xLocEmi'),
$this->val($enderEmit, 'UF'),
);
$provider['cep'] = $this->formatter->cep($this->val($enderEmit, 'CEP'));
$provider['ibge_cep'] = $this->ibgeCep($this->val($enderEmit, 'cMun'), $this->val($enderEmit, 'CEP'));
}
$provider['simples_nacional'] = OptanteSimplesNacional::labelFor($this->val($regTrib, 'opSimpNac'));
$provider['regime_sn'] = RegimeApuracaoTributariaSN::labelFor($this->val($regTrib, 'regApTribSN'));

$id = $this->val($infNfse, 'Id');
$chaveAcesso = str_starts_with($id, 'NFS') ? substr($id, 3) : $id;

Expand All @@ -111,42 +132,23 @@ public function buildData(array $nfse): array
'situacao_nfse' => $this->statusLabel($this->val($infNfse, 'cStat')),
'finalidade_nfse' => $this->purposeLabel($this->val($infDps, 'IBSCBS', 'finNFSe')),

'emitente' => [
'nome' => $this->val($emit, 'xNome') ?: '-',
'cnpj_cpf' => $this->formattedDocument($emit),
'im' => $this->val($prest, 'IM') ?: $this->val($emit, 'IM') ?: '-',
'telefone' => $this->formatter->phone($this->val($prest, 'fone') ?: $this->val($emit, 'fone')),
'email' => strtolower($this->val($prest, 'email') ?: $this->val($emit, 'email')),
'endereco' => $this->address($enderEmit),
'municipio' => $this->cityWithUf($this->val($infNfse, 'xLocEmi'), $this->val($enderEmit, 'UF')),
'cep' => $this->formatter->cep($this->val($enderEmit, 'CEP')),
'ibge_cep' => $this->ibgeCep($this->val($enderEmit, 'cMun'), $this->val($enderEmit, 'CEP')),
'simples_nacional' => OptanteSimplesNacional::labelFor($this->val($regTrib, 'opSimpNac')),
'regime_sn' => RegimeApuracaoTributariaSN::labelFor($this->val($regTrib, 'regApTribSN')),
],

'tomador' => [
'nome' => $this->val($toma, 'xNome') ?: '-',
'cnpj_cpf' => $this->formattedDocument($toma),
'im' => $this->val($toma, 'IM') ?: '-',
'telefone' => $this->formatter->phone($this->val($toma, 'fone')),
'email' => strtolower($this->val($toma, 'email')),
'endereco' => $this->address($endToma),
'municipio' => $this->city($this->val($endToma, 'endNac', 'cMun')),
'cep' => $this->formatter->cep($this->val($endToma, 'endNac', 'CEP')),
'ibge_cep' => $this->ibgeCep($this->val($endToma, 'endNac', 'cMun'), $this->val($endToma, 'endNac', 'CEP')),
],

'intermediario' => $interm === [] ? null : [
'nome' => $this->val($interm, 'xNome') ?: '-',
'cnpj_cpf' => $this->formattedDocument($interm),
'im' => $this->val($interm, 'IMPrestMun') ?: '-',
'telefone' => $this->formatter->phone($this->val($interm, 'fone')),
'email' => strtolower($this->val($interm, 'email')),
'endereco' => $this->address($endInterm),
'municipio' => $this->city($this->val($endInterm, 'endNac', 'cMun')),
'cep' => $this->formatter->cep($this->val($endInterm, 'endNac', 'CEP')),
],
'emitente' => $provider,
'tomador' => $toma === [] ? null : $this->personDetails($toma),
'destinatario' => $dest === [] ? null : array_merge(
$this->personDetails($dest),
['mesmo_tomador' => $this->samePerson($dest, $toma)],
),
// The official XSD's indDest=0 is an explicit declaration
// that dest=toma, even if there is no separate dest group.
// When indDest=1, never override that with a name or inferred
// equality. Only legacy XML lacking indDest uses identity
// comparison as a presentation fallback.
'destinatario_mesmo_tomador' => match ($this->val($infDps, 'IBSCBS', 'indDest')) {
'0' => true,
'1' => false,
default => $dest !== [] && $this->samePerson($dest, $toma),
},
'intermediario' => $interm === [] ? null : $this->personDetails($interm),

'servico' => [
'codigo_trib_nacional' => $this->formatter->codTribNacional($this->val($cServ, 'cTribNac')),
Expand Down Expand Up @@ -250,6 +252,69 @@ public function buildData(array $nfse): array
];
}

/**
* Presentation fields for people in the authorized DPS, keeping national
* IBGE/CEP and foreign city/postal codes distinct. Missing values stay
* missing: no municipality, state or identity is guessed.
*
* @param array<string,mixed> $person
* @return array<string,string>
*/
private function personDetails(array $person): array
{
$address = $this->node($person, 'end');
$national = $this->node($address, 'endNac');
$foreign = $this->node($address, 'endExt');

$municipio = '-';
$ibgeCep = '-';
$cep = '-';

if ($national !== []) {
$municipio = $this->city($this->val($national, 'cMun'));
$ibgeCep = $this->ibgeCep($this->val($national, 'cMun'), $this->val($national, 'CEP'));
$cep = $this->formatter->cep($this->val($national, 'CEP'));
} elseif ($foreign !== []) {
$city = $this->val($foreign, 'xCidade');
$region = $this->val($foreign, 'xEstProvReg');
$postal = $this->val($foreign, 'cEndPost');
$municipio = $city !== '' ? $city . ($region !== '' ? ' - ' . $region : '') : '-';
$ibgeCep = '- / ' . ($postal !== '' ? $postal : '-');
$cep = $postal !== '' ? $postal : '-';
}

return [
'nome' => $this->val($person, 'xNome') ?: '-',
'cnpj_cpf' => $this->formattedDocument($person),
'im' => $this->val($person, 'IM') ?: $this->val($person, 'IMPrestMun') ?: '-',
'telefone' => $this->formatter->phone($this->val($person, 'fone')),
'email' => strtolower($this->val($person, 'email')),
'endereco' => $this->address($address),
'municipio' => $municipio,
'ibge_cep' => $ibgeCep,
'cep' => $cep,
];
}

/**
* Equal verified identifiers permit the NT008 optional same-taker label.
* Names or addresses alone do not establish fiscal identity.
*
* @param array<string,mixed> $left
* @param array<string,mixed> $right
*/
private function samePerson(array $left, array $right): bool
{
foreach (['CNPJ', 'CPF', 'NIF'] as $key) {
$id = $this->val($left, $key);
if ($id !== '' && $id === $this->val($right, $key)) {
return true;
}
}

return false;
}

/**
* Navigate to a nested sub-array, returning [] when any step is missing.
*
Expand Down
108 changes: 49 additions & 59 deletions src/Danfse/HTMLTemplate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
</div>

<!-- Emitente -->
<div class="bordered-section">
<div class="bordered-section party-prestador">
<table>
<tr>
<td class="section-header">
Expand All @@ -187,28 +187,13 @@
</td>
</tr>
<tr>
<td colspan="2">
<span class="label">Nome / Nome Empresarial</span>
<span class="value"><?= $data['emitente']['nome'] ?></span>
</td>
<td colspan="2">
<span class="label">E-mail</span>
<span class="value"><?= $data['emitente']['email'] ?></span>
</td>
<td colspan="2"><span class="label">Nome / Nome Empresarial</span><span class="value"><?= $data['emitente']['nome'] ?></span></td>
<td><span class="label">Município / Sigla UF</span><span class="value"><?= $data['emitente']['municipio'] ?></span></td>
<td><span class="label">Código IBGE / CEP</span><span class="value"><?= $data['emitente']['ibge_cep'] ?></span></td>
</tr>
<tr>
<td colspan="2">
<span class="label">Endereço</span>
<span class="value"><?= $data['emitente']['endereco'] ?></span>
</td>
<td>
<span class="label">Município</span>
<span class="value"><?= $data['emitente']['municipio'] ?></span>
</td>
<td>
<span class="label">Código IBGE / CEP</span>
<span class="value"><?= $data['emitente']['ibge_cep'] ?></span>
</td>
<td colspan="2"><span class="label">Endereço</span><span class="value"><?= $data['emitente']['endereco'] ?></span></td>
<td colspan="2"><span class="label">E-mail</span><span class="value"><?= $data['emitente']['email'] ?></span></td>
</tr>
<tr>
<td colspan="2">
Expand All @@ -224,7 +209,10 @@
</div>

<!-- Tomador -->
<div class="bordered-section">
<?php if ($data['tomador'] === null): ?>
<div class="no-party">TOMADOR/ADQUIRENTE DA OPERAÇÃO NÃO IDENTIFICADO NA NFS-e</div>
<?php else: ?>
<div class="bordered-section party-tomador">
<table>
<tr>
<td class="section-header">
Expand All @@ -248,38 +236,54 @@
<span class="label">Nome / Nome Empresarial</span>
<span class="value"><?= $data['tomador']['nome'] ?></span>
</td>
<td colspan="2" style="width: 50%;">
<span class="label">E-mail</span>
<span class="value"><?= $data['tomador']['email'] ?></span>
</td>
<td><span class="label">Município / Sigla UF</span><span class="value"><?= $data['tomador']['municipio'] ?></span></td>
<td><span class="label">Código IBGE / CEP</span><span class="value"><?= $data['tomador']['ibge_cep'] ?></span></td>
</tr>
<tr>
<td colspan="2" style="width: 50%;">
<span class="label">Endereço</span>
<span class="value"><?= $data['tomador']['endereco'] ?></span>
</td>
<td style="width: 25%;">
<span class="label">Município</span>
<span class="value"><?= $data['tomador']['municipio'] ?></span>
</td>
<td style="width: 25%;">
<span class="label">Código IBGE / CEP</span>
<span class="value"><?= $data['tomador']['ibge_cep'] ?></span>
</td>
<td colspan="2"><span class="label">Endereço</span><span class="value"><?= $data['tomador']['endereco'] ?></span></td>
<td colspan="2"><span class="label">E-mail</span><span class="value"><?= $data['tomador']['email'] ?></span></td>
</tr>
</table>
</div>
<?php endif; ?>

<!-- Destinatário: independent of the intermediary, as required by NT008 -->
<?php if ($data['destinatario_mesmo_tomador']): ?>
<div class="no-party">O DESTINATÁRIO É O PRÓPRIO TOMADOR/ADQUIRENTE DA OPERAÇÃO</div>
<?php elseif ($data['destinatario'] === null): ?>
<div class="no-party">DESTINATÁRIO DA OPERAÇÃO NÃO IDENTIFICADO NA NFS-e</div>
<?php else: ?>
<div class="bordered-section party-destinatario">
<table>
<tr>
<td class="section-header"><span class="section-title">DESTINATÁRIO DA OPERAÇÃO</span></td>
<td><span class="label">CNPJ / CPF / NIF</span><span class="value"><?= $data['destinatario']['cnpj_cpf'] ?></span></td>
<td></td>
<td><span class="label">Telefone</span><span class="value"><?= $data['destinatario']['telefone'] ?></span></td>
</tr>
<tr>
<td colspan="2"><span class="label">Nome / Nome Empresarial</span><span class="value"><?= $data['destinatario']['nome'] ?></span></td>
<td><span class="label">Município / Sigla UF</span><span class="value"><?= $data['destinatario']['municipio'] ?></span></td>
<td><span class="label">Código IBGE / CEP</span><span class="value"><?= $data['destinatario']['ibge_cep'] ?></span></td>
</tr>
<tr>
<td colspan="2"><span class="label">Endereço</span><span class="value"><?= $data['destinatario']['endereco'] ?></span></td>
<td colspan="2"><span class="label">E-mail</span><span class="value"><?= $data['destinatario']['email'] ?></span></td>
</tr>
</table>
</div>
<?php endif; ?>

<!-- Intermediário -->
<?php if ($data['intermediario'] !== null): ?>
<div class="bordered-section">
<div class="bordered-section party-intermediario">
<table>
<tr>
<td class="section-header">
<span class="section-title">INTERMEDIÁRIO DO SERVIÇO</span>
</td>
<td style="width: 25%;">
<span class="label">CNPJ / CPF</span>
<span class="label">CNPJ / CPF / NIF</span>
<span class="value"><?= $data['intermediario']['cnpj_cpf'] ?></span>
</td>
<td style="width: 25%;">
Expand All @@ -296,31 +300,17 @@
<span class="label">Nome / Nome Empresarial</span>
<span class="value"><?= $data['intermediario']['nome'] ?></span>
</td>
<td colspan="2" style="width: 50%;">
<span class="label">E-mail</span>
<span class="value"><?= $data['intermediario']['email'] ?></span>
</td>
<td><span class="label">Município / Sigla UF</span><span class="value"><?= $data['intermediario']['municipio'] ?></span></td>
<td><span class="label">Código IBGE / CEP</span><span class="value"><?= $data['intermediario']['ibge_cep'] ?></span></td>
</tr>
<tr>
<td colspan="2" style="width: 50%;">
<span class="label">Endereço</span>
<span class="value"><?= $data['intermediario']['endereco'] ?></span>
</td>
<td style="width: 25%;">
<span class="label">Município</span>
<span class="value"><?= $data['intermediario']['municipio'] ?></span>
</td>
<td style="width: 25%;">
<span class="label">CEP</span>
<span class="value"><?= $data['intermediario']['cep'] ?></span>
</td>
<td colspan="2"><span class="label">Endereço</span><span class="value"><?= $data['intermediario']['endereco'] ?></span></td>
<td colspan="2"><span class="label">E-mail</span><span class="value"><?= $data['intermediario']['email'] ?></span></td>
</tr>
</table>
</div>
<?php else: ?>
<div class="no-party">DESTINATÁRIO DA OPERAÇÃO NÃO IDENTIFICADO NA NFS-e
<div>INTERMEDIÁRIO DA OPERAÇÃO NÃO IDENTIFICADO NA NFS-e</div>
</div>
<div class="no-party">INTERMEDIÁRIO DA OPERAÇÃO NÃO IDENTIFICADO NA NFS-e</div>
<?php endif; ?>

<!-- Serviço Prestado -->
Expand Down
Loading
Loading