diff --git a/modules/addons/gofasnfeio/hooks/aftercronjob.php b/modules/addons/gofasnfeio/hooks/aftercronjob.php
index dcadfb1..02cb0d1 100644
--- a/modules/addons/gofasnfeio/hooks/aftercronjob.php
+++ b/modules/addons/gofasnfeio/hooks/aftercronjob.php
@@ -3,33 +3,29 @@
 if (!defined('WHMCS')) {
     exit();
 }
+
 use WHMCS\Database\Capsule;
+
 $params = gnfe_config();
 $dataAtual = date('Y-m-d H:i:s');
 
-if (Capsule::table('tbladdonmodules')->where('setting','=','last_cron')->count() == 0) {
+if (Capsule::table('tbladdonmodules')->where('setting', '=', 'last_cron')->count() == 0) {
     Capsule::table('tbladdonmodules')->insert(['module' => 'gofasnfeio', 'setting' => 'last_cron', 'value' => $dataAtual]);
 } else {
-    Capsule::table('tbladdonmodules')->where('setting','=','last_cron')->update(['value' => $dataAtual]);
+    Capsule::table('tbladdonmodules')->where('setting', '=', 'last_cron')->update(['value' => $dataAtual]);
 }
 
-if (!isset($params['issue_note_after']) || $params['issue_note_after'] <= 0) {
-    foreach (Capsule::table('gofasnfeio')->orderBy('id', 'desc')->where('status', '=', 'Waiting')->get(['id', 'invoice_id', 'services_amount']) as $waiting) {
-        logModuleCall('gofas_nfeio', 'aftercronjob - checktablegofasnfeio', '', $waiting,'', '');
+$hasNfWaiting = Capsule::table('gofasnfeio')->where('status', '=', 'Waiting')->count();
 
-        $data = getTodaysDate(false);
-        $dataAtual = toMySQLDate($data);
+if ($hasNfWaiting) {
+    $queryNf = Capsule::table('gofasnfeio')->orderBy('id', 'desc')->where('status', '=', 'Waiting')->get(['id', 'invoice_id', 'services_amount']);
+    foreach ($queryNf as $waiting) {
 
-        if ($params['issue_note_default_cond'] !== 'Manualmente') {
-            $getQuery = Capsule::table('tblinvoices')->whereBetween('date', [$params['initial_date'], $dataAtual])->where('id', '=', $waiting->invoice_id)->get(['id', 'userid', 'total']);
-            logModuleCall('gofas_nfeio', 'aftercronjob - getQuery', ['date' => [$params['initial_date'], $dataAtual], 'where' => 'id=' . $waiting->invoice_id], $getQuery,'', '');
-        } else {
-            $getQuery = Capsule::table('tblinvoices')->where('id', '=', $waiting->invoice_id)->get(['id', 'userid', 'total']);
-            logModuleCall('gofas_nfeio', 'aftercronjob - getQuery', 'id=' . $waiting->invoice_id, $getQuery,'', '');
-        }
+        $getQuery = Capsule::table('tblinvoices')->where('id', '=', $waiting->invoice_id)->get(['id', 'userid', 'total']);
+        logModuleCall('nfeio', 'aftercronjob - getQuery 1', $waiting, $getQuery);
 
         foreach ($getQuery as $invoices) {
-            emitNFE($invoices,$waiting);
+            emitNFE($invoices, $waiting);
         }
     }
 }