From f4b28843fc69ec7a214ec1d82647455a870d6f1b Mon Sep 17 00:00:00 2001 From: souzadavi Date: Wed, 19 May 2021 18:04:07 -0300 Subject: [PATCH 01/30] =?UTF-8?q?ajuste=20da=20descri=C3=A7=C3=A3o=20do=20?= =?UTF-8?q?campo=20de=20informa=C3=A7=C3=A3o=20personalizada?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/addons/gofasnfeio/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/addons/gofasnfeio/config.php b/modules/addons/gofasnfeio/config.php index 2437654..208db5a 100644 --- a/modules/addons/gofasnfeio/config.php +++ b/modules/addons/gofasnfeio/config.php @@ -290,7 +290,7 @@ function gofasnfeio_config() { 'FriendlyName' => 'Adicione informações personalizada na nota fiscal:', 'Type' => 'text', 'Default' => '', - 'Description' => 'Preencher essa opção desativa a opção anterior.', + 'Description' => 'Esta informação será acrescida após detalhes da fatura.', ]]; $development_ = ['NFEioEnvironment' => [ From ffdd2dfe4866bc04ebaa83d3494b29c8c562a8fd Mon Sep 17 00:00:00 2001 From: souzadavi Date: Wed, 19 May 2021 18:08:12 -0300 Subject: [PATCH 02/30] ajuste texto da RPS. --- modules/addons/gofasnfeio/config.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/addons/gofasnfeio/config.php b/modules/addons/gofasnfeio/config.php index 208db5a..c5ea924 100644 --- a/modules/addons/gofasnfeio/config.php +++ b/modules/addons/gofasnfeio/config.php @@ -212,9 +212,8 @@ function gofasnfeio_config() { $rps_number_camp = ['rps_number' => [ 'FriendlyName' => 'Número do RPS', 'Type' => 'text', - // 'Default' => $rps_number, 'Disabled' => 'true', - 'Description' => 'Para alterar o RPS acessa a nfe.io AQUI.', + 'Description' => 'RPS atualizada de acordo com última nota fiscal emitida, clique no botão salvar alterações para atualizar automaticamente.', ]]; $issue_note = ['issue_note' => [ From dbcb152617e13cb7bddbda1b84276461a15616fb Mon Sep 17 00:00:00 2001 From: souzadavi Date: Wed, 19 May 2021 18:10:22 -0300 Subject: [PATCH 03/30] ajuste gramatical de texto --- modules/addons/gofasnfeio/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/addons/gofasnfeio/config.php b/modules/addons/gofasnfeio/config.php index c5ea924..c4bc0f7 100644 --- a/modules/addons/gofasnfeio/config.php +++ b/modules/addons/gofasnfeio/config.php @@ -286,7 +286,7 @@ function gofasnfeio_config() { ]]; $desc_custom = ['descCustom' => [ - 'FriendlyName' => 'Adicione informações personalizada na nota fiscal:', + 'FriendlyName' => 'Adicione uma informação personalizada na nota fiscal:', 'Type' => 'text', 'Default' => '', 'Description' => 'Esta informação será acrescida após detalhes da fatura.', From bb8980dce6f1178f33c2b9f0df146512e3d63c72 Mon Sep 17 00:00:00 2001 From: souzadavi Date: Mon, 31 May 2021 15:59:01 -0300 Subject: [PATCH 04/30] ajuste nfe.io --- README.md | 2 +- .../addons/gofasnfeio/addonPage/outputproduct.php | 2 +- .../gofasnfeio/addonPage/outputsystemlegacy.php | 2 +- modules/addons/gofasnfeio/functions.php | 14 ++++++++++++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e084f16..6e8089d 100644 --- a/README.md +++ b/README.md @@ -96,7 +96,7 @@ Dentro do admin do WHMCS é possível gerenciar a nota fiscal manualmente. Os produtos podem ter configurações de código de serviço individuais: -Em Addons>NFE.oi>código dos Produtos é possivel configurar um código de serviço para cada produto/serviço cadastrado. +Em Addons>NFE.io>código dos Produtos é possivel configurar um código de serviço para cada produto/serviço cadastrado. **_o código individual vai ter prioridade sobre o definido nas configurações do módulo._** diff --git a/modules/addons/gofasnfeio/addonPage/outputproduct.php b/modules/addons/gofasnfeio/addonPage/outputproduct.php index 7a79e3b..959dad6 100644 --- a/modules/addons/gofasnfeio/addonPage/outputproduct.php +++ b/modules/addons/gofasnfeio/addonPage/outputproduct.php @@ -61,7 +61,7 @@ } echo ' - NFE.oi + NFE.io Sistema legado
diff --git a/modules/addons/gofasnfeio/addonPage/outputsystemlegacy.php b/modules/addons/gofasnfeio/addonPage/outputsystemlegacy.php index b4512ea..6520eb6 100644 --- a/modules/addons/gofasnfeio/addonPage/outputsystemlegacy.php +++ b/modules/addons/gofasnfeio/addonPage/outputsystemlegacy.php @@ -10,7 +10,7 @@ ?>
  • Você está executando a versão mais recente do módulo.

    '; } else { $available_update_message = '

    Nova versão disponível no Github

    '; } + // Verificação da versão do módulo. /// REMOVER VERIFICAÇÃO APÓS VERSÃO 2.0 $verificarEmail = Capsule::table('tbladdonmodules')->where('module', '=', 'gofasnfeio')->where('setting', '=', 'gnfe_email_nfe_config')->count(); @@ -158,31 +238,25 @@ function gofasnfeio_config() { set_code_service_camp_gofasnfeio(); set_custom_field_ini_date(); } - $gnfe_get_nfes = gnfe_get_nfes(); - $params = gnfe_config(); - + $intro = ['intro' => [ 'FriendlyName' => '', 'Description' => '

    Módulo Nota Fiscal NFE.io para WHMCS v' . $module_version . '

    ' . $available_update_message . '', ]]; - if ((!$params['rps_number'] || $params['rps_number'] == 'zero') && $gnfe_get_nfes['rpsNumber']) { - $rps_number = $gnfe_get_nfes['rpsNumber']; - } elseif (($params['rps_number'] == 'zero' && !$gnfe_get_nfes['rpsNumber']) || (!$params['rps_number'] && !$gnfe_get_nfes['rpsNumber'])) { - $rps_number = 0; - } + // $gnfe_get_nfes = gnfe_get_nfes(); - //define o RPS number - $rps_number = $gnfe_get_nfes['rpsNumber']; + // Define o RPS number + // $rps_number = $gnfe_get_nfes['rpsNumber']; - if (Capsule::table('tbladdonmodules')->where('setting','=','rps_number')->count() == 0 && $rps_number != null) { - Capsule::table('tbladdonmodules')->insert(['module' => 'gofasnfeio', 'setting' => 'rps_number', 'value' => $rps_number]); - } elseif (Capsule::table('tbladdonmodules')->where('setting','=','rps_number')->count() == 0 && $rps_number == null) { - Capsule::table('tbladdonmodules')->insert(['module' => 'gofasnfeio', 'setting' => 'rps_number', 'value' => '']); - } else { - Capsule::table('tbladdonmodules')->where('setting','=','rps_number')->update(['value' => $rps_number]); - } + // if (Capsule::table('tbladdonmodules')->where('setting','=','rps_number')->count() == 0 && $rps_number != null) { + // Capsule::table('tbladdonmodules')->insert(['module' => 'gofasnfeio', 'setting' => 'rps_number', 'value' => $rps_number]); + // } elseif (Capsule::table('tbladdonmodules')->where('setting','=','rps_number')->count() == 0 && $rps_number == null) { + // Capsule::table('tbladdonmodules')->insert(['module' => 'gofasnfeio', 'setting' => 'rps_number', 'value' => '']); + // } else { + // Capsule::table('tbladdonmodules')->where('setting','=','rps_number')->update(['value' => $rps_number]); + // } $api_key = ['api_key' => [ 'FriendlyName' => 'API Key', @@ -216,6 +290,14 @@ function gofasnfeio_config() { 'Description' => 'RPS atualizada de acordo com última nota fiscal emitida, clique no botão salvar alterações para atualizar automaticamente.', ]]; + // $rps_number_change_nfe = ['rps_number_change_nfe' => [ + // 'FriendlyName' => 'Alterar a tratativa de RPS', + // 'Type' => 'radio', + // 'Options' => 'true', + // 'Default' => 'false', + // 'Description' => 'Ao selecionar esta opção, a tratativa da RPS será realizada pela NFe.io em defintiivo.' + // ]]; + $issue_note = ['issue_note' => [ 'FriendlyName' => 'Quando emitir NFE', 'Type' => 'radio', @@ -305,6 +387,7 @@ function gofasnfeio_config() { ]]; $fields = array_merge($intro, $api_key, $company_id, $service_code, $rps_serial_number, $rps_number_camp, $issue_note, $issue_note_after, $gnfe_email_nfe_config,$development_, $cancel_invoice_cancel_nfe, $debug, $insc_municipal,$cpf,$cnpj, $tax, $invoiceDetails,$desc_custom, $footer); + // $fields = array_merge($intro, $api_key, $company_id, $service_code, $rps_serial_number, $rps_number_camp, $rps_number_change_nfe, $issue_note, $issue_note_after, $gnfe_email_nfe_config,$development_, $cancel_invoice_cancel_nfe, $debug, $insc_municipal,$cpf,$cnpj, $tax, $invoiceDetails,$desc_custom, $footer); $configarray = [ 'name' => 'NFE.io', 'description' => 'Módulo Nota Fiscal NFE.io para WHMCS', diff --git a/modules/addons/gofasnfeio/functions.php b/modules/addons/gofasnfeio/functions.php index cfee4f7..960883b 100644 --- a/modules/addons/gofasnfeio/functions.php +++ b/modules/addons/gofasnfeio/functions.php @@ -5,7 +5,9 @@ } use WHMCS\Database\Capsule; -// Get config +/** + * Pega os dados da tabela tbladdonmodules do banco de dados da WHMCS. + */ if (!function_exists('gnfe_config')) { function gnfe_config($set = false) { $setting = []; @@ -332,6 +334,125 @@ function gnfe_get_nfe($nf) { } } +/** + * Retorna os dados necessários na função gnfe_put_rps(). + * + * @return array + */ +if (!function_exists('gnfe_get_company_info')) { + function gnfe_get_company_info() { + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, 'https://api.nfe.io/v1/companies/' . gnfe_config('company_id')); + curl_setopt($curl, CURLOPT_HTTPHEADER, ['Content-Type: application/json', 'Accept: application/json', 'Authorization: ' . gnfe_config('api_key')]); + curl_setopt($curl, CURLOPT_TIMEOUT, 30); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + + $response = json_decode(curl_exec($curl), true); + $response = $response['companies']; + $httpCode = curl_getinfo($curl, CURLINFO_HTTP_CODE); + + curl_close($curl); + + if ($httpCode === 200) { + return array( + 'name' => $response['name'], + 'federalTaxNumber' => $response['federalTaxNumber'], + 'address' => $response['address'], + 'rpsNumber' => $response['rpsNumber'] + ); + } else { + return array( + 'error' => true, + 'response' => + 'Erro: ' . $httpCode . '|' + . ' Resposta: ' . $response . '|' + . ' Consulte: https://nfe.io/docs/desenvolvedores/rest-api/nota-fiscal-de-servico-v1/#/Companies/Companies_Get' + ); + } + } +} + +/** + * Responsável por enviar o último RPS para a NFe. + * Os parâmetros vem da função gnfe_get_company_info(). + * + * @param int $rpsNumber + * + * @return void + */ +if (!function_exists('gnfe_put_rps')) { + function gnfe_put_rps($company, $rpsNumber) { + $requestBody = [ + "name"=>$company['name'], + "federalTaxNumber"=> $company['federalTaxNumber'], + "address"=> [ + "country"=> $company['address']['country'], + "postalCode"=> $company['address']['postalCode'], + "street"=> $company['address']['street'], + "number"=> $company['address']['number'], + "additionalInformation"=> $company['address']['additionalInformation'], + "district"=> $company['address']['district'], + "city"=> [ + "code"=> $company['address']['city']['code'], + "name"=> $company['address']['city']['name'] + ], + "state"=> $company['address']['state'] + ], + "rpsNumber"=> $rpsNumber + ]; + $requestBody = json_encode($requestBody); + + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, 'https://api.nfe.io/v1/companies/' . gnfe_config('company_id')); + curl_setopt($curl, CURLOPT_HTTPHEADER, ['Content-Type: application/json', 'Accept: application/json', 'Authorization: ' . gnfe_config('api_key')]); + curl_setopt($curl, CURLOPT_TIMEOUT, 30); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); + curl_setopt($curl, CURLOPT_CUSTOMREQUEST, 'PUT'); + curl_setopt($curl, CURLOPT_POSTFIELDS, $requestBody); + $response = json_decode(curl_exec($curl), true); + $httpCode = curl_getinfo($curl, CURLINFO_HTTP_CODE); + curl_close($curl); + + if ($httpCode !== 200) { + $response = + 'Erro: ' . $httpCode . '|' . + ' Resposta: ' . $response . '|' . + ' Consulte: https://nfe.io/docs/desenvolvedores/rest-api/nota-fiscal-de-servico-v1/#/Companies/Companies_Put'; + logModuleCall('gofas_nfeio', 'gnfe_put_rps', $requestBody, $response, '', ''); + } else { + Capsule::table('tbladdonmodules')->where('module', 'gofasnfeio')->where('setting', 'rps_number')->update(['value' => '-1']); + echo 'RPS ATUALIZADO.'; + } + } +} + +/** + * Pega o RPS da última nota fiscal emitida. + * Se o RPS da última nota fiscal emitida for igual a 0, + * quer dizer que a nota está aguardando algum processo interno da NFe, + * portanto a função retornará o RPS da penúltima nota fiscal emitida e soma mais um. + */ +if (!function_exists('gnfe_get_rps')) { + function gnfe_get_rps() { + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, 'https://api.nfe.io/v1/companies/' . gnfe_config('company_id') . '/serviceinvoices?pageCount=1&pageIndex=1'); + curl_setopt($curl, CURLOPT_HTTPHEADER, ['Content-Type: text/json', 'Accept: application/json', 'Authorization: ' . gnfe_config('api_key')]); + curl_setopt($curl, CURLOPT_TIMEOUT, 30); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + $invoices = curl_exec($curl); + $invoices = json_decode($invoices, true)['serviceInvoices']; + curl_close($curl); + + $lastInvoiceRPS = $invoices[0]['rpsNumber']; + + if ($lastInvoiceRPS === 0) { + $lastInvoiceRPS = $invoices[1]['rpsNumber'] + 1; + } + + return $lastInvoiceRPS; + } +} + if (!function_exists('gnfe_test_connection')) { function gnfe_test_connection() { $curl = curl_init(); @@ -348,7 +469,9 @@ function gnfe_test_connection() { return $info; } } - +/** + * Pega o JSON da última nota fiscal emitida do banco de dados da NFe. + */ if (!function_exists('gnfe_get_nfes')) { function gnfe_get_nfes() { $curl = curl_init(); @@ -361,19 +484,6 @@ function gnfe_get_nfes() { return json_decode($response, true)['serviceInvoices']['0']; } } -if (!function_exists('gnfe_get_rps')) { - function gnfe_get_rps() { - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://api.nfe.io/v1/companies/' . gnfe_config('company_id') ); - curl_setopt($curl, CURLOPT_HTTPHEADER, ['Content-Type: text/json', 'Accept: application/json', 'Authorization: ' . gnfe_config('api_key')]); - curl_setopt($curl, CURLOPT_TIMEOUT, 30); - curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); - $response = curl_exec($curl); - curl_close($curl); - //print_r($response); - return json_decode($response, true)['rpsNumber']; - } -} if (!function_exists('gnfe_get_invoice_nfes')) { function gnfe_get_invoice_nfes($invoice_id) { @@ -569,6 +679,7 @@ function gnfe_update_nfe($nfe, $user_id, $invoice_id, $pdf, $created_at, $update } if (!function_exists('gnfe_update_rps')) { function gnfe_update_rps($rps_serial_number, $rps_number) { + // Para que serve este array? $setting = []; foreach (Capsule::table('tbladdonmodules')->where('module', '=', 'gofasnfeio')->get(['setting', 'value']) as $settings) { $setting[$settings->setting] = $settings->value; @@ -701,20 +812,6 @@ function gnfe_get_company() { } } -if (!function_exists('gnfe_get_company')) { - function gnfe_get_company() { - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://api.nfe.io/v1/companies/' . gnfe_config('company_id')); - curl_setopt($curl, CURLOPT_HTTPHEADER, ['Content-Type: text/json', 'Accept: application/json', 'Authorization: ' . gnfe_config('api_key')]); - curl_setopt($curl, CURLOPT_TIMEOUT, 30); - curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); - $response = curl_exec($curl); - curl_close($curl); - - return json_decode($response, true); - } -} - if (!function_exists('gnfe_customer_service_code')) { function gnfe_customer_service_code($item_id) { $customfields = []; From cdca86e8f0d518332dbea0b5211151f0333c0969 Mon Sep 17 00:00:00 2001 From: = <=> Date: Tue, 15 Jun 2021 13:02:20 -0300 Subject: [PATCH 06/30] =?UTF-8?q?Removido=20campo=20rps=5Fnumber=20do=20JS?= =?UTF-8?q?ON=20da=20fun=C3=A7=C3=A3o=20createRequestFromAPI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/addons/gofasnfeio/sendNFE.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/addons/gofasnfeio/sendNFE.php b/modules/addons/gofasnfeio/sendNFE.php index f62c9a7..3767079 100644 --- a/modules/addons/gofasnfeio/sendNFE.php +++ b/modules/addons/gofasnfeio/sendNFE.php @@ -149,8 +149,7 @@ function createRequestFromAPI($service_code,$desc,$services_amount,$document,$in 'state' => $state, ], ], - 'rpsSerialNumber' => $rps_serial_number, - 'rpsNumber' => (int) $rps_number + 1, + 'rpsSerialNumber' => $rps_serial_number ]; strlen($insc_municipal) == 0 ? '' : $postfields['borrower']['municipalTaxNumber'] = $insc_municipal; return $postfields; From b1815ad7349182886f345ef80eba92166f099eb9 Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 16 Jun 2021 09:12:55 -0300 Subject: [PATCH 07/30] =?UTF-8?q?Fun=C3=A7=C3=A3o=20antiga=20que=20atualiz?= =?UTF-8?q?a=20a=20RPS=20ap=C3=B3s=20emiss=C3=A3o=20de=20NFe=20desabilitad?= =?UTF-8?q?a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/addons/gofasnfeio/sendNFE.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/addons/gofasnfeio/sendNFE.php b/modules/addons/gofasnfeio/sendNFE.php index 3767079..2b9e69a 100644 --- a/modules/addons/gofasnfeio/sendNFE.php +++ b/modules/addons/gofasnfeio/sendNFE.php @@ -112,10 +112,10 @@ function emitNFE($invoices,$nfeio) { if (!$nfe->message) { logModuleCall('gofas_nfeio', 'sendNFE', $postfields, $nfe, 'OK', ''); $gnfe_update_nfe = gnfe_update_nfe($nfe, $invoices->userid, $invoices->id, 'n/a', date('Y-m-d H:i:s'), date('Y-m-d H:i:s'), $waiting->id); + if ($gnfe_update_nfe && $gnfe_update_nfe !== 'success') { logModuleCall('gofas_nfeio', 'sendNFE - gnfe_update_nfe', [$nfe, $invoices->userid, $invoices->id, 'n/a', date('Y-m-d H:i:s'), date('Y-m-d H:i:s'), $waiting->id], $gnfe_update_nfe, 'ERROR', ''); } - $update_rps = gnfe_update_rps($rps_serial_number_, $rps_number); if ($update_rps && $update_rps !== 'success') { logModuleCall('gofas_nfeio', 'sendNFE - update_rps', [$rps_serial_number_, $rps_number], $update_rps, 'ERROR', ''); From 881e46a892b070628f6c1a63a5273abd39d5c5a1 Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 16 Jun 2021 12:03:57 -0300 Subject: [PATCH 08/30] =?UTF-8?q?Implementa=C3=A7=C3=A3o=20da=20migra?= =?UTF-8?q?=C3=A7=C3=A3o=20do=20tratamento=20do=20RPS=20atualizada?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/addons/gofasnfeio/config.php | 119 ++++++++++-------------- modules/addons/gofasnfeio/functions.php | 14 ++- 2 files changed, 58 insertions(+), 75 deletions(-) diff --git a/modules/addons/gofasnfeio/config.php b/modules/addons/gofasnfeio/config.php index bf8ea3d..50fbe15 100644 --- a/modules/addons/gofasnfeio/config.php +++ b/modules/addons/gofasnfeio/config.php @@ -54,6 +54,32 @@ function gofasnfeio_config() { dowload_doc_log(); } + // -------------------------------------------------------------------------------------------- + + // Versão do módulo instalado. + $module_version = '1.4.0'; + $module_version_int = (int) preg_replace('/[^0-9]/', '', $module_version); + + // Versão do módulo que consta no banco de dados. + // Ou seja, se module_version e previous_version não + // forem iguais, quer dizer que houve uma atualização do módulo. + $previous_version = Capsule::table('tbladdonmodules')->where('module','=','gofasnfeio')->where('setting','=','module_version')->get(['value'])[0]->value; + $previous_version_int = (int) preg_replace('/[^0-9]/', '', $previous_version); + + + + // -------------------------------------------------------------------------------------------- + + // Verifica se há atualizações disponíveis. + $available_update_ = gnfe_verify_module_updates(); + $available_version_int = (int) preg_replace('/[^0-9]/', '', str_replace('v','',$available_update_)); + + if ($available_version_int <= $module_version_int) { // $available_version_int <= $module_version_int + $available_update_message = '

    Você está executando a versão mais recente do módulo.

    '; + } else { + $available_update_message = '

    Nova versão disponível no Github

    '; + } + // -------------------------------------------------------------------------------------------- // 1º Verificar se o RPS no WHMCS tá diferente de -1 // Verificar se a row do campo rps_number_change_nfe está no banco. @@ -66,16 +92,28 @@ function gofasnfeio_config() { // 4º Verificar se o RPS na NFe tá maior ou igual ao WHMCS // Se tiver alterar o campo do WHMCS para -1 - $whmcsRPS = gnfe_config()['rps_number']; + if ($module_version_int < 150) { + $gnfe_get_nfes = gnfe_get_nfes(); + $rps_number = $gnfe_get_nfes['rpsNumber']; - if ($whmcsRPS != -1) { - $companyData = gnfe_get_company_info(); + // Verifica se a configuração rps_number existe no banco de dados. + if (Capsule::table('tbladdonmodules')->where('setting','=','rps_number')->count() == 0) { + echo 'RPS FALTANDO FOI INSERIDO NO DB'; + Capsule::table('tbladdonmodules')->insert(['module' => 'gofasnfeio', 'setting' => 'rps_number', 'value' => $rps_number]); + } - if (isset($companyData['error'])) { - logModuleCall('gofas_nfeio', 'gnfe_get_company_info', '', $companyData['response'], '', ''); - echo 'ERRO AO PEGAR OS DADOS DA EMPRESA'; - } else { - gnfe_put_rps($companyData, $whmcsRPS); + $whmcsRPS = gnfe_config()['rps_number']; + + if ($whmcsRPS != -1) { + $companyData = gnfe_get_company_info(); + + if (isset($companyData['error'])) { + logModuleCall('gofas_nfeio', 'gnfe_get_company_info', '', $companyData['response'], '', ''); + echo 'ERRO AO PEGAR OS DADOS DA EMPRESA'; + } else { + // Transfere a tratativa do RPS para a NFe. + gnfe_put_rps($companyData, $whmcsRPS); + } } } @@ -95,56 +133,8 @@ function gofasnfeio_config() { * } * } */ - - - // if (isset($companyData['error'])) { - // logModuleCall('gofas_nfeio', 'gnfe_get_company_info', '', $companyData['response'], '', ''); - // echo 'ERRO AO PEGAR OS DADOS DA EMPRESA'; - // } else { - // // gnfe_put_rps($companyData, $rps_number); // Atualiza a RPS. - // echo 'RPS ATUALIZADO.'; - // } - - // -------------------------------------------------------------------------------------------- - - // Versão do módulo instalado. - $module_version = '1.3.3'; - $module_version_int = (int) preg_replace('/[^0-9]/', '', $module_version); - - // Versão do módulo que consta no banco de dados. - // Ou seja, se module_version e previous_version não - // forem iguais, quer dizer que houve uma atualização do módulo. - $previous_version = Capsule::table('tbladdonmodules')->where('module','=','gofasnfeio')->where('setting','=','version')->get(['value'])[0]->value; - $previous_version_int = (int) preg_replace('/[^0-9]/', '', $previous_version); - - $previousMajorMinorVersion = substr($previous_version_int, 0, 2); - $moduleMajorMinorVersion = substr($module_version_int, 0, 2); - - // A versão do módulo precisa ser inserida no tabela do banco de dados. - if (!$previous_version) { - Capsule::table('tbladdonmodules')->insert(['module' => 'gofasnfeio', 'setting' => 'version', 'value' => $module_version]); - } - - if ($moduleMajorMinorVersion === $previousMajorMinorVersion + 1) { - // Se a versão do módulo for igual a versão do módulo no banco de dados mais 1, então a atualização é permitida. - } else { - // Se não, desativar o módulo. - // https://developers.whmcs.com/api-reference/deactivatemodule/ - } - // -------------------------------------------------------------------------------------------- - // Verifica se há atualizações disponíveis. - $available_update_ = gnfe_verify_module_updates(); - $available_version_int = (int) preg_replace('/[^0-9]/', '', str_replace('v','',$available_update_)); - - if ($module_version_int >= $available_version_int) { // $available_version_int <= $module_version_int - $available_update_message = '

    Você está executando a versão mais recente do módulo.

    '; - } else { - $available_update_message = '

    Nova versão disponível no Github

    '; - } - // Verificação da versão do módulo. - /// REMOVER VERIFICAÇÃO APÓS VERSÃO 2.0 $verificarEmail = Capsule::table('tbladdonmodules')->where('module', '=', 'gofasnfeio')->where('setting', '=', 'gnfe_email_nfe_config')->count(); if (empty($verificarEmail)) { @@ -233,7 +223,7 @@ function gofasnfeio_config() { //create tables gnfe_verifyInstall(); create_table_product_code(); - // + if (version_compare($previous_version,'1.2.7','<')) { set_code_service_camp_gofasnfeio(); set_custom_field_ini_date(); @@ -242,22 +232,9 @@ function gofasnfeio_config() { $intro = ['intro' => [ 'FriendlyName' => '', 'Description' => '

    Módulo Nota Fiscal NFE.io para WHMCS v' . $module_version . '

    - ' . $available_update_message . '', + ' . $available_update_message . $update_denied, ]]; - // $gnfe_get_nfes = gnfe_get_nfes(); - - // Define o RPS number - // $rps_number = $gnfe_get_nfes['rpsNumber']; - - // if (Capsule::table('tbladdonmodules')->where('setting','=','rps_number')->count() == 0 && $rps_number != null) { - // Capsule::table('tbladdonmodules')->insert(['module' => 'gofasnfeio', 'setting' => 'rps_number', 'value' => $rps_number]); - // } elseif (Capsule::table('tbladdonmodules')->where('setting','=','rps_number')->count() == 0 && $rps_number == null) { - // Capsule::table('tbladdonmodules')->insert(['module' => 'gofasnfeio', 'setting' => 'rps_number', 'value' => '']); - // } else { - // Capsule::table('tbladdonmodules')->where('setting','=','rps_number')->update(['value' => $rps_number]); - // } - $api_key = ['api_key' => [ 'FriendlyName' => 'API Key', 'Type' => 'text', diff --git a/modules/addons/gofasnfeio/functions.php b/modules/addons/gofasnfeio/functions.php index 960883b..a0db44a 100644 --- a/modules/addons/gofasnfeio/functions.php +++ b/modules/addons/gofasnfeio/functions.php @@ -398,7 +398,7 @@ function gnfe_put_rps($company, $rpsNumber) { ], "state"=> $company['address']['state'] ], - "rpsNumber"=> $rpsNumber + "rpsNumber"=> $rpsNumber + 1 ]; $requestBody = json_encode($requestBody); @@ -415,13 +415,19 @@ function gnfe_put_rps($company, $rpsNumber) { if ($httpCode !== 200) { $response = - 'Erro: ' . $httpCode . '|' . + ' Http code: ' . $httpCode . '|' . ' Resposta: ' . $response . '|' . ' Consulte: https://nfe.io/docs/desenvolvedores/rest-api/nota-fiscal-de-servico-v1/#/Companies/Companies_Put'; logModuleCall('gofas_nfeio', 'gnfe_put_rps', $requestBody, $response, '', ''); } else { - Capsule::table('tbladdonmodules')->where('module', 'gofasnfeio')->where('setting', 'rps_number')->update(['value' => '-1']); - echo 'RPS ATUALIZADO.'; + $nfe_rps = gnfe_get_nfes()['rpsNumber']; + $whmcs_rps = Capsule::table('tbladdonmodules')->where('module','=','gofasnfeio')->where('setting','=','module_version')->get(['value'])[0]->value; + + if ($nfe_rps >= $whmcs_rps) { + Capsule::table('tbladdonmodules')->where('module', 'gofasnfeio')->where('setting', 'rps_number')->update(['value' => '-1']); + } else { + logModuleCall('gofas_nfeio', 'gnfe_put_rps', $requestBody, 'Erro ao tentar passar tratativa de RPS para NFe. ' . $response, '', ''); + } } } } From ff6614652a987d5b31107ee9e49fd73c54957e58 Mon Sep 17 00:00:00 2001 From: = <=> Date: Thu, 17 Jun 2021 12:30:21 -0300 Subject: [PATCH 09/30] =?UTF-8?q?Implementa=C3=A7=C3=B5es=20revisadas=20e?= =?UTF-8?q?=20testadas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/addons/gofasnfeio/config.php | 110 ++++++++++++------------ modules/addons/gofasnfeio/functions.php | 40 ++------- modules/addons/gofasnfeio/sendNFE.php | 4 +- 3 files changed, 65 insertions(+), 89 deletions(-) diff --git a/modules/addons/gofasnfeio/config.php b/modules/addons/gofasnfeio/config.php index 50fbe15..8429096 100644 --- a/modules/addons/gofasnfeio/config.php +++ b/modules/addons/gofasnfeio/config.php @@ -56,17 +56,46 @@ function gofasnfeio_config() { // -------------------------------------------------------------------------------------------- - // Versão do módulo instalado. + // Versão do módulo deste arquivo. $module_version = '1.4.0'; $module_version_int = (int) preg_replace('/[^0-9]/', '', $module_version); // Versão do módulo que consta no banco de dados. - // Ou seja, se module_version e previous_version não - // forem iguais, quer dizer que houve uma atualização do módulo. - $previous_version = Capsule::table('tbladdonmodules')->where('module','=','gofasnfeio')->where('setting','=','module_version')->get(['value'])[0]->value; + $previous_version = gnfe_config('module_version'); + + // A versão do módulo precisa ser inserida no tabela do banco de dados, porque ela não existia no banco de dados até agora. + if (!$previous_version) { + Capsule::table('tbladdonmodules')->insert(['module' => 'gofasnfeio', 'setting' => 'module_version', 'value' => $module_version]); + $previous_version = $module_version; + } $previous_version_int = (int) preg_replace('/[^0-9]/', '', $previous_version); - + $update_denied = ''; + // Se module_version e previous_version não forem iguais, quer dizer que houve uma atualização do módulo. + if ($module_version_int !== $previous_version_int) { + // Pega apenas as versões MAJOR.MINOR do módulo instalado e da versão do módulo no banco de dados. + $previous_major_minor_version = intval(substr($previous_version_int, 0, 2)); + $module_major_minor_version = intval(substr($module_version_int, 0, 2)); + + // Atende a diretriz "Exclusivamente a partir da versão 1.5.0 não será permitido atualização do modulo por versões inferiores a 1.4.0.". + // Se a versão do módulo for igual a versão do módulo no + // banco de dados mais 1, então a atualização é permitida, ou se a versão do módulo no banco for maior igual a 15. + if ($module_major_minor_version === $previous_major_minor_version + 1 || $previous_major_minor_version >= 15) { + Capsule::table('tbladdonmodules')->where('module', 'gofasnfeio')->where('setting', 'module_version')->update(['value' => $module_version]); + } else { + $update_denied = << + + Você está tentando instalar a versão $module_version e a versão anteriormente instalada foi a $previous_version +

    +

    + + Entretanto, só é permitida a atualização do módulo para frente e de uma em uma versão. Ex.: 1.3.0 para 1.4.0, 1.4.3 para 1.5.0 +

    + EOT; + $module_version = $previous_version; + } + } // -------------------------------------------------------------------------------------------- @@ -81,58 +110,32 @@ function gofasnfeio_config() { } // -------------------------------------------------------------------------------------------- - // 1º Verificar se o RPS no WHMCS tá diferente de -1 - // Verificar se a row do campo rps_number_change_nfe está no banco. - - // 2º Verificar se o campo de configuração tá igual a true - // Se tiver, atualizar a RPS de acordo com o número do WHMCS - - // 3º Verificar se foi concluído com sucesso - // 4º Verificar se o RPS na NFe tá maior ou igual ao WHMCS - // Se tiver alterar o campo do WHMCS para -1 - - if ($module_version_int < 150) { - $gnfe_get_nfes = gnfe_get_nfes(); - $rps_number = $gnfe_get_nfes['rpsNumber']; + // Atende à diretriz "Na versão superior a 1.4.0, ou seja na 1.5.0 este recurso de migração deve esta desabilitado." + // e a "Exclusivamente na versão 1.4.0 será realizada a migração da RPS do módulo para a NFE." + // Verifica se a versão dos arquivos do módulo corresponde a versão do módulo no banco de dados. + if ($module_version_int >= 140 && $module_version_int < 150 && $previous_version_int >= 140 && $previous_version_int < 150) { + $nfe_rps = gnfe_get_nfes()['rpsNumber']; // Verifica se a configuração rps_number existe no banco de dados. if (Capsule::table('tbladdonmodules')->where('setting','=','rps_number')->count() == 0) { - echo 'RPS FALTANDO FOI INSERIDO NO DB'; - Capsule::table('tbladdonmodules')->insert(['module' => 'gofasnfeio', 'setting' => 'rps_number', 'value' => $rps_number]); + Capsule::table('tbladdonmodules')->insert(['module' => 'gofasnfeio', 'setting' => 'rps_number', 'value' => $nfe_rps]); } - $whmcsRPS = gnfe_config()['rps_number']; + $whmcs_rps = gnfe_config()['rps_number']; - if ($whmcsRPS != -1) { - $companyData = gnfe_get_company_info(); + if (is_numeric($whmcs_rps)) { + $company_data = gnfe_get_company_info(); - if (isset($companyData['error'])) { - logModuleCall('gofas_nfeio', 'gnfe_get_company_info', '', $companyData['response'], '', ''); - echo 'ERRO AO PEGAR OS DADOS DA EMPRESA'; + if (isset($company_data['error'])) { + logModuleCall('gofas_nfeio', 'gnfe_get_company_info', '', $company_data['error'], '', ''); } else { - // Transfere a tratativa do RPS para a NFe. - gnfe_put_rps($companyData, $whmcsRPS); + gnfe_put_rps($company_data, $whmcs_rps); // Transfere a tratativa do RPS para a NFe. } + } else { } } - /** - * Versão do Davi, com o campo rps_number_change_nfe nas configurações do módulo. - * $whmcsRPS = gnfe_config()['rps_number']; - * $rpsNumberChangeNfe = Capsule::table('tbladdonmodules')->where('module','=','gofasnfeio')->where('setting','=','rps_number_change_nfe')->get(['value'])[0]->value; - * if ($whmcsRPS !== -1 && $rpsNumberChangeNfe) { - * $companyData = gnfe_get_company_info(); - * if (isset($companyData['error'])) { - * logModuleCall('gofas_nfeio', 'gnfe_get_company_info', '', $companyData['response'], '', ''); - * echo 'ERRO AO PEGAR OS DADOS DA EMPRESA'; - * } else { - * gnfe_put_rps($companyData, $whmcsRPS); // Atualiza a RPS. - * Capsule::table('tbladdonmodules')->insert(['module' => 'gofasnfeio', 'setting' => 'rps_number', 'value' => -1]); - * echo 'RPS ATUALIZADO.'; - * } - * } - */ // -------------------------------------------------------------------------------------------- /// REMOVER VERIFICAÇÃO APÓS VERSÃO 2.0 @@ -260,21 +263,21 @@ function gofasnfeio_config() { 'Description' => 'Saiba mais', ]]; + $rps_number = gnfe_config()['rps_number']; + + if (is_numeric($rps_number)) { + $rps_number_camp_description = 'RPS atualizada de acordo com última nota fiscal emitida, clique no botão salvar alterações para atualizar automaticamente.'; + } else { + $rps_number_camp_description = 'Consultar RPS'; + } + $rps_number_camp = ['rps_number' => [ 'FriendlyName' => 'Número do RPS', 'Type' => 'text', 'Disabled' => 'true', - 'Description' => 'RPS atualizada de acordo com última nota fiscal emitida, clique no botão salvar alterações para atualizar automaticamente.', + 'Description' => $rps_number_camp_description ]]; - // $rps_number_change_nfe = ['rps_number_change_nfe' => [ - // 'FriendlyName' => 'Alterar a tratativa de RPS', - // 'Type' => 'radio', - // 'Options' => 'true', - // 'Default' => 'false', - // 'Description' => 'Ao selecionar esta opção, a tratativa da RPS será realizada pela NFe.io em defintiivo.' - // ]]; - $issue_note = ['issue_note' => [ 'FriendlyName' => 'Quando emitir NFE', 'Type' => 'radio', @@ -364,7 +367,6 @@ function gofasnfeio_config() { ]]; $fields = array_merge($intro, $api_key, $company_id, $service_code, $rps_serial_number, $rps_number_camp, $issue_note, $issue_note_after, $gnfe_email_nfe_config,$development_, $cancel_invoice_cancel_nfe, $debug, $insc_municipal,$cpf,$cnpj, $tax, $invoiceDetails,$desc_custom, $footer); - // $fields = array_merge($intro, $api_key, $company_id, $service_code, $rps_serial_number, $rps_number_camp, $rps_number_change_nfe, $issue_note, $issue_note_after, $gnfe_email_nfe_config,$development_, $cancel_invoice_cancel_nfe, $debug, $insc_municipal,$cpf,$cnpj, $tax, $invoiceDetails,$desc_custom, $footer); $configarray = [ 'name' => 'NFE.io', 'description' => 'Módulo Nota Fiscal NFE.io para WHMCS', diff --git a/modules/addons/gofasnfeio/functions.php b/modules/addons/gofasnfeio/functions.php index a0db44a..2da294b 100644 --- a/modules/addons/gofasnfeio/functions.php +++ b/modules/addons/gofasnfeio/functions.php @@ -362,8 +362,7 @@ function gnfe_get_company_info() { ); } else { return array( - 'error' => true, - 'response' => + 'error' => 'Erro: ' . $httpCode . '|' . ' Resposta: ' . $response . '|' . ' Consulte: https://nfe.io/docs/desenvolvedores/rest-api/nota-fiscal-de-servico-v1/#/Companies/Companies_Get' @@ -374,7 +373,6 @@ function gnfe_get_company_info() { /** * Responsável por enviar o último RPS para a NFe. - * Os parâmetros vem da função gnfe_get_company_info(). * * @param int $rpsNumber * @@ -420,11 +418,12 @@ function gnfe_put_rps($company, $rpsNumber) { ' Consulte: https://nfe.io/docs/desenvolvedores/rest-api/nota-fiscal-de-servico-v1/#/Companies/Companies_Put'; logModuleCall('gofas_nfeio', 'gnfe_put_rps', $requestBody, $response, '', ''); } else { - $nfe_rps = gnfe_get_nfes()['rpsNumber']; - $whmcs_rps = Capsule::table('tbladdonmodules')->where('module','=','gofasnfeio')->where('setting','=','module_version')->get(['value'])[0]->value; + $nfe_rps = intval(gnfe_get_nfes()['rpsNumber']); + $whmcs_rps = intval(gnfe_config('rps_number')); + // Verifica se o RPS na NFe é maior ou igual ao RPS no WHMCS para garantir que a ação foi efetivada. if ($nfe_rps >= $whmcs_rps) { - Capsule::table('tbladdonmodules')->where('module', 'gofasnfeio')->where('setting', 'rps_number')->update(['value' => '-1']); + Capsule::table('tbladdonmodules')->where('module', 'gofasnfeio')->where('setting', 'rps_number')->update(['value' => 'RPS administrado pela NFe.']); } else { logModuleCall('gofas_nfeio', 'gnfe_put_rps', $requestBody, 'Erro ao tentar passar tratativa de RPS para NFe. ' . $response, '', ''); } @@ -432,33 +431,6 @@ function gnfe_put_rps($company, $rpsNumber) { } } -/** - * Pega o RPS da última nota fiscal emitida. - * Se o RPS da última nota fiscal emitida for igual a 0, - * quer dizer que a nota está aguardando algum processo interno da NFe, - * portanto a função retornará o RPS da penúltima nota fiscal emitida e soma mais um. - */ -if (!function_exists('gnfe_get_rps')) { - function gnfe_get_rps() { - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, 'https://api.nfe.io/v1/companies/' . gnfe_config('company_id') . '/serviceinvoices?pageCount=1&pageIndex=1'); - curl_setopt($curl, CURLOPT_HTTPHEADER, ['Content-Type: text/json', 'Accept: application/json', 'Authorization: ' . gnfe_config('api_key')]); - curl_setopt($curl, CURLOPT_TIMEOUT, 30); - curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); - $invoices = curl_exec($curl); - $invoices = json_decode($invoices, true)['serviceInvoices']; - curl_close($curl); - - $lastInvoiceRPS = $invoices[0]['rpsNumber']; - - if ($lastInvoiceRPS === 0) { - $lastInvoiceRPS = $invoices[1]['rpsNumber'] + 1; - } - - return $lastInvoiceRPS; - } -} - if (!function_exists('gnfe_test_connection')) { function gnfe_test_connection() { $curl = curl_init(); @@ -477,6 +449,8 @@ function gnfe_test_connection() { } /** * Pega o JSON da última nota fiscal emitida do banco de dados da NFe. + * + * @return array; */ if (!function_exists('gnfe_get_nfes')) { function gnfe_get_nfes() { diff --git a/modules/addons/gofasnfeio/sendNFE.php b/modules/addons/gofasnfeio/sendNFE.php index 2b9e69a..b5775f7 100644 --- a/modules/addons/gofasnfeio/sendNFE.php +++ b/modules/addons/gofasnfeio/sendNFE.php @@ -101,7 +101,7 @@ function emitNFE($invoices,$nfeio) { //cria o array do request $postfields = createRequestFromAPI($service_code,$desc,$nfeio->services_amount,$customer['document'],$customer['insc_municipal'], $name,$client_email,$client['countrycode'],$client['postcode'],$street,$number,$client['address2'], - $code,$client['city'],$client['state'],$rps_serial_number,$rps_number); + $code,$client['city'],$client['state'],$rps_serial_number); //envia o requisição $nfe = gnfe_issue_nfe($postfields); @@ -125,7 +125,7 @@ function emitNFE($invoices,$nfeio) { } function createRequestFromAPI($service_code,$desc,$services_amount,$document,$insc_municipal = '', -$name,$email,$countrycode,$postcode,$street,$number,$address2,$code,$city,$state,$rps_serial_number,$rps_number) { +$name,$email,$countrycode,$postcode,$street,$number,$address2,$code,$city,$state,$rps_serial_number) { $postfields = [ 'cityServiceCode' => $service_code, 'description' => $desc, From de58c8fe3fd1dcb70c7a556e2f2a0e240c8bae04 Mon Sep 17 00:00:00 2001 From: = <=> Date: Fri, 18 Jun 2021 10:22:12 -0300 Subject: [PATCH 10/30] =?UTF-8?q?Corre=C3=A7=C3=B5es=20nas=20implementa?= =?UTF-8?q?=C3=A7=C3=B5es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/addons/gofasnfeio/config.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/addons/gofasnfeio/config.php b/modules/addons/gofasnfeio/config.php index 8429096..d1021a5 100644 --- a/modules/addons/gofasnfeio/config.php +++ b/modules/addons/gofasnfeio/config.php @@ -79,8 +79,8 @@ function gofasnfeio_config() { // Atende a diretriz "Exclusivamente a partir da versão 1.5.0 não será permitido atualização do modulo por versões inferiores a 1.4.0.". // Se a versão do módulo for igual a versão do módulo no - // banco de dados mais 1, então a atualização é permitida, ou se a versão do módulo no banco for maior igual a 15. - if ($module_major_minor_version === $previous_major_minor_version + 1 || $previous_major_minor_version >= 15) { + // banco de dados mais 1, então a atualização é permitida. + if ($module_major_minor_version === $previous_major_minor_version + 1) { Capsule::table('tbladdonmodules')->where('module', 'gofasnfeio')->where('setting', 'module_version')->update(['value' => $module_version]); } else { $update_denied = << Date: Fri, 18 Jun 2021 11:23:42 -0300 Subject: [PATCH 11/30] README changelog atualizado --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 6e8089d..465b3a3 100644 --- a/README.md +++ b/README.md @@ -123,6 +123,10 @@ Para inserir uma opção personalizada de quando é emitido a NFE para cada clie #### IMPORTANTE: Ao atualizar, após substituir os arquivos pelos mais recentes, acesse as configurações do módulo no menu `Opções > Módulos Addon > Gofas NFE.io` do painel administrativo do WHMCS e clique em "Salvar Alterações". Isso garente que os novos parâmetros serão gravados corretamente no banco de dados. +### v1.4.0 + +- Migração da tratativa do RPS para a NFe realizada + ### v1.3.3 - Ajuste na descrição da nota fiscal. From dd3a321b3315d501c728addc6f8f70f877d24ebc Mon Sep 17 00:00:00 2001 From: = <=> Date: Mon, 21 Jun 2021 10:55:56 -0300 Subject: [PATCH 12/30] =?UTF-8?q?Adicionado:=20op=C3=A7=C3=A3o=20de=20envi?= =?UTF-8?q?ar=20link=20da=20fatura=20na=20nota=20fiscal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/addons/gofasnfeio/config.php | 50 +++++++++++++++------------ modules/addons/gofasnfeio/sendNFE.php | 16 +++++++-- 2 files changed, 42 insertions(+), 24 deletions(-) diff --git a/modules/addons/gofasnfeio/config.php b/modules/addons/gofasnfeio/config.php index d1021a5..07834d6 100644 --- a/modules/addons/gofasnfeio/config.php +++ b/modules/addons/gofasnfeio/config.php @@ -9,27 +9,26 @@ require_once __DIR__ . '/update.php'; if (!function_exists('gofasnfeio_config')) { - if (!function_exists('gnfe_customfields_dropdow')) { - function gnfe_customfields_dropdow() { - $customfields_array = []; - foreach (Capsule::table('tblcustomfields')->where('type', '=', 'client')->get(['fieldname', 'id']) as $customfield) { - $customfields_array[] = $customfield; - } - $customfields = json_decode(json_encode($customfields_array), true); - if (!$customfields) { - $dropFieldArray = ['0' => 'database error']; - } elseif (count($customfields) >= 1) { - $dropFieldArray = ['0' => 'selecione um campo']; - foreach ($customfields as $key => $value) { - $dropFieldArray[$value['id']] = $value['fieldname']; - } - } else { - $dropFieldArray = ['0' => 'nothing to show']; - } - - // return $dropFieldArray; - } - } + // if (!function_exists('gnfe_customfields_dropdow')) { + // function gnfe_customfields_dropdow() { + // $customfields_array = []; + // foreach (Capsule::table('tblcustomfields')->where('type', '=', 'client')->get(['fieldname', 'id']) as $customfield) { + // $customfields_array[] = $customfield; + // } + // $customfields = json_decode(json_encode($customfields_array), true); + // if (!$customfields) { + // $dropFieldArray = ['0' => 'database error']; + // } elseif (count($customfields) >= 1) { + // $dropFieldArray = ['0' => 'selecione um campo']; + // foreach ($customfields as $key => $value) { + // $dropFieldArray[$value['id']] = $value['fieldname']; + // } + // } else { + // $dropFieldArray = ['0' => 'nothing to show']; + // } + // // return $dropFieldArray; + // } + // } function gnfe_verify_module_updates() { $curl = curl_init(); @@ -346,6 +345,13 @@ function gofasnfeio_config() { 'Default' => 'Número da fatura', ]]; + $send_invoice_url = ['send_invoice_url' => [ + 'FriendlyName' => 'Enviar o link da fatura na nota fiscal?', + 'Type' => 'radio', + 'Options' => 'Sim,Não', + 'Default' => 'Não' + ]]; + $desc_custom = ['descCustom' => [ 'FriendlyName' => 'Adicione uma informação personalizada na nota fiscal:', 'Type' => 'text', @@ -365,7 +371,7 @@ function gofasnfeio_config() { 'Description' => '© ' . date('Y') . ' Suporte módulo', ]]; - $fields = array_merge($intro, $api_key, $company_id, $service_code, $rps_serial_number, $rps_number_camp, $issue_note, $issue_note_after, $gnfe_email_nfe_config,$development_, $cancel_invoice_cancel_nfe, $debug, $insc_municipal,$cpf,$cnpj, $tax, $invoiceDetails,$desc_custom, $footer); + $fields = array_merge($intro, $api_key, $company_id, $service_code, $rps_serial_number, $rps_number_camp, $issue_note, $issue_note_after, $gnfe_email_nfe_config,$development_, $cancel_invoice_cancel_nfe, $debug, $insc_municipal,$cpf,$cnpj, $tax, $invoiceDetails, $send_invoice_url,$desc_custom, $footer); $configarray = [ 'name' => 'NFE.io', 'description' => 'Módulo Nota Fiscal NFE.io para WHMCS', diff --git a/modules/addons/gofasnfeio/sendNFE.php b/modules/addons/gofasnfeio/sendNFE.php index b5775f7..fd741bb 100644 --- a/modules/addons/gofasnfeio/sendNFE.php +++ b/modules/addons/gofasnfeio/sendNFE.php @@ -37,12 +37,24 @@ function emitNFE($invoices,$nfeio) { //description nfe if ($params['InvoiceDetails'] == 'Número da fatura') { $gnfeWhmcsUrl = Capsule::table('tblconfiguration')->where('setting', '=', 'Domain')->get(['value'])[0]->value; - $desc = 'Nota referente a fatura #' . $invoices->id . ' ' . $gnfeWhmcsUrl . 'viewinvoice.php?id=' . $invoices->id . ' ' . $params['descCustom']; + + $desc = 'Nota referente a fatura #' . $invoices->id . ' '; + if ($params['send_invoice_url'] === 'Sim') { + $desc .= $gnfeWhmcsUrl . 'viewinvoice.php?id=' . $invoices->id; + } + $desc .= ' ' . $params['descCustom']; + + $gnfeWhmcsUrl = Capsule::table('tblconfiguration')->where('setting', '=', 'Domain')->get(['value'])[0]->value; + } elseif ($params['InvoiceDetails'] == 'Nome dos serviços') { $desc = substr(implode("\n", $line_items), 0, 600) . ' ' . $params['descCustom']; } elseif ($params['InvoiceDetails'] == 'Número da fatura + Nome dos serviços') { $gnfeWhmcsUrl = Capsule::table('tblconfiguration')->where('setting', '=', 'Domain')->get(['value'])[0]->value; - $desc = 'Nota referente a fatura #' . $invoices->id . ' ' . $gnfeWhmcsUrl . 'viewinvoice.php?id=' . $invoices->id . ' | ' . substr(implode("\n", $line_items), 0, 600) . ' '. $params['descCustom']; + $desc = 'Nota referente a fatura #' . $invoices->id . ' '; + if ($params['send_invoice_url'] === 'Sim') { + $desc .= $gnfeWhmcsUrl . 'viewinvoice.php?id=' . $invoices->id; + } + $desc .= ' | ' . substr(implode("\n", $line_items), 0, 600) . ' '. $params['descCustom']; } logModuleCall('gofas_nfeio', 'description-descCustom', $params['descCustom'], '','', ''); From 1523ac060cf40b7d351f88d3690f6e251b606f3e Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 23 Jun 2021 12:00:18 -0300 Subject: [PATCH 13/30] =?UTF-8?q?Fun=C3=A7=C3=A3o=20para=20detec=C3=A7?= =?UTF-8?q?=C3=A3o=20de=20condi=C3=A7=C3=A3o=20para=20emiss=C3=A3o=20de=20?= =?UTF-8?q?nf=20corrigida?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/addons/gofasnfeio/config.php | 4 ++- modules/addons/gofasnfeio/functions.php | 31 ++++++++++++++----- .../gofasnfeio/hooks/invoicecreation.php | 3 +- .../addons/gofasnfeio/hooks/invoicepaid.php | 2 +- modules/addons/gofasnfeio/test.php | 27 ++++++++++++++++ 5 files changed, 56 insertions(+), 11 deletions(-) create mode 100644 modules/addons/gofasnfeio/test.php diff --git a/modules/addons/gofasnfeio/config.php b/modules/addons/gofasnfeio/config.php index 07834d6..793826c 100644 --- a/modules/addons/gofasnfeio/config.php +++ b/modules/addons/gofasnfeio/config.php @@ -53,6 +53,8 @@ function gofasnfeio_config() { dowload_doc_log(); } + require_once 'test.php'; + // -------------------------------------------------------------------------------------------- // Versão do módulo deste arquivo. @@ -346,7 +348,7 @@ function gofasnfeio_config() { ]]; $send_invoice_url = ['send_invoice_url' => [ - 'FriendlyName' => 'Enviar o link da fatura na nota fiscal?', + 'FriendlyName' => 'Exibir link da fatura na nota fiscal?', 'Type' => 'radio', 'Options' => 'Sim,Não', 'Default' => 'Não' diff --git a/modules/addons/gofasnfeio/functions.php b/modules/addons/gofasnfeio/functions.php index 2da294b..0ecc134 100644 --- a/modules/addons/gofasnfeio/functions.php +++ b/modules/addons/gofasnfeio/functions.php @@ -679,6 +679,13 @@ function gnfe_update_rps($rps_serial_number, $rps_number) { } } } + +/** + * Returns the data of a invoice from the local WHMCS database. + * @var $invoice_id + * @var $values + * @return string + */ if (!function_exists('gnfe_get_local_nfe')) { function gnfe_get_local_nfe($invoice_id, $values) { foreach (Capsule::table('gofasnfeio')->where('invoice_id', '=', $invoice_id)->orderBy('id', 'desc')->get($values) as $key => $value) { @@ -687,6 +694,7 @@ function gnfe_get_local_nfe($invoice_id, $values) { return $nfe_for_invoice['0']; } } + if (!function_exists('gnfe_check_webhook')) { function gnfe_check_webhook($id) { $curl = curl_init(); @@ -896,11 +904,18 @@ function update_status_nfe($invoice_id,$status) { } } -function verifyIssueFromUser($vars) { - $results = localAPI('GetInvoice', ['invoiceid' => $vars['invoiceid']], false); - $results = localAPI('GetClientsDetails', ['clientid' => $results['userid']], ''); - foreach ($results['customfields'] as $key => $value) { - $issueNfeUser = $value['value']; - } - return $issueNfeUser; -} \ No newline at end of file +/** + * @var $vars vem do arquivo hooks.php. + * @return string + */ +function gnfe_get_issue_invoice_condition($vars) { + $whmcsCondition = strtolower(gnfe_config('issue_note')); + + $invoiceClientId = gnfe_get_local_nfe($vars['invoiceid'], 'user_id'); + // $invoiceClientId = localAPI('GetInvoice', ['invoiceid' => $vars['invoiceid']])['userid']; + + $clientCondition = Capsule::table('tblcustomfieldsvalues')->where('fieldid', '=', '21')->where('relid', '=', $invoiceClientId)->get(['value']); + $clientCondition = strtolower($clientCondition[0]->value); + + return !empty($clientCondition) ? $clientCondition : $whmcsCondition; +} diff --git a/modules/addons/gofasnfeio/hooks/invoicecreation.php b/modules/addons/gofasnfeio/hooks/invoicecreation.php index 0d498d8..0d4c894 100644 --- a/modules/addons/gofasnfeio/hooks/invoicecreation.php +++ b/modules/addons/gofasnfeio/hooks/invoicecreation.php @@ -4,7 +4,8 @@ exit(); } -$issueNfeUser = verifyIssueFromUser($vars); +$issueInvoiceCondition = gnfe_get_issue_invoice_condition($vars); + if (strtolower($issueNfeUser) === 'quando a fatura é gerada') { logModuleCall('gofas_nfeio', 'quando a fatura é gerada invoicecreation', strtolower($issueNfeUser) , '', '', ''); diff --git a/modules/addons/gofasnfeio/hooks/invoicepaid.php b/modules/addons/gofasnfeio/hooks/invoicepaid.php index 1d902d7..46c32b7 100644 --- a/modules/addons/gofasnfeio/hooks/invoicepaid.php +++ b/modules/addons/gofasnfeio/hooks/invoicepaid.php @@ -4,7 +4,7 @@ exit(); } $params = gnfe_config(); -$issueNfeUser = verifyIssueFromUser($vars); +$issueInvoiceCondition = gnfe_get_issue_invoice_condition($vars); if (strtolower($issueNfeUser) === 'quando a fatura é paga') { $invoice = localAPI('GetInvoice', ['invoiceid' => $vars['invoiceid']], false); diff --git a/modules/addons/gofasnfeio/test.php b/modules/addons/gofasnfeio/test.php new file mode 100644 index 0000000..21be8dd --- /dev/null +++ b/modules/addons/gofasnfeio/test.php @@ -0,0 +1,27 @@ + $vars['invoiceid']])['userid']; + +// $clientCondition = Capsule::table('tblcustomfieldsvalues')->where('fieldid', '=', '21')->where('relid', '=', $invoiceClientId)->get(['value']); +// $clientCondition = strtolower($clientCondition[0]->value); + +// return !empty($clientCondition) ? $clientCondition : $whmcsCondition; +// } + +// $vars['invoiceid'] = '1003'; +// $issueInvoiceCondition = gnfe_get_issue_invoice_condition($vars); + +// echo '
    ';
+// print_r($issueInvoiceCondition);
+// echo '
    '; From 853bf29e9b03a151386c2c3db062880c9129667a Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 23 Jun 2021 12:23:32 -0300 Subject: [PATCH 14/30] =?UTF-8?q?Remo=C3=A7=C3=A3o=20de=20fun=C3=A7=C3=B5e?= =?UTF-8?q?s=20e=20condicionais=20desnecess=C3=A1rias?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/addons/gofasnfeio/functions.php | 24 +--------------- modules/addons/gofasnfeio/sendNFE.php | 38 ++----------------------- 2 files changed, 4 insertions(+), 58 deletions(-) diff --git a/modules/addons/gofasnfeio/functions.php b/modules/addons/gofasnfeio/functions.php index 0ecc134..b56f3c0 100644 --- a/modules/addons/gofasnfeio/functions.php +++ b/modules/addons/gofasnfeio/functions.php @@ -657,28 +657,6 @@ function gnfe_update_nfe($nfe, $user_id, $invoice_id, $pdf, $created_at, $update } } } -if (!function_exists('gnfe_update_rps')) { - function gnfe_update_rps($rps_serial_number, $rps_number) { - // Para que serve este array? - $setting = []; - foreach (Capsule::table('tbladdonmodules')->where('module', '=', 'gofasnfeio')->get(['setting', 'value']) as $settings) { - $setting[$settings->setting] = $settings->value; - } - - try { - if ($rps_serial_number) { - $update_rps_serial_number = Capsule::table('tbladdonmodules')->where('module', '=', 'gofasnfeio')->where('setting', '=', 'rps_serial_number')->update(['value' => $rps_serial_number]); - } - if ($rps_number) { - $update_serial_number = Capsule::table('tbladdonmodules')->where('module', '=', 'gofasnfeio')->where('setting', '=', 'rps_number')->update(['value' => $rps_number + 1]); - } - - return 'success'; - } catch (\Exception $e) { - return $e->getMessage(); - } - } -} /** * Returns the data of a invoice from the local WHMCS database. @@ -914,7 +892,7 @@ function gnfe_get_issue_invoice_condition($vars) { $invoiceClientId = gnfe_get_local_nfe($vars['invoiceid'], 'user_id'); // $invoiceClientId = localAPI('GetInvoice', ['invoiceid' => $vars['invoiceid']])['userid']; - $clientCondition = Capsule::table('tblcustomfieldsvalues')->where('fieldid', '=', '21')->where('relid', '=', $invoiceClientId)->get(['value']); + $clientCondition = Capsule::table('tblcustomfieldsvalues')->where('fieldname', '=', 'Emitir Nota Fiscal')->where('relid', '=', $invoiceClientId)->get(['value']); $clientCondition = strtolower($clientCondition[0]->value); return !empty($clientCondition) ? $clientCondition : $whmcsCondition; diff --git a/modules/addons/gofasnfeio/sendNFE.php b/modules/addons/gofasnfeio/sendNFE.php index fd741bb..788451f 100644 --- a/modules/addons/gofasnfeio/sendNFE.php +++ b/modules/addons/gofasnfeio/sendNFE.php @@ -71,33 +71,6 @@ function emitNFE($invoices,$nfeio) { $number = preg_replace('/[^0-9]/', '', $client['address1']); } - //define o RPS number - $gnfe_get_nfes = gnfe_get_nfes(); - //rps_serial_number - if ($params['rps_serial_number']) { - $rps_serial_number = $params['rps_serial_number']; - $rps_serial_number_ = false; - //se não tiver salvo no banco mas existir na API - } elseif (!$params['rps_serial_number'] and $gnfe_get_nfes['rpsSerialNumber']) { - $rps_serial_number = $gnfe_get_nfes['rpsSerialNumber']; - $rps_serial_number_ = $rps_serial_number; - //se não tiver salvo no banco e não existir na API - } elseif (!$params['rps_serial_number'] and !$gnfe_get_nfes['rpsSerialNumber']) { - $rps_serial_number = 'IO'; - $rps_serial_number_ = $rps_serial_number; - } - - //rps_number - if ($params['rps_number'] and $params['rps_number'] != 'zero') { - $rps_number = $params['rps_number']; - //se não existir RPS e existir na API - } elseif ((!$params['rps_number'] || $params['rps_number'] == 'zero') && $gnfe_get_nfes['rpsNumber']) { - $rps_number = $gnfe_get_nfes['rpsNumber']; - //se não existir RPS e não existir na API - } elseif (($params['rps_number'] == 'zero' && !$gnfe_get_nfes['rpsNumber']) || (!$params['rps_number'] && !$gnfe_get_nfes['rpsNumber'])) { - $rps_number = 0; - } - if ($params['gnfe_email_nfe_config'] == 'on') { $client_email = $client['email']; } else { @@ -113,7 +86,7 @@ function emitNFE($invoices,$nfeio) { //cria o array do request $postfields = createRequestFromAPI($service_code,$desc,$nfeio->services_amount,$customer['document'],$customer['insc_municipal'], $name,$client_email,$client['countrycode'],$client['postcode'],$street,$number,$client['address2'], - $code,$client['city'],$client['state'],$rps_serial_number); + $code,$client['city'],$client['state']); //envia o requisição $nfe = gnfe_issue_nfe($postfields); @@ -128,16 +101,12 @@ function emitNFE($invoices,$nfeio) { if ($gnfe_update_nfe && $gnfe_update_nfe !== 'success') { logModuleCall('gofas_nfeio', 'sendNFE - gnfe_update_nfe', [$nfe, $invoices->userid, $invoices->id, 'n/a', date('Y-m-d H:i:s'), date('Y-m-d H:i:s'), $waiting->id], $gnfe_update_nfe, 'ERROR', ''); } - - if ($update_rps && $update_rps !== 'success') { - logModuleCall('gofas_nfeio', 'sendNFE - update_rps', [$rps_serial_number_, $rps_number], $update_rps, 'ERROR', ''); - } } } } function createRequestFromAPI($service_code,$desc,$services_amount,$document,$insc_municipal = '', -$name,$email,$countrycode,$postcode,$street,$number,$address2,$code,$city,$state,$rps_serial_number) { +$name,$email,$countrycode,$postcode,$street,$number,$address2,$code,$city,$state) { $postfields = [ 'cityServiceCode' => $service_code, 'description' => $desc, @@ -160,8 +129,7 @@ function createRequestFromAPI($service_code,$desc,$services_amount,$document,$in ], 'state' => $state, ], - ], - 'rpsSerialNumber' => $rps_serial_number + ] ]; strlen($insc_municipal) == 0 ? '' : $postfields['borrower']['municipalTaxNumber'] = $insc_municipal; return $postfields; From 8b8c3a43f026059e570fde3a1fd34bc9cc11c48a Mon Sep 17 00:00:00 2001 From: = <=> Date: Thu, 24 Jun 2021 14:17:49 -0300 Subject: [PATCH 15/30] =?UTF-8?q?Condi=C3=A7=C3=A3o=20de=20emiss=C3=A3o=20?= =?UTF-8?q?de=20nota:=20modo=20de=20n=C3=A3o=20exibir=20o=20campo=20no=20W?= =?UTF-8?q?HMCS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/addons/gofasnfeio/config.php | 33 ++------- modules/addons/gofasnfeio/functions.php | 70 ++++++++++++++++++- modules/addons/gofasnfeio/hooks.php | 30 +++++--- .../addons/gofasnfeio/hooks/aftercronjob.php | 2 +- .../gofasnfeio/hooks/invoicecreation.php | 2 +- .../addons/gofasnfeio/hooks/invoicepaid.php | 8 +-- modules/addons/gofasnfeio/test.php | 2 +- 7 files changed, 102 insertions(+), 45 deletions(-) diff --git a/modules/addons/gofasnfeio/config.php b/modules/addons/gofasnfeio/config.php index 793826c..c8fc393 100644 --- a/modules/addons/gofasnfeio/config.php +++ b/modules/addons/gofasnfeio/config.php @@ -9,27 +9,6 @@ require_once __DIR__ . '/update.php'; if (!function_exists('gofasnfeio_config')) { - // if (!function_exists('gnfe_customfields_dropdow')) { - // function gnfe_customfields_dropdow() { - // $customfields_array = []; - // foreach (Capsule::table('tblcustomfields')->where('type', '=', 'client')->get(['fieldname', 'id']) as $customfield) { - // $customfields_array[] = $customfield; - // } - // $customfields = json_decode(json_encode($customfields_array), true); - // if (!$customfields) { - // $dropFieldArray = ['0' => 'database error']; - // } elseif (count($customfields) >= 1) { - // $dropFieldArray = ['0' => 'selecione um campo']; - // foreach ($customfields as $key => $value) { - // $dropFieldArray[$value['id']] = $value['fieldname']; - // } - // } else { - // $dropFieldArray = ['0' => 'nothing to show']; - // } - // // return $dropFieldArray; - // } - // } - function gnfe_verify_module_updates() { $curl = curl_init(); curl_setopt($curl, CURLOPT_URL, 'https://api.github.com/repos/nfe/whmcs-addon/releases'); @@ -53,7 +32,7 @@ function gofasnfeio_config() { dowload_doc_log(); } - require_once 'test.php'; + // insert_issue_nfe_cond_in_database(); // -------------------------------------------------------------------------------------------- @@ -123,7 +102,7 @@ function gofasnfeio_config() { Capsule::table('tbladdonmodules')->insert(['module' => 'gofasnfeio', 'setting' => 'rps_number', 'value' => $nfe_rps]); } - $whmcs_rps = gnfe_config()['rps_number']; + $whmcs_rps = gnfe_config('rps_number'); if (is_numeric($whmcs_rps)) { $company_data = gnfe_get_company_info(); @@ -278,11 +257,11 @@ function gofasnfeio_config() { 'Description' => $rps_number_camp_description ]]; - $issue_note = ['issue_note' => [ + $issue_note_default_cond = ['issue_note_default_cond' => [ 'FriendlyName' => 'Quando emitir NFE', 'Type' => 'radio', - 'Options' => 'Manualmente,Quando a Fatura é Gerada,Quando a Fatura é Paga', - 'Default' => 'Quando a Fatura é Paga', + 'Options' => 'Quando a fatura é gerada,Quando a fatura é paga,Seguir padrão do WHMCS', + 'Default' => 'Quando a fatura é paga', ]]; $issue_note_after = ['issue_note_after' => [ @@ -373,7 +352,7 @@ function gofasnfeio_config() { 'Description' => '© ' . date('Y') . ' Suporte módulo', ]]; - $fields = array_merge($intro, $api_key, $company_id, $service_code, $rps_serial_number, $rps_number_camp, $issue_note, $issue_note_after, $gnfe_email_nfe_config,$development_, $cancel_invoice_cancel_nfe, $debug, $insc_municipal,$cpf,$cnpj, $tax, $invoiceDetails, $send_invoice_url,$desc_custom, $footer); + $fields = array_merge($intro, $api_key, $company_id, $service_code, $rps_serial_number, $rps_number_camp, $issue_note_default_cond, $issue_note_after, $gnfe_email_nfe_config,$development_, $cancel_invoice_cancel_nfe, $debug, $insc_municipal,$cpf,$cnpj, $tax, $invoiceDetails, $send_invoice_url,$desc_custom, $footer); $configarray = [ 'name' => 'NFE.io', 'description' => 'Módulo Nota Fiscal NFE.io para WHMCS', diff --git a/modules/addons/gofasnfeio/functions.php b/modules/addons/gofasnfeio/functions.php index b56f3c0..55d2d34 100644 --- a/modules/addons/gofasnfeio/functions.php +++ b/modules/addons/gofasnfeio/functions.php @@ -7,6 +7,8 @@ /** * Pega os dados da tabela tbladdonmodules do banco de dados da WHMCS. + * @var $set string|boolean + * @return array|string */ if (!function_exists('gnfe_config')) { function gnfe_config($set = false) { @@ -21,6 +23,7 @@ function gnfe_config($set = false) { return $setting; } } + if (!function_exists('gnfe_customer')) { function gnfe_customer($user_id, $client) { //Determine custom fields id @@ -887,7 +890,7 @@ function update_status_nfe($invoice_id,$status) { * @return string */ function gnfe_get_issue_invoice_condition($vars) { - $whmcsCondition = strtolower(gnfe_config('issue_note')); + $whmcsCondition = strtolower(gnfe_config('issue_note_default_cond')); $invoiceClientId = gnfe_get_local_nfe($vars['invoiceid'], 'user_id'); // $invoiceClientId = localAPI('GetInvoice', ['invoiceid' => $vars['invoiceid']])['userid']; @@ -897,3 +900,68 @@ function gnfe_get_issue_invoice_condition($vars) { return !empty($clientCondition) ? $clientCondition : $whmcsCondition; } + +// ------------------------------------------------- NOVAS FUNÇÕES + +/** + * Returns a '; + + foreach ($conditions as $cond) { + $select .= ''; + } + + $select .= ''; + + return $select; +} + +/** + * Insert the clientId and his condition of sending invoice in the table tblcustomfieldsvalues. + * @var $client int + * @var $invoiceCond string + */ +function save_client_issue_invoice_cond($clientId, $newCond) { + $previousCond = Capsule::table('tblcustomfieldsvalues')->where('fieldid', '=', 'issue_note_conditions')->where('relid', '=', 'gofas_' . $clientId)->get(['value']); + + $log = + "clientId: $clientId\n" + . "newCond: $newCond\n" + . "previousCond: " . $previousCond; + + if ($previousCond !== $newCond) { + if ($previousCond) { + Capsule::table('tblcustomfieldsvalues')->insert(['fieldid' => 'issue_note_condition', 'relid' => 'gofas_' . $clientId, 'value' => $newCond]); + $log .= 'PERSONALIAÇÃO DO CLIENTE __INSERIDA.'; + } else { + Capsule::table('tblcustomfieldsvalues')->where('fieldid', 'issue_note_condition')->where('relid', 'gofas_' . $clientId)->update(['value' => $newCond]); + $log .= 'PERSONALIZAÇÃO DO CLIENTE __ATUALIZADA.'; + } + } + + error_log($log, 1, 'ferreira.bruno@linknacional.com'); +} + +/** + * Inserts the conditions of sending invoices in the database. + */ +if (!function_exists('insert_issue_nfe_cond_in_database')) { + function insert_issue_nfe_cond_in_database() { + $conditions = 'Quando a fatura é gerada,Quando a fatura é paga,Seguir padrão do WHMCS'; + + Capsule::table('tblcustomfields') + ->insert(['module' => 'gofasnfeio', + 'type' => 'client', + 'fieldname' => 'Quando emitir nota fiscal', + 'fieldtype' => 'dropdown', + 'fieldoptions' => $conditions]); + + Capsule::table('tblcustomfields'); + } +} diff --git a/modules/addons/gofasnfeio/hooks.php b/modules/addons/gofasnfeio/hooks.php index 125ee8f..5ea51f0 100644 --- a/modules/addons/gofasnfeio/hooks.php +++ b/modules/addons/gofasnfeio/hooks.php @@ -1,44 +1,54 @@ show_issue_invoice_conds(), + ]; +}); + +add_hook('AdminClientProfileTabFieldsSave', 1, function($vars) { + require_once __DIR__ . '/functions.php'; + save_client_issue_invoice_cond($vars['userid'], $_REQUEST['issue_note_cond']); +}); diff --git a/modules/addons/gofasnfeio/hooks/aftercronjob.php b/modules/addons/gofasnfeio/hooks/aftercronjob.php index 4dabbbd..dcadfb1 100644 --- a/modules/addons/gofasnfeio/hooks/aftercronjob.php +++ b/modules/addons/gofasnfeio/hooks/aftercronjob.php @@ -20,7 +20,7 @@ $data = getTodaysDate(false); $dataAtual = toMySQLDate($data); - if ($params['issue_note'] !== 'Manualmente') { + 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 { diff --git a/modules/addons/gofasnfeio/hooks/invoicecreation.php b/modules/addons/gofasnfeio/hooks/invoicecreation.php index 0d4c894..49cd0e3 100644 --- a/modules/addons/gofasnfeio/hooks/invoicecreation.php +++ b/modules/addons/gofasnfeio/hooks/invoicecreation.php @@ -42,7 +42,7 @@ } else { logModuleCall('gofas_nfeio', 'nenhum (padrão do whmcs) deve seguir a configuração do modulo invoicecreation', '', '', '', ''); $params = gnfe_config(); - if (stripos($params['issue_note'], 'Gerada') && (string) $vars['status'] != 'Draft' && (!$params['issue_note_after'] || 0 == $params['issue_note_after'])) { + if (stripos($params['issue_note_default_cond'], 'Gerada') && (string) $vars['status'] != 'Draft' && (!$params['issue_note_after'] || 0 == $params['issue_note_after'])) { $invoice = localAPI('GetInvoice', ['invoiceid' => $vars['invoiceid']], false); if ((float) $invoice['total'] > (float) '0.00' and $invoice['status'] != 'Draft') { diff --git a/modules/addons/gofasnfeio/hooks/invoicepaid.php b/modules/addons/gofasnfeio/hooks/invoicepaid.php index 46c32b7..1132626 100644 --- a/modules/addons/gofasnfeio/hooks/invoicepaid.php +++ b/modules/addons/gofasnfeio/hooks/invoicepaid.php @@ -5,8 +5,8 @@ } $params = gnfe_config(); $issueInvoiceCondition = gnfe_get_issue_invoice_condition($vars); - -if (strtolower($issueNfeUser) === 'quando a fatura é paga') { +// Uma fatura é paga +if ($issueInvoiceCondition === 'quando a fatura é paga') { $invoice = localAPI('GetInvoice', ['invoiceid' => $vars['invoiceid']], false); if ((float) $invoice['total'] > 0.00 and $invoice['status'] != 'Draft') { @@ -30,10 +30,10 @@ } } } -} elseif (strtolower($issueNfeUser) === 'quando a fatura é gerada') { +} elseif ($issueInvoiceCondition === 'quando a fatura é gerada') { return; } else { - if (stripos($params['issue_note'], 'Paga') && $vars['status'] != 'Draft' && (!$params['issue_note_after'] || 0 == $params['issue_note_after'] || stripos(strtolower($issueNfeUser),'paga'))) { + if (stripos($params['issue_note_default_cond'], 'Paga') && $vars['status'] != 'Draft' && (!$params['issue_note_after'] || 0 == $params['issue_note_after'] || stripos(strtolower($issueNfeUser),'paga'))) { $invoice = localAPI('GetInvoice', ['invoiceid' => $vars['invoiceid']], false); if ((float) $invoice['total'] > 0.00 and $invoice['status'] != 'Draft') { diff --git a/modules/addons/gofasnfeio/test.php b/modules/addons/gofasnfeio/test.php index 21be8dd..06579d8 100644 --- a/modules/addons/gofasnfeio/test.php +++ b/modules/addons/gofasnfeio/test.php @@ -8,7 +8,7 @@ */ // function gnfe_get_issue_invoice_condition($vars) { -// $whmcsCondition = strtolower(gnfe_config('issue_note')); +// $whmcsCondition = strtolower(gnfe_config('issue_note_default_cond')); // $invoiceClientId = gnfe_get_local_nfe($vars['invoiceid'], 'user_id'); // // $invoiceClientId = localAPI('GetInvoice', ['invoiceid' => $vars['invoiceid']])['userid']; From d3dbdcba583b2a96f31fe9dd8bd131205879f249 Mon Sep 17 00:00:00 2001 From: = <=> Date: Thu, 24 Jun 2021 19:48:32 -0300 Subject: [PATCH 16/30] =?UTF-8?q?Condi=C3=A7=C3=A3o=20de=20emiss=C3=A3o=20?= =?UTF-8?q?personalizada=20de=20nota=20fical=20em=20desenvolvimento,=20pro?= =?UTF-8?q?blemas=20no=20arquivo=20invoicecreation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/addons/gofasnfeio/config.php | 7 +- modules/addons/gofasnfeio/functions.php | 140 +++++++++++------- modules/addons/gofasnfeio/hooks.php | 6 +- .../gofasnfeio/hooks/invoicecreation.php | 20 +-- .../addons/gofasnfeio/hooks/invoicepaid.php | 3 +- modules/addons/gofasnfeio/test.php | 4 +- 6 files changed, 104 insertions(+), 76 deletions(-) diff --git a/modules/addons/gofasnfeio/config.php b/modules/addons/gofasnfeio/config.php index c8fc393..21275b3 100644 --- a/modules/addons/gofasnfeio/config.php +++ b/modules/addons/gofasnfeio/config.php @@ -32,7 +32,8 @@ function gofasnfeio_config() { dowload_doc_log(); } - // insert_issue_nfe_cond_in_database(); + // gnfe_insert_issue_nfe_cond_in_database(); + var_dump(gnfe_get_client_issue_invoice_cond_from_invoice_id('1000')); // -------------------------------------------------------------------------------------------- @@ -260,8 +261,8 @@ function gofasnfeio_config() { $issue_note_default_cond = ['issue_note_default_cond' => [ 'FriendlyName' => 'Quando emitir NFE', 'Type' => 'radio', - 'Options' => 'Quando a fatura é gerada,Quando a fatura é paga,Seguir padrão do WHMCS', - 'Default' => 'Quando a fatura é paga', + 'Options' => gnfe_config('issue_note_conditions'), + 'Default' => gnfe_config('issue_note_default_cond'), ]]; $issue_note_after = ['issue_note_after' => [ diff --git a/modules/addons/gofasnfeio/functions.php b/modules/addons/gofasnfeio/functions.php index 55d2d34..57e3034 100644 --- a/modules/addons/gofasnfeio/functions.php +++ b/modules/addons/gofasnfeio/functions.php @@ -885,83 +885,109 @@ function update_status_nfe($invoice_id,$status) { } } -/** - * @var $vars vem do arquivo hooks.php. - * @return string - */ -function gnfe_get_issue_invoice_condition($vars) { - $whmcsCondition = strtolower(gnfe_config('issue_note_default_cond')); +// ------------------------------------------------- NOVAS FUNÇÕES +if (!function_exists('gnfe_get_client_issue_invoice_cond_from_invoice_id')) { + /** + * @var $vars vem do arquivo hooks.php. + * @return string + */ + function gnfe_get_client_issue_invoice_cond_from_invoice_id($invoiceId) { + $whmcsCondition = strtolower(gnfe_config('issue_note_default_cond')); - $invoiceClientId = gnfe_get_local_nfe($vars['invoiceid'], 'user_id'); - // $invoiceClientId = localAPI('GetInvoice', ['invoiceid' => $vars['invoiceid']])['userid']; + // $invoiceClientId = gnfe_get_local_nfe($invoiceId, 'user_id'); + $invoiceClientId = localAPI('GetInvoice', ['invoiceid' => $invoiceId]); - $clientCondition = Capsule::table('tblcustomfieldsvalues')->where('fieldname', '=', 'Emitir Nota Fiscal')->where('relid', '=', $invoiceClientId)->get(['value']); - $clientCondition = strtolower($clientCondition[0]->value); + // $invoiceClientId = localAPI('GetInvoice', ['invoiceid' => $invoiceId]); + // error_log(json_decode($invoiceClientId), 1, 'ferreira.bruno@linknacional.com'); + // logModuleCall('gofasnfe','a', 'a', print_r($invoiceClientId)); - return !empty($clientCondition) ? $clientCondition : $whmcsCondition; -} + $previousClientCond = Capsule::table('gofas_when_send_nfe')->where('client_id', '=', $invoiceClientId)->get(['value'])[0]->value; + $previousClientCond = strtolower($previousClientCond, true); -// ------------------------------------------------- NOVAS FUNÇÕES + // logModuleCall('gofasnfe','', 'INVOICE ID: ' . $invoiceId, 'INVOICE CLIENT ID: ' . var_dump($invoiceClientId)); -/** - * Returns a '; + // logModuleCall( + // 'gofasnfe', + // 'gnfe_get_client_issue_invoice_cond_from_invoice_id', + // '|--- PREVIOUS COND: ' . $previousClientCond + // . '|--- INVOICE ID: ' . $invoiceId + // . '|--- INVOICE CLIENT ID: ' . $invoiceClientId + // . '|--- WHMCS COND: ' . $whmcsCondition, json_decode($invoiceClientId), '', ''); - foreach ($conditions as $cond) { - $select .= ''; + // return $previousClientCond != null ? $previousClientCond : $whmcsCondition; + return $invoiceClientId; } +} - $select .= ''; - return $select; -} +if (!function_exists('gnfe_show_issue_invoice_conds')) { + /** + * Returns a '; + + // Sets the previous issue condition in the first index of array $conditions. + // in order to the previous condition be showed in the client prifile. + if ($previousClientCond != null) { + $previousCondKey = array_search($previousClientCond, $conditions); + unset($conditions[$previousCondKey]); + $select .= ''; } else { - Capsule::table('tblcustomfieldsvalues')->where('fieldid', 'issue_note_condition')->where('relid', 'gofas_' . $clientId)->update(['value' => $newCond]); - $log .= 'PERSONALIZAÇÃO DO CLIENTE __ATUALIZADA.'; + $defaultCond = 'Seguir padrão do WHMCS'; + $defaultCondKey = array_search($defaultCond, $conditions); + unset($conditions[$defaultCondKey]); + $select .= ''; + } + + foreach ($conditions as $cond) { + $select .= ''; } + $select .= ''; + + return $select; } +} - error_log($log, 1, 'ferreira.bruno@linknacional.com'); +if (!function_exists('gnfe_save_client_issue_invoice_cond')) { + /** + * Insert the clientId and his condition of sending invoice in the table gofas_when_send_nfe. + * @var $client int + * @var $invoiceCond string + */ + function gnfe_save_client_issue_invoice_cond($clientId, $newCond) { + $previousClientCond = Capsule::table('gofas_when_send_nfe')->where('client_id', '=', $clientId)->get(['value'])[0]->value; + + if ($newCond !== $previousClientCond) { + if ($previousClientCond == null) { + Capsule::table('gofas_when_send_nfe')->insert([ + 'client_id' => $clientId, + 'value' => $newCond + ]); + } else { + Capsule::table('gofas_when_send_nfe') + ->where('client_id', '=', $clientId) + ->update(['value' => $newCond]); + } + } + } } /** * Inserts the conditions of sending invoices in the database. */ -if (!function_exists('insert_issue_nfe_cond_in_database')) { - function insert_issue_nfe_cond_in_database() { +if (!function_exists('gnfe_insert_issue_nfe_cond_in_database')) { + function gnfe_insert_issue_nfe_cond_in_database() { $conditions = 'Quando a fatura é gerada,Quando a fatura é paga,Seguir padrão do WHMCS'; - Capsule::table('tblcustomfields') - ->insert(['module' => 'gofasnfeio', - 'type' => 'client', - 'fieldname' => 'Quando emitir nota fiscal', - 'fieldtype' => 'dropdown', - 'fieldoptions' => $conditions]); - - Capsule::table('tblcustomfields'); + Capsule::table('tbladdonmodules')->insert(['module' => 'gofasnfeio','setting' => 'issue_note_conditions','value' => $conditions]); } } diff --git a/modules/addons/gofasnfeio/hooks.php b/modules/addons/gofasnfeio/hooks.php index 5ea51f0..b62bfcb 100644 --- a/modules/addons/gofasnfeio/hooks.php +++ b/modules/addons/gofasnfeio/hooks.php @@ -43,12 +43,10 @@ add_hook('AdminClientProfileTabFields', 1, function($vars) { require_once __DIR__ . '/functions.php'; - return [ - 'Emitir nota fiscal quando' => show_issue_invoice_conds(), - ]; + return ['Emitir nota fiscal quando' => gnfe_show_issue_invoice_conds($vars['userid'])]; }); add_hook('AdminClientProfileTabFieldsSave', 1, function($vars) { require_once __DIR__ . '/functions.php'; - save_client_issue_invoice_cond($vars['userid'], $_REQUEST['issue_note_cond']); + gnfe_save_client_issue_invoice_cond($vars['userid'], $_REQUEST['issue_note_cond']); }); diff --git a/modules/addons/gofasnfeio/hooks/invoicecreation.php b/modules/addons/gofasnfeio/hooks/invoicecreation.php index 49cd0e3..a18d367 100644 --- a/modules/addons/gofasnfeio/hooks/invoicecreation.php +++ b/modules/addons/gofasnfeio/hooks/invoicecreation.php @@ -1,14 +1,16 @@ $vars['invoiceid']], false); @@ -35,12 +37,12 @@ } } } -} elseif (strtolower($issueNfeUser) === 'quando a fatura é paga') { +} elseif ($issueInvoiceCondition === 'quando a fatura é paga') { logModuleCall('gofas_nfeio', 'quando a fatura é paga invoicecreation', '', '', '', ''); return; } else { - logModuleCall('gofas_nfeio', 'nenhum (padrão do whmcs) deve seguir a configuração do modulo invoicecreation', '', '', '', ''); + logModuleCall('gofas_nfeio', 'seguir padrão do WHMCS invoicecreation', '', '', '', ''); $params = gnfe_config(); if (stripos($params['issue_note_default_cond'], 'Gerada') && (string) $vars['status'] != 'Draft' && (!$params['issue_note_after'] || 0 == $params['issue_note_after'])) { $invoice = localAPI('GetInvoice', ['invoiceid' => $vars['invoiceid']], false); diff --git a/modules/addons/gofasnfeio/hooks/invoicepaid.php b/modules/addons/gofasnfeio/hooks/invoicepaid.php index 1132626..b747de0 100644 --- a/modules/addons/gofasnfeio/hooks/invoicepaid.php +++ b/modules/addons/gofasnfeio/hooks/invoicepaid.php @@ -4,7 +4,8 @@ exit(); } $params = gnfe_config(); -$issueInvoiceCondition = gnfe_get_issue_invoice_condition($vars); +$issueInvoiceCondition = gnfe_get_client_issue_invoice_cond_from_invoice_id($vars['invoiceid']); + // Uma fatura é paga if ($issueInvoiceCondition === 'quando a fatura é paga') { $invoice = localAPI('GetInvoice', ['invoiceid' => $vars['invoiceid']], false); diff --git a/modules/addons/gofasnfeio/test.php b/modules/addons/gofasnfeio/test.php index 06579d8..15fdee1 100644 --- a/modules/addons/gofasnfeio/test.php +++ b/modules/addons/gofasnfeio/test.php @@ -7,7 +7,7 @@ * @return string */ -// function gnfe_get_issue_invoice_condition($vars) { +// function gnfe_get_client_issue_invoice_cond($vars) { // $whmcsCondition = strtolower(gnfe_config('issue_note_default_cond')); // $invoiceClientId = gnfe_get_local_nfe($vars['invoiceid'], 'user_id'); @@ -20,7 +20,7 @@ // } // $vars['invoiceid'] = '1003'; -// $issueInvoiceCondition = gnfe_get_issue_invoice_condition($vars); +// $issueInvoiceCondition = gnfe_get_client_issue_invoice_cond($vars); // echo '
    ';
 // print_r($issueInvoiceCondition);

From ac5109942621f29f1fc134b121ee0085927fd62a Mon Sep 17 00:00:00 2001
From: = <=>
Date: Fri, 25 Jun 2021 10:07:31 -0300
Subject: [PATCH 17/30] =?UTF-8?q?Corrigido=20bug=20de=20emiss=C3=A3o=20per?=
 =?UTF-8?q?sonalizada?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/addons/gofasnfeio/config.php          |  2 +-
 modules/addons/gofasnfeio/functions.php       | 26 +++++--------------
 .../gofasnfeio/hooks/invoicecreation.php      |  5 ----
 3 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/modules/addons/gofasnfeio/config.php b/modules/addons/gofasnfeio/config.php
index 21275b3..098107c 100644
--- a/modules/addons/gofasnfeio/config.php
+++ b/modules/addons/gofasnfeio/config.php
@@ -33,7 +33,7 @@ function gofasnfeio_config() {
         }
 
         // gnfe_insert_issue_nfe_cond_in_database();
-        var_dump(gnfe_get_client_issue_invoice_cond_from_invoice_id('1000'));
+        var_dump(gnfe_get_client_issue_invoice_cond_from_invoice_id('1'));
 
         // --------------------------------------------------------------------------------------------
 
diff --git a/modules/addons/gofasnfeio/functions.php b/modules/addons/gofasnfeio/functions.php
index 57e3034..71010bf 100644
--- a/modules/addons/gofasnfeio/functions.php
+++ b/modules/addons/gofasnfeio/functions.php
@@ -894,28 +894,16 @@ function update_status_nfe($invoice_id,$status) {
     function gnfe_get_client_issue_invoice_cond_from_invoice_id($invoiceId) {
         $whmcsCondition = strtolower(gnfe_config('issue_note_default_cond'));
 
-        // $invoiceClientId = gnfe_get_local_nfe($invoiceId, 'user_id');
-        $invoiceClientId = localAPI('GetInvoice', ['invoiceid' => $invoiceId]);
+        $clientInvoiceId = localAPI('GetInvoice', ['invoiceid' => $invoiceId])['userid'];
 
-        // $invoiceClientId = localAPI('GetInvoice', ['invoiceid' => $invoiceId]);
-        // error_log(json_decode($invoiceClientId), 1, 'ferreira.bruno@linknacional.com');
-        // logModuleCall('gofasnfe','a', 'a', print_r($invoiceClientId));
+        $clientCond = Capsule::table('gofas_when_send_nfe')->where('client_id', '=', $clientInvoiceId)->get(['value'])[0]->value;
+        $clientCond = strtolower($clientCond);
 
-        $previousClientCond = Capsule::table('gofas_when_send_nfe')->where('client_id', '=', $invoiceClientId)->get(['value'])[0]->value;
-        $previousClientCond = strtolower($previousClientCond, true);
-
-        // logModuleCall('gofasnfe','', 'INVOICE ID: ' . $invoiceId, 'INVOICE CLIENT ID: ' . var_dump($invoiceClientId));
-
-        // logModuleCall(
-        //     'gofasnfe',
-        //     'gnfe_get_client_issue_invoice_cond_from_invoice_id',
-        //     '|--- PREVIOUS COND: ' . $previousClientCond
-        //     . '|--- INVOICE ID: ' . $invoiceId
-        //     . '|--- INVOICE CLIENT ID: ' . $invoiceClientId
-        //     . '|--- WHMCS COND: ' . $whmcsCondition, json_decode($invoiceClientId), '', '');
+        if ($clientCond !== null && $clientCond !== 'seguir padrão do whmcs') {
+            return $clientCond;
+        }
 
-        // return $previousClientCond != null ? $previousClientCond : $whmcsCondition;
-        return $invoiceClientId;
+        return $whmcsCondition;
     }
 }
 
diff --git a/modules/addons/gofasnfeio/hooks/invoicecreation.php b/modules/addons/gofasnfeio/hooks/invoicecreation.php
index a18d367..8453f54 100644
--- a/modules/addons/gofasnfeio/hooks/invoicecreation.php
+++ b/modules/addons/gofasnfeio/hooks/invoicecreation.php
@@ -3,11 +3,6 @@
 defined('WHMCS') or exit;
 
 $issueInvoiceCondition = gnfe_get_client_issue_invoice_cond_from_invoice_id($vars['invoiceid']);
-// logModuleCall(
-//     'gofas_nfeio',
-//     'quando a fatura é gerada invoicecreation',
-//     'invoiceid: ' . $vars['user'] . ' | Condition: ' . $issueInvoiceCondition, '', '', '');
-// error_log($issueInvoiceCondition, 1, 'ferreira.bruno@linknacional.com');
 
 if ($issueInvoiceCondition === 'quando a fatura é gerada') {
     logModuleCall('gofas_nfeio', 'quando a fatura é gerada invoicecreation', $issueInvoiceCondition , '', '', '');

From 8dbe07001325901164d8219876480d4d85ab05ea Mon Sep 17 00:00:00 2001
From: Bruno Ferreira 
Date: Fri, 25 Jun 2021 16:08:42 -0300
Subject: [PATCH 18/30] =?UTF-8?q?Corre=C3=A7=C3=A3o=20nas=20implementa?=
 =?UTF-8?q?=C3=A7=C3=B5es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/addons/gofasnfeio/config.php  | 6 ++++--
 modules/addons/gofasnfeio/sendNFE.php | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/addons/gofasnfeio/config.php b/modules/addons/gofasnfeio/config.php
index 098107c..2c7159d 100644
--- a/modules/addons/gofasnfeio/config.php
+++ b/modules/addons/gofasnfeio/config.php
@@ -32,8 +32,9 @@ function gofasnfeio_config() {
             dowload_doc_log();
         }
 
-        // gnfe_insert_issue_nfe_cond_in_database();
-        var_dump(gnfe_get_client_issue_invoice_cond_from_invoice_id('1'));
+        if (Capsule::table('tbladdonmodules')->where('module', '=', 'gofasnfeio')->where('setting', '=', 'issue_note_conditions')->count() == 0) {
+            gnfe_insert_issue_nfe_cond_in_database();
+        }
 
         // --------------------------------------------------------------------------------------------
 
@@ -239,6 +240,7 @@ function gofasnfeio_config() {
         $rps_serial_number = ['rps_serial_number' => [
             'FriendlyName' => 'Série do RPS',
             'Type' => 'text',
+            'Disabled' => 'true',
             'Default' => 'IO',
             'Description' => 'Saiba mais',
         ]];
diff --git a/modules/addons/gofasnfeio/sendNFE.php b/modules/addons/gofasnfeio/sendNFE.php
index 788451f..38832ec 100644
--- a/modules/addons/gofasnfeio/sendNFE.php
+++ b/modules/addons/gofasnfeio/sendNFE.php
@@ -127,8 +127,8 @@ function createRequestFromAPI($service_code,$desc,$services_amount,$document,$in
                     'code' => $code,
                     'name' => $city,
                 ],
-                'state' => $state,
-            ],
+                'state' => $state
+            ]
         ]
     ];
     strlen($insc_municipal) == 0 ? '' : $postfields['borrower']['municipalTaxNumber'] = $insc_municipal;

