From ba15ce09a2274aa9a23d9dee9a7957614a388f5b Mon Sep 17 00:00:00 2001 From: Andre Bellafronte Date: Thu, 16 Sep 2021 21:14:43 -0300 Subject: [PATCH] =?UTF-8?q?corre=C3=A7=C3=A3o=20das=20URLs=20para=20a=20re?= =?UTF-8?q?lease=201.4.1=20#81=20(#90)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gofasnfeio/addonPage/outputproduct.php | 15 +++---- .../addonPage/outputsystemlegacy.php | 7 +-- modules/addons/gofasnfeio/config.php | 2 +- .../hooks/admininvoicescontrolsoutput.php | 23 +++++----- modules/addons/gofasnfeio/output.php | 43 +++++++++---------- 5 files changed, 39 insertions(+), 51 deletions(-) diff --git a/modules/addons/gofasnfeio/addonPage/outputproduct.php b/modules/addons/gofasnfeio/addonPage/outputproduct.php index 959dad6..0732e45 100644 --- a/modules/addons/gofasnfeio/addonPage/outputproduct.php +++ b/modules/addons/gofasnfeio/addonPage/outputproduct.php @@ -20,22 +20,19 @@ } $message = '
Código Salvo
'; header_remove(); - header('Location: ' . $gnfewhmcsadminurl . 'addonmodules.php?module=gofasnfeio&action=code_product&gnfe_message=' . base64_encode(urlencode($message))); + header('Location: addonmodules.php?module=gofasnfeio&action=code_product&gnfe_message=' . base64_encode(urlencode($message))); exit; } catch (\Exception $e) { $e->getMessage(); $message = '
' . $e->getMessage() . '
'; header_remove(); - header('Location: ' . $gnfewhmcsadminurl . 'addonmodules.php?module=gofasnfeio&action=code_product&gnfe_message=' . base64_encode(urlencode($message))); + header('Location: addonmodules.php?module=gofasnfeio&action=code_product&gnfe_message=' . base64_encode(urlencode($message))); exit; } } - foreach (Capsule::table('tblconfiguration')->where('setting', '=', 'gnfewhmcsadminurl')->get(['value']) as $gnfewhmcsadminurl_) { - $gnfewhmcsadminurl = $gnfewhmcsadminurl_->value; - } $nfes = []; foreach (Capsule::table('tblproducts')->orderBy('id', 'desc')->get(['id']) as $nfes_) { $nfes[] = $nfes_->id; @@ -48,10 +45,10 @@ $created_at = $product->created_at ? date('d/m/Y', strtotime($product->created_at)) : ''; $update_at = $product->update_at ? date('d/m/Y', strtotime($product->update_at)) : ''; - $html_table .= '#' . $product->id . ' + $html_table .= '#' . $product->id . ' ' . $created_at . ' ' . $update_at . ' - ' . $product->name . ' + ' . $product->name . '
@@ -61,8 +58,8 @@ } echo ' - NFE.io - Sistema legado + NFE.io + Sistema legado
diff --git a/modules/addons/gofasnfeio/addonPage/outputsystemlegacy.php b/modules/addons/gofasnfeio/addonPage/outputsystemlegacy.php index 6520eb6..d7bc558 100644 --- a/modules/addons/gofasnfeio/addonPage/outputsystemlegacy.php +++ b/modules/addons/gofasnfeio/addonPage/outputsystemlegacy.php @@ -4,13 +4,10 @@ } use WHMCS\Database\Capsule; - foreach (Capsule::table('tblconfiguration')->where('setting', '=', 'gnfewhmcsadminurl')->get(['value']) as $gnfewhmcsadminurl_) { - $gnfewhmcsadminurl = $gnfewhmcsadminurl_->value; - } ?>
- Código de Serviços - NFE.io + Código de Serviços + NFE.io
  • ', + 'author' => '', 'fields' => $fields, ]; diff --git a/modules/addons/gofasnfeio/hooks/admininvoicescontrolsoutput.php b/modules/addons/gofasnfeio/hooks/admininvoicescontrolsoutput.php index c231897..4d6b57e 100644 --- a/modules/addons/gofasnfeio/hooks/admininvoicescontrolsoutput.php +++ b/modules/addons/gofasnfeio/hooks/admininvoicescontrolsoutput.php @@ -10,9 +10,6 @@ $invoice = localAPI('GetInvoice', ['invoiceid' => $vars['invoiceid']], false); $client = localAPI('GetClientsDetails', ['clientid' => $vars['userid'], 'stats' => false], false); -foreach (Capsule::table('tblconfiguration')->where('setting', '=', 'gnfewhmcsadminurl')->get(['value']) as $gnfewhmcsadminurl_) { - $gnfewhmcsadminurl = $gnfewhmcsadminurl_->value; -} if ($_REQUEST['gnfe_create']) { if ($nfe_for_invoice['status'] !== (string) 'Created' && $nfe_for_invoice['status'] !== (string) 'Issued' && $nfe_for_invoice['status'] !== (string) 'Waiting') { foreach ($invoice['items']['item'] as $value) { @@ -23,7 +20,7 @@ if ($queue !== 'success') { logModuleCall('gofas_nfeio', 'admininvoicecontorloutput - gnfe_create',$vars['invoiceid'], $queue, 'ERROR', ''); header_remove(); - header('Location: ' . $gnfewhmcsadminurl . 'invoices.php?action=edit&id=' . $vars['invoiceid'] . '&gnfe_error=Erro ao criar nota fiscal: ' . $queue); + header('Location: invoices.php?action=edit&id=' . $vars['invoiceid'] . '&gnfe_error=Erro ao criar nota fiscal: ' . $queue); exit; } @@ -31,7 +28,7 @@ logModuleCall('gofas_nfeio', 'admininvoicecontorloutput - gnfe_create',$vars['invoiceid'], $queue, 'OK', ''); $message = '
    Nota Fiscal enviada para processamento
    '; header_remove(); - header('Location: ' . $gnfewhmcsadminurl . 'invoices.php?action=edit&id=' . $vars['invoiceid'] . '&gnfe_message=' . base64_encode(urlencode($message))); + header('Location: invoices.php?action=edit&id=' . $vars['invoiceid'] . '&gnfe_message=' . base64_encode(urlencode($message))); exit; } @@ -52,7 +49,7 @@ logModuleCall('gofas_nfeio', 'admininvoicecontorloutput - gnfe_cancel',$nfe->nfe_id, $delete_nfe, 'ERROR', ''); $message = '
    ' . $delete_nfe->message . '
    '; header_remove(); - header('Location: ' . $gnfewhmcsadminurl . 'invoices.php?action=edit&id=' . $vars['invoiceid'] . '&gnfe_message=' . base64_encode(urlencode($message))); + header('Location: invoices.php?action=edit&id=' . $vars['invoiceid'] . '&gnfe_message=' . base64_encode(urlencode($message))); return ''; } @@ -62,7 +59,7 @@ $gnfe_update_nfe = gnfe_update_nfe((object) ['id' => $nfe_for_invoice['nfe_id'], 'status' => 'Cancelled', 'servicesAmount' => $nfe_for_invoice['services_amount'], 'environment' => $nfe_for_invoice['environment'], 'flow_status' => $nfe_for_invoice['flow_status']], $nfe_for_invoice['user_id'], $vars['invoiceid'], 'n/a', $nfe_for_invoice['created_at'], date('Y-m-d H:i:s')); $message = '
    Nota Fiscal Cancelada com Sucesso
    '; header_remove(); - header('Location: ' . $gnfewhmcsadminurl . 'invoices.php?action=edit&id=' . $vars['invoiceid'] . '&gnfe_message=' . base64_encode(urlencode($message))); + header('Location: invoices.php?action=edit&id=' . $vars['invoiceid'] . '&gnfe_message=' . base64_encode(urlencode($message))); return ''; } @@ -74,7 +71,7 @@ logModuleCall('gofas_nfeio', 'admininvoicecontorloutput - gnfe_email',$_REQUEST['gnfe_email'], $gnfe_email, 'OK', ''); $message = '
    Email Enviado com Sucesso
    '; header_remove(); - header('Location: ' . $gnfewhmcsadminurl . 'invoices.php?action=edit&id=' . $vars['invoiceid'] . '&gnfe_message=' . base64_encode(urlencode($message))); + header('Location: invoices.php?action=edit&id=' . $vars['invoiceid'] . '&gnfe_message=' . base64_encode(urlencode($message))); exit; } @@ -83,7 +80,7 @@ logModuleCall('gofas_nfeio', 'admininvoicecontorloutput - gnfe_email',$_REQUEST['gnfe_email'], $gnfe_email, 'ERROR', ''); $message = '
    ' . $gnfe_email->message . '
    '; header_remove(); - header('Location: ' . $gnfewhmcsadminurl . 'invoices.php?action=edit&id=' . $vars['invoiceid'] . '&gnfe_message=' . base64_encode(urlencode($message))); + header('Location: invoices.php?action=edit&id=' . $vars['invoiceid'] . '&gnfe_message=' . base64_encode(urlencode($message))); exit; } @@ -126,10 +123,10 @@ } echo '
    '; echo '
    Nota Fiscal:' . $invoice_nfe . '
    '; -echo ''; -echo ''; -echo ''; -echo ''; +echo ''; +echo ''; +echo ''; +echo ''; echo '
    '; if ($_REQUEST['gnfe_error']) { diff --git a/modules/addons/gofasnfeio/output.php b/modules/addons/gofasnfeio/output.php index b20f806..c9b17fa 100644 --- a/modules/addons/gofasnfeio/output.php +++ b/modules/addons/gofasnfeio/output.php @@ -6,9 +6,6 @@ function gofasnfeio_output($vars) { require_once __DIR__ . '/functions.php'; $params = gnfe_config(); - foreach (Capsule::table('tblconfiguration')->where('setting', '=', 'gnfewhmcsadminurl')->get(['value']) as $gnfewhmcsadminurl_) { - $gnfewhmcsadminurl = $gnfewhmcsadminurl_->value; - } if ($_GET['action'] === 'code_product') { require_once __DIR__ . '/addonPage/outputproduct.php'; @@ -81,7 +78,7 @@ function gofasnfeio_output($vars) { $tag = 'a '; $a_style = ''; $li_class = 'class="enabled"'; - $href = $gnfewhmcsadminurl . 'addonmodules.php?module=gofasnfeio&page=' . $page_num; + $href = 'addonmodules.php?module=gofasnfeio&page=' . $page_num; } elseif ((int) $page_num === (int) $nfes_page) { $tag = 'span '; $a_style = 'style="background: #337ab7; color: #fff"'; @@ -96,7 +93,7 @@ function gofasnfeio_output($vars) { $preview_tag = 'span '; } else { $preview_class = ' class="previous" '; - $preview_href = ' href="' . $gnfewhmcsadminurl . 'addonmodules.php?module=gofasnfeio&page=' . ($nfes_page - 1) . '" '; + $preview_href = ' href="addonmodules.php?module=gofasnfeio&page=' . ($nfes_page - 1) . '" '; $preview_tag = 'a '; } if ((int) $nfes_page === (int) $nfes_pages) { @@ -105,7 +102,7 @@ function gofasnfeio_output($vars) { $next_tag = 'span '; } else { $next_class = ' class="next" '; - $next_href = ' href="' . $gnfewhmcsadminurl . 'addonmodules.php?module=gofasnfeio&page=' . ($nfes_page + 1) . '" '; + $next_href = ' href="addonmodules.php?module=gofasnfeio&page=' . ($nfes_page + 1) . '" '; $next_tag = 'a '; } $pagination .= '
  • <' . $preview_tag . ' ' . $preview_href . '>« Página anterior
    • '; @@ -146,25 +143,25 @@ function gofasnfeio_output($vars) { $status = 'Nenhum'; $disabled = ['a' => '', 'b' => '', 'c' => 'disabled="disabled"', 'd' => 'disabled="disabled"']; } - $html_table .= '
