refact(core): não gera nota para itens referente a juros/multa

pequenas correções na lógica. refs: #110
nfe · Mar 14, 2022 · c707c46 · c707c46
1 parent e3374a1
commit c707c46
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/modules/addons/NFEioServiceInvoices/lib/Models/ServiceInvoices/Repository.php b/modules/addons/NFEioServiceInvoices/lib/Models/ServiceInvoices/Repository.php
@@ -165,7 +165,7 @@ public function hasInvoices($id)
         $response = false;
         $total = self::getTotalById($id);
 
-        if (count($total) > 0) {
+        if ($total > 0) {
             $response = true;
         }
         return $response;

diff --git a/modules/addons/NFEioServiceInvoices/lib/NFEio/Nfe.php b/modules/addons/NFEioServiceInvoices/lib/NFEio/Nfe.php
@@ -62,10 +62,11 @@ public function queue($invoiceId, $force = false)
         $userId = $clientData[0]['id'];
         $serviceCode = $this->storage->get('service_code');
         $hasInvoices = $this->serviceInvoicesRepo->hasInvoices($invoiceId);
+        $totalById = $this->serviceInvoicesRepo->getTotalById($invoiceId);
 
         // se já houverem notas geradas para esta fatura não faça nada
         if ($hasInvoices) {
-            logModuleCall('NFEioServiceInvoices', __CLASS__ . '-' . __FUNCTION__, "Fatura: {$invoiceId}", "Já possuí NF gerada.");
+            logModuleCall('NFEioServiceInvoices', __CLASS__ . '-' . __FUNCTION__, "Fatura: {$invoiceId}", "Já possuí NF gerada: {$hasInvoices} - {$totalById}.");
             return [
               'success' => true,
               'alreadyHasNf' => true

diff --git a/modules/addons/NFEioServiceInvoices/lib/templates/admin/admininvoicescontrolsoutput.tpl b/modules/addons/NFEioServiceInvoices/lib/templates/admin/admininvoicescontrolsoutput.tpl
@@ -50,17 +50,19 @@
             <div class="table-responsive">
                 <table class="table table-bordered">
                     <thead>
-                    <th class="text-center">NF ID</th>
+                    <th class="text-center">ID</th>
+                    <th class="text-center">ID Externo</th>
                     <th class="text-center">Status</th>
                     <th class="text-center">Gerada Em</th>
                     <th class="text-center">Ações</th>
                     </thead>
                     <tbody>
                     {foreach from=$localServiceInvoices item=nota name=nota}
                         <tr>
-                            <td>{$nota->nfe_id}</td>
-                            <td>{statusLabel data=$nota->status}</td>
-                            <td>{$nota->created_at|date_format:"%d/%m/%Y %H:%M:%S"}</td>
+                            <td class="text-center">{$nota->nfe_id}</td>
+                            <td class="text-center">{$nota->nfe_external_id}</td>
+                            <td class="text-center">{statusLabel data=$nota->status}</td>
+                            <td class="text-center">{$nota->created_at|date_format:"%d/%m/%Y %H:%M:%S"}</td>
                             <td>
                                 <form action="" method="post" id="nfeio_frm_cancel_{$smarty.foreach.nf.iteration}">
                                     <input type="hidden" name="nfeiosi" value="cancel">