From fabee9b6b76a309506ee443853ca8e7e763fcc3a Mon Sep 17 00:00:00 2001
From: Bruno Ferreira 
Date: Fri, 25 Jun 2021 16:09:39 -0300
Subject: [PATCH 19/30] =?UTF-8?q?Adicionada=20cria=C3=A7=C3=A3o=20autom?=
 =?UTF-8?q?=C3=A1tica=20da=20tabela=20de=20emiss=C3=A3o=20personalizada?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/addons/gofasnfeio/update.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/modules/addons/gofasnfeio/update.php b/modules/addons/gofasnfeio/update.php
index 5bc20a9..8fc2c56 100644
--- a/modules/addons/gofasnfeio/update.php
+++ b/modules/addons/gofasnfeio/update.php
@@ -34,7 +34,20 @@ function gnfe_verifyInstall() {
                 $error .= "Não foi possível criar a tabela do módulo no banco de dados: {$e->getMessage()}";
             }
         }
-        // Added in v 1 dot 1 dot 3
+
+        if (!Capsule::schema()->hasTable('gofas_when_send_nfe')) {
+            try {
+                Capsule::schema()->table('gofas_when_send_nfe', function ($table) {
+                    $table->increments('id');
+                    $table->integer('client_id');
+                    $table->string('value');
+                });
+            } catch (\Exception $e) {
+                $error .= "Não foi possível atualizar a tabela do módulo no banco de dados: {$e->getMessage()}";
+            }
+        }
+
+        // Added in v1.1.3
         if (!Capsule::schema()->hasColumn('gofasnfeio', 'rpsNumber')) {
             try {
                 Capsule::schema()->table('gofasnfeio', function ($table) {

From 05d18173908d6e3d4eff6060785930d740d185e3 Mon Sep 17 00:00:00 2001
From: Bruno Ferreira 
Date: Mon, 28 Jun 2021 10:25:53 -0300
Subject: [PATCH 20/30] =?UTF-8?q?Atualiza=C3=A7=C3=A3o=20na=20transfer?=
 =?UTF-8?q?=C3=AAncia=20da=20tratativa=20do=20RPS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/addons/gofasnfeio/config.php    |  6 +--
 modules/addons/gofasnfeio/functions.php | 71 +++++++++++--------------
 modules/addons/gofasnfeio/test.php      | 27 ----------
 3 files changed, 33 insertions(+), 71 deletions(-)
 delete mode 100644 modules/addons/gofasnfeio/test.php

diff --git a/modules/addons/gofasnfeio/config.php b/modules/addons/gofasnfeio/config.php
index 2c7159d..329324f 100644
--- a/modules/addons/gofasnfeio/config.php
+++ b/modules/addons/gofasnfeio/config.php
@@ -58,7 +58,7 @@ function gofasnfeio_config() {
             // Pega apenas as versões MAJOR.MINOR do módulo instalado e da versão do módulo no banco de dados.
             $previous_major_minor_version = intval(substr($previous_version_int, 0, 2));
             $module_major_minor_version = intval(substr($module_version_int, 0, 2));
-            
+
             // Atende a diretriz "Exclusivamente a partir da versão 1.5.0 não será permitido atualização do modulo por versões inferiores a 1.4.0.".
             // Se a versão do módulo for igual a versão do módulo no
             // banco de dados mais 1, então a atualização é permitida.
@@ -106,7 +106,7 @@ function gofasnfeio_config() {
 
             $whmcs_rps = gnfe_config('rps_number');
 
-            if (is_numeric($whmcs_rps)) {
+            if (is_numeric($whmcs_rps) || $whmcs_rps == '') {
                 $company_data = gnfe_get_company_info();
 
                 if (isset($company_data['error'])) {
@@ -212,7 +212,7 @@ function gofasnfeio_config() {
             set_code_service_camp_gofasnfeio();
             set_custom_field_ini_date();
         }
-        
+
         $intro = ['intro' => [
             'FriendlyName' => '',
             'Description' => '
    Módulo Nota Fiscal NFE.io para WHMCS v' . $module_version . '
    
diff --git a/modules/addons/gofasnfeio/functions.php b/modules/addons/gofasnfeio/functions.php
index 71010bf..132b0c1 100644
--- a/modules/addons/gofasnfeio/functions.php
+++ b/modules/addons/gofasnfeio/functions.php
@@ -339,16 +339,22 @@ function gnfe_get_nfe($nf) {
 
 /**
  * Retorna os dados necessários na função gnfe_put_rps().
- * 
+ *
  * @return array
  */
 if (!function_exists('gnfe_get_company_info')) {
     function gnfe_get_company_info() {
         $curl = curl_init();
-        curl_setopt($curl, CURLOPT_URL, 'https://api.nfe.io/v1/companies/' . gnfe_config('company_id'));
-        curl_setopt($curl, CURLOPT_HTTPHEADER, ['Content-Type: application/json', 'Accept: application/json', 'Authorization: ' . gnfe_config('api_key')]);
-        curl_setopt($curl, CURLOPT_TIMEOUT, 30);
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt_array($curl, [
+            CURLOPT_URL => 'https://api.nfe.io/v1/companies/' . gnfe_config('company_id'),
+            CURLOPT_TIMEOUT => 30,
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_HTTPHEADER => [
+                'Content-Type: application/json',
+                'Accept: application/json',
+                'Authorization: ' . gnfe_config('api_key')
+            ]
+        ]);
 
         $response = json_decode(curl_exec($curl), true);
         $response = $response['companies'];
@@ -357,12 +363,7 @@ function gnfe_get_company_info() {
         curl_close($curl);
 
         if ($httpCode === 200) {
-            return array(
-                'name' => $response['name'],
-                'federalTaxNumber' => $response['federalTaxNumber'],
-                'address' => $response['address'],
-                'rpsNumber' => $response['rpsNumber']
-            );
+            return $response;
         } else {
             return array(
                 'error' =>
@@ -376,40 +377,28 @@ function gnfe_get_company_info() {
 
 /**
  * Responsável por enviar o último RPS para a NFe.
- * 
+ *
  * @param int $rpsNumber
- * 
+ *
  * @return void
  */
 if (!function_exists('gnfe_put_rps')) {
     function gnfe_put_rps($company, $rpsNumber) {
-        $requestBody = [
-            "name"=>$company['name'],
-            "federalTaxNumber"=> $company['federalTaxNumber'],
-            "address"=> [
-                "country"=> $company['address']['country'],
-                "postalCode"=> $company['address']['postalCode'],
-                "street"=> $company['address']['street'],
-                "number"=> $company['address']['number'],
-                "additionalInformation"=> $company['address']['additionalInformation'],
-                "district"=> $company['address']['district'],
-                "city"=> [
-                    "code"=> $company['address']['city']['code'],
-                    "name"=> $company['address']['city']['name']
-                ],
-                "state"=> $company['address']['state']
-            ],
-            "rpsNumber"=> $rpsNumber + 1
-        ];
-        $requestBody = json_encode($requestBody);
+        $company['rpsNumber'] = $rpsNumber + 1;
+        $requestBody = json_encode($company);
 
         $curl = curl_init();
-        curl_setopt($curl, CURLOPT_URL, 'https://api.nfe.io/v1/companies/' . gnfe_config('company_id'));
-        curl_setopt($curl, CURLOPT_HTTPHEADER, ['Content-Type: application/json', 'Accept: application/json', 'Authorization: ' . gnfe_config('api_key')]);
-        curl_setopt($curl, CURLOPT_TIMEOUT, 30);
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($curl, CURLOPT_CUSTOMREQUEST, 'PUT');
-        curl_setopt($curl, CURLOPT_POSTFIELDS, $requestBody);
+        curl_setopt_array($curl, [
+            CURLOPT_URL => 'https://api.nfe.io/v1/companies/' . gnfe_config('company_id'),
+            CURLOPT_TIMEOUT => 30,
+            CURLOPT_CUSTOMREQUEST => 'PUT',
+            CURLOPT_POSTFIELDS => $requestBody,
+            CURLOPT_HTTPHEADER => [
+                'Content-Type: application/json',
+                'Accept: application/json',
+                'Authorization: ' . gnfe_config('api_key')
+            ]
+        ]);
         $response = json_decode(curl_exec($curl), true);
         $httpCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
         curl_close($curl);
@@ -452,7 +441,7 @@ function gnfe_test_connection() {
 }
 /**
  * Pega o JSON da última nota fiscal emitida do banco de dados da NFe.
- * 
+ *
  * @return array;
  */
 if (!function_exists('gnfe_get_nfes')) {
@@ -811,7 +800,7 @@ function get_product_invoice($invoice_id) {
 
         if ($item['type'] == 'Hosting') {
             $query = 'SELECT tblhosting.billingcycle ,tblhosting.id,tblproductcode.code_service ,tblhosting.packageid,tblhosting.id FROM tblhosting
-            LEFT JOIN tblproducts ON tblproducts.id = tblhosting.packageid 
+            LEFT JOIN tblproducts ON tblproducts.id = tblhosting.packageid
             LEFT JOIN tblproductcode ON tblhosting.packageid = tblproductcode.product_id
             WHERE tblhosting.id = :HOSTING';
 
@@ -922,7 +911,7 @@ function gnfe_show_issue_invoice_conds($clientId) {
         $previousClientCond = Capsule::table('gofas_when_send_nfe')->where('client_id', '=', $clientId)->get(['value'])[0]->value;
 
         $select = '';
 
@@ -936,21 +934,21 @@ function gnfe_show_issue_invoice_conds($clientId) {
 
 if (!function_exists('gnfe_save_client_issue_invoice_cond')) {
     /**
-     * Insert the clientId and his condition of sending invoice in the table gofas_when_send_nfe.
+     * Insert the clientId and his condition of sending invoice in the table mod_nfeio_custom_configs.
      * @var $client int
      * @var $invoiceCond string
      */
     function gnfe_save_client_issue_invoice_cond($clientId, $newCond) {
-        $previousClientCond = Capsule::table('gofas_when_send_nfe')->where('client_id', '=', $clientId)->get(['value'])[0]->value;
+        $previousClientCond = Capsule::table('mod_nfeio_custom_configs')->where('client_id', '=', $clientId)->get(['value'])[0]->value;
 
         if ($newCond !== $previousClientCond) {
             if ($previousClientCond == null) {
-                Capsule::table('gofas_when_send_nfe')->insert([
+                Capsule::table('mod_nfeio_custom_configs')->insert([
                     'client_id' => $clientId,
                     'value' => $newCond
                 ]);
             } else {
-                Capsule::table('gofas_when_send_nfe')
+                Capsule::table('mod_nfeio_custom_configs')
                     ->where('client_id', '=', $clientId)
                     ->update(['value' => $newCond]);
             }
@@ -963,7 +961,7 @@ function gnfe_save_client_issue_invoice_cond($clientId, $newCond) {
  */
 if (!function_exists('gnfe_insert_issue_nfe_cond_in_database')) {
     function gnfe_insert_issue_nfe_cond_in_database() {
-        $conditions = 'Quando a fatura é gerada,Quando a fatura é paga,Seguir padrão do WHMCS';
+        $conditions = 'Quando a fatura é gerada,Quando a fatura é paga,Seguir configuração do módulo NFE.io';
 
         Capsule::table('tbladdonmodules')->insert(['module' => 'gofasnfeio','setting' => 'issue_note_conditions','value' => $conditions]);
     }
diff --git a/modules/addons/gofasnfeio/hooks.php b/modules/addons/gofasnfeio/hooks.php
index b62bfcb..75ec4bd 100644
--- a/modules/addons/gofasnfeio/hooks.php
+++ b/modules/addons/gofasnfeio/hooks.php
@@ -43,7 +43,9 @@
 
 add_hook('AdminClientProfileTabFields', 1, function($vars) {
     require_once __DIR__ . '/functions.php';
-    return ['Emitir nota fiscal quando' => gnfe_show_issue_invoice_conds($vars['userid'])];
+    if (gnfe_config('issue_note_default_cond') !== 'Manualmente') {
+        return ['Emitir nota fiscal quando' => gnfe_show_issue_invoice_conds($vars['userid'])];
+    }
 });
 
 add_hook('AdminClientProfileTabFieldsSave', 1, function($vars) {
diff --git a/modules/addons/gofasnfeio/update.php b/modules/addons/gofasnfeio/update.php
index 8fc2c56..59eb5b2 100644
--- a/modules/addons/gofasnfeio/update.php
+++ b/modules/addons/gofasnfeio/update.php
@@ -35,11 +35,12 @@ function gnfe_verifyInstall() {
             }
         }
 
-        if (!Capsule::schema()->hasTable('gofas_when_send_nfe')) {
+        if (!Capsule::schema()->hasTable('mod_nfeio_custom_configs')) {
             try {
-                Capsule::schema()->table('gofas_when_send_nfe', function ($table) {
+                Capsule::schema()->create('mod_nfeio_custom_configs', function ($table) {
                     $table->increments('id');
                     $table->integer('client_id');
+                    $table->string('key');
                     $table->string('value');
                 });
             } catch (\Exception $e) {
@@ -135,4 +136,4 @@ function set_custom_field_ini_date() {
             $e->getMessage();
         }
     }
-}
\ No newline at end of file
+}

From 80430f71376d8c6ae14c7b703d4b9024515d1d92 Mon Sep 17 00:00:00 2001
From: Bruno Ferreira 
Date: Tue, 29 Jun 2021 09:33:54 -0300
Subject: [PATCH 23/30] =?UTF-8?q?Corre=C3=A7=C3=B5es=20na=20implementa?=
 =?UTF-8?q?=C3=A7=C3=A3o=20de=20emiss=C3=A3o=20personalizada?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/addons/gofasnfeio/functions.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/modules/addons/gofasnfeio/functions.php b/modules/addons/gofasnfeio/functions.php
index 0905fb5..fccfd45 100644
--- a/modules/addons/gofasnfeio/functions.php
+++ b/modules/addons/gofasnfeio/functions.php
@@ -883,14 +883,17 @@ function update_status_nfe($invoice_id,$status) {
     function gnfe_get_client_issue_invoice_cond_from_invoice_id($invoiceId) {
         $clientInvoiceId = localAPI('GetInvoice', ['invoiceid' => $invoiceId])['userid'];
 
-        $clientCond = Capsule::table('mod_nfeio_custom_configs')->where('client_id', '=', $clientInvoiceId)->get(['value'])[0]->value;
+        $clientCond = Capsule::table('mod_nfeio_custom_configs')
+            ->where('client_id', '=', $clientInvoiceId)
+            ->where('key', '=', 'issue_nfe_cond')
+            ->get(['value'])[0]->value;
         $clientCond = strtolower($clientCond);
 
-        if ($clientCond !== null && $clientCond !== 'seguir padrão do whmcs') {
+        if ($clientCond !== null && $clientCond !== 'seguir configuração do módulo nfe.io') {
             return $clientCond;
         }
 
-        return 'seguir padrão do whmcs';
+        return 'seguir configuração do módulo nfe.io';
     }
 }
 
@@ -917,10 +920,10 @@ function gnfe_show_issue_invoice_conds($clientId) {
             unset($conditions[$previousCondKey]);
             $select .= '';
         } else {
-            $defaultCond = 'Seguir padrão do WHMCS';
+            $defaultCond = 'Seguir configuração do módulo NFE.io';
             $defaultCondKey = array_search($defaultCond, $conditions);
             unset($conditions[$defaultCondKey]);
-            $select .= '';
+            $select .= '';
         }
 
         foreach ($conditions as $cond) {
@@ -944,12 +947,14 @@ function gnfe_save_client_issue_invoice_cond($clientId, $newCond) {
         if ($newCond !== $previousClientCond) {
             if ($previousClientCond == null) {
                 Capsule::table('mod_nfeio_custom_configs')->insert([
+                    'key' => 'issue_nfe_cond',
                     'client_id' => $clientId,
                     'value' => $newCond
                 ]);
             } else {
                 Capsule::table('mod_nfeio_custom_configs')
                     ->where('client_id', '=', $clientId)
+                    ->where('key', '=', 'issue_nfe_cond')
                     ->update(['value' => $newCond]);
             }
         }

From 82b16f292688a17a1bdfcb9df505da4cf98f1f17 Mon Sep 17 00:00:00 2001
From: Bruno Ferreira 
Date: Tue, 29 Jun 2021 09:37:25 -0300
Subject: [PATCH 24/30] =?UTF-8?q?Adicionada=20verifica=C3=A7=C3=A3o=20se?=
 =?UTF-8?q?=20tabela=20custom=5Fconfigs=20existe=20no=20hook=20do=20perfil?=
 =?UTF-8?q?=20do=20usu=C3=A1rio?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/addons/gofasnfeio/functions.php                  | 1 -
 modules/addons/gofasnfeio/hooks.php                      | 4 +---
 .../addons/gofasnfeio/hooks/customclientissueinvoice.php | 9 +++++++++
 modules/addons/gofasnfeio/hooks/invoicecreation.php      | 4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 modules/addons/gofasnfeio/hooks/customclientissueinvoice.php

diff --git a/modules/addons/gofasnfeio/functions.php b/modules/addons/gofasnfeio/functions.php
index fccfd45..8da7684 100644
--- a/modules/addons/gofasnfeio/functions.php
+++ b/modules/addons/gofasnfeio/functions.php
@@ -897,7 +897,6 @@ function gnfe_get_client_issue_invoice_cond_from_invoice_id($invoiceId) {
     }
 }
 
-
 if (!function_exists('gnfe_show_issue_invoice_conds')) {
     /**
      * Returns a