+ $html_table .= ' - +
#' . $value->invoice_id . '
#' . $value->invoice_id . ' ' . date('d/m/Y', strtotime($value->created_at)) . '' . $client['fullname'] . '' . $client['fullname'] . ' ' . number_format($value->services_amount, 2, ',', '.') . ' ' . $status . ' - + - - '; + + '; } if ((int) $nfes_total > 0) { echo ' - Código de Serviços - Sistema legado - Testar conexão + Código de Serviços + Sistema legado + Testar conexão

Listagem de notas fiscais

' . $nfes_total . ' Itens encontrados.
Exibindo de ' . $nfes_from . ' a ' . $nfes_to . '. Página ' . $nfes_page . ' de ' . $nfes_pages . '
@@ -192,8 +189,8 @@ function gofasnfeio_output($vars) { '; } else { echo ' - Código de Serviços - Sistema legado + Código de Serviços + Sistema legado

Nenhuma nota fiscal gerada até o momento

'; @@ -207,14 +204,14 @@ function gofasnfeio_output($vars) { if ($queue !== 'success') { $message = '
Erro ao salvar nota fiscal no DB: ' . $queue . '
'; header_remove(); - header('Location: ' . $gnfewhmcsadminurl . 'addonmodules.php?module=gofasnfeio&gnfe_message=' . base64_encode(urlencode($message))); + header('Location: addonmodules.php?module=gofasnfeio&gnfe_message=' . base64_encode(urlencode($message))); exit; } if ($queue === 'success') { $message = '
Nota fiscal enviada para processamento
'; header_remove(); - header('Location: ' . $gnfewhmcsadminurl . 'addonmodules.php?module=gofasnfeio&gnfe_message=' . base64_encode(urlencode($message))); + header('Location: addonmodules.php?module=gofasnfeio&gnfe_message=' . base64_encode(urlencode($message))); exit; } @@ -222,7 +219,7 @@ function gofasnfeio_output($vars) { if ($queue !== 'success') { $message = '
Erro ao salvar nota fiscal no DB: ' . 'nota fiscal já solicitada' . '
'; header_remove(); - header('Location: ' . $gnfewhmcsadminurl . 'addonmodules.php?module=gofasnfeio&gnfe_message=' . base64_encode(urlencode($message))); + header('Location: addonmodules.php?module=gofasnfeio&gnfe_message=' . base64_encode(urlencode($message))); exit; } @@ -234,14 +231,14 @@ function gofasnfeio_output($vars) { $gnfe_update_nfe = gnfe_update_nfe((object) ['id' => $_REQUEST['gnfe_cancel'], 'status' => 'Cancelled', 'servicesAmount' => $_REQUEST['services_amount'], 'environment' => $_REQUEST['environment'], 'flow_status' => $_REQUEST['flow_status']], $_REQUEST['user_id'], $_REQUEST['invoice_id'], 'n/a', $_REQUEST['created_at'], date('Y-m-d H:i:s')); $message = '
Nota fiscal cancelada com sucesso
'; header_remove(); - header('Location: ' . $gnfewhmcsadminurl . 'addonmodules.php?module=gofasnfeio&gnfe_message=' . base64_encode(urlencode($message))); + header('Location: addonmodules.php?module=gofasnfeio&gnfe_message=' . base64_encode(urlencode($message))); exit; } if ($delete_nfe->message) { $message = '
' . $delete_nfe->message . '
'; header_remove(); - header('Location: ' . $gnfewhmcsadminurl . 'addonmodules.php?module=gofasnfeio&gnfe_message=' . base64_encode(urlencode($message))); + header('Location: addonmodules.php?module=gofasnfeio&gnfe_message=' . base64_encode(urlencode($message))); exit; } @@ -251,14 +248,14 @@ function gofasnfeio_output($vars) { if (!$gnfe_email->message) { $message = '
Email Enviado com Sucesso
'; header_remove(); - header('Location: ' . $gnfewhmcsadminurl . 'addonmodules.php?module=gofasnfeio&gnfe_message=' . base64_encode(urlencode($message))); + header('Location: addonmodules.php?module=gofasnfeio&gnfe_message=' . base64_encode(urlencode($message))); exit; } if ($gnfe_email->message) { $message = '
' . $gnfe_email->message . '
'; header_remove(); - header('Location: ' . $gnfewhmcsadminurl . 'addonmodules.php?module=gofasnfeio&gnfe_message=' . base64_encode(urlencode($message))); + header('Location: addonmodules.php?module=gofasnfeio&gnfe_message=' . base64_encode(urlencode($message))); exit; }