Merge branch 'release/4.50.0'

Author: r-martins

composer.json

@@ -2,7 +2,7 @@
     "name": "ricardomartins/pagbank-woocommerce",
     "description": "Integração PagBank (PagSeguro) WooCommerce com desconto nas taxas oficiais",
     "type": "wordpress-plugin",
-    "version": "4.49.0",
+    "version": "4.50.0",
     "license": "GPL-3.0",
     "autoload": {
         "psr-4": {

readme.txt

@@ -5,7 +5,7 @@ Donate link: https://github.com/sponsors/r-martins
 Requires at least: 4.0
 Tested up to: 6.9
 Requires PHP: 7.4
-Stable tag: 4.49.0
+Stable tag: 4.50.0
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 PagBank com PIX, Cartão de Crédito, Boleto, Recorrência + Envio Fácil e com Menos Taxas no PagSeguro.
@@ -239,6 +239,9 @@ A confirmação é exibida ainda na tela de sucesso, e pode opcionalmente dispar
 Sim! Você pode [configurar descontos percentuais ou fixos](https://ajuda.pbintegracoes.com/hc/pt-br/articles/19945430928909-Oferecer-Desconto-Pix-e-Boleto) para PIX e Boleto diretamente nas configurações do plugin.
 
 == Changelog ==
+= 4.50.0 =
+* Melhoria: na geração de boletos, quando nome da empresa e CNPJ forem informados, usaremos estas informações como dados do pagador.
+* Correção que impedia integração com Dokan ser ativada em alguns cenarios
 
 = 4.49.0=
 * Melhoria: agora é possível filtrar assinaturas por e-mail do cliente

rm-pagbank.php

@@ -11,7 +11,7 @@
  * Plugin Name:       PagBank Connect
  * Plugin URI:        https://pbintegracoes.com
  * Description:       Integra seu WooCommerce com as APIs PagSeguro v4 através da aplicação de Ricardo Martins (com descontos nas taxas oficiais), com suporte a PIX transparente e muito mais.
- * Version:           4.49.0
+ * Version:           4.50.0
  * Requires at least: 5.2
  * Tested up to:      6.9
  * Requires PHP:      7.4
@@ -33,7 +33,7 @@
 defined( 'ABSPATH' ) || die( 'No direct script access allowed!' );
 
 // Plugin constants.
-define( 'WC_PAGSEGURO_CONNECT_VERSION', '4.49.0' );
+define( 'WC_PAGSEGURO_CONNECT_VERSION', '4.50.0' );
 define( 'WC_PAGSEGURO_CONNECT_PLUGIN_FILE', __FILE__ );
 define( 'WC_PAGSEGURO_CONNECT_BASE_DIR', __DIR__ );
 define( 'WC_PAGSEGURO_CONNECT_TEMPLATES_DIR', WC_PAGSEGURO_CONNECT_BASE_DIR . '/src/templates/' );
@@ -91,17 +91,25 @@
         $fields = include WC_PAGSEGURO_CONNECT_BASE_DIR.'/admin/views/settings/dokan-split-fields.php';
 
         foreach ($fields as $key => $field) {
+            // HTML form uses $key as name attribute, so we need to check $_POST[$key]
+            // Skip title fields as they don't have values
+            if ($field['type'] === 'title') {
+                continue;
+            }
+            
             if ($field['type'] === 'checkbox') {
-                $integrations_settings[$key] = isset($_POST[$field['id']]) ? 'yes' : 'no';
+                $integrations_settings[$key] = isset($_POST[$key]) ? 'yes' : 'no';
             } else {
-                $integrations_settings[$key] = isset($_POST[$field['id']]) ? sanitize_text_field($_POST[$field['id']]) : '';
+                $integrations_settings[$key] = isset($_POST[$key]) ? sanitize_text_field($_POST[$key]) : '';
             }
         }
 
         // Check mutual exclusivity with Split Payments
         $dokan_split_enabled = $integrations_settings['dokan_split_enabled'] ?? 'no';
-        $gateway = new Connect\Gateway();
-        $split_payments_enabled = $gateway->get_option('split_payments_enabled', 'no');
+        // Read directly from database to ensure we get the most recent value
+        // This is important because the Gateway instance might have cached/old values
+        $gateway_settings = get_option('woocommerce_rm-pagbank_settings', []);
+        $split_payments_enabled = $gateway_settings['split_payments_enabled'] ?? 'no';
 
         if ($dokan_split_enabled === 'yes' && $split_payments_enabled === 'yes') {
             add_settings_error(

src/Connect/Gateway.php

@@ -95,18 +95,7 @@ public function process_admin_options()
             'info'
         );
 
-        // Check mutual exclusivity with Dokan Split
-        $integrations_settings = get_option('woocommerce_rm-pagbank-integrations_settings', []);
-        $dokan_split_enabled = $integrations_settings['dokan_split_enabled'] ?? 'no';
-        
-        if ($split_enabled === 'yes' && $dokan_split_enabled === 'yes') {
-            WC_Admin_Settings::add_error(
-                __('Não é possível ativar Divisão de Pagamentos enquanto o Split Dokan estiver ativo. Desative o Split Dokan primeiro.', 'pagbank-connect')
-            );
-            // Don't save split payments if Dokan is enabled
-            $split_enabled = 'no';
-            $this->update_option('split_payments_enabled', 'no');
-        }
+        // Mutual exclusivity check is now handled by validate_split_payments_enabled_field()
 
         // Fetch Account ID from API when split is being enabled
         $primary_account_id_to_save = null;
@@ -246,11 +235,23 @@ public function process_admin_options()
         // Remove from POST to prevent any other processing
         unset($_POST[$field_key]);
 
-        // Call parent to process other fields
+        // Call parent to process other fields (this will call validate_split_payments_enabled_field)
         parent::process_admin_options();
 
-        // Save Account ID if it was fetched from API
-        if ($primary_account_id_to_save !== null) {
+        // After parent processes, read the validated value
+        $validated_split_enabled = $this->get_option('split_payments_enabled', 'no');
+        
+        // If validation rejected the split (returned 'no'), clear receivers
+        if ($validated_split_enabled !== 'yes' && $split_enabled === 'yes') {
+            $this->update_option('split_payments_receivers', []);
+            \RM_PagBank\Helpers\Functions::log(
+                'Gateway::process_admin_options - Split de pagamentos foi rejeitado pela validação, limpando receivers',
+                'info'
+            );
+        }
+        
+        // Save Account ID if it was fetched from API and split is still enabled
+        if ($primary_account_id_to_save !== null && $validated_split_enabled === 'yes') {
             $this->update_option('split_payments_primary_account_id', $primary_account_id_to_save);
             \RM_PagBank\Helpers\Functions::log(
                 'Gateway::process_admin_options - Account ID Principal salvo após process_admin_options: ' . $primary_account_id_to_save,
@@ -450,7 +451,32 @@ public function validate_recurring_enabled_field($key, $recurring_enabled): stri
         return $recurring_enabled ? 'yes' : 'no';
     }
 
-    
+    /**
+     * Validates split payments enabled field - checks mutual exclusivity with Dokan Split
+     *
+     * @param string $key
+     * @param mixed $value
+     * @return string
+     * @noinspection PhpUnused
+     * @noinspection PhpUnusedParameterInspection
+     */
+    public function validate_split_payments_enabled_field($key, $value): string
+    {
+        $split_enabled = $value ? 'yes' : 'no';
+        
+        // Check mutual exclusivity with Dokan Split
+        $integrations_settings = get_option('woocommerce_rm-pagbank-integrations_settings', []);
+        $dokan_split_enabled = $integrations_settings['dokan_split_enabled'] ?? 'no';
+        
+        if ($split_enabled === 'yes' && $dokan_split_enabled === 'yes') {
+            WC_Admin_Settings::add_error(
+                __('Não é possível ativar Divisão de Pagamentos enquanto o Split Dokan estiver ativo. Desative o Split Dokan primeiro.', 'pagbank-connect')
+            );
+            return 'no';
+        }
+        
+        return $split_enabled;
+    }
 
 	/**
 	 * Validates the inputed connect key and save additional information like public key and sandbox mode

src/Connect/Payments/Boleto.php

@@ -93,14 +93,39 @@ public function prepare(): array
         $boleto->setInstructionLines($instruction_lines);
 
         //cpf or cnpj
-        $customerData = $this->getCustomerData();
-        $taxId = $customerData->getTaxId();
-        if (wc_string_to_bool($this->order->get_meta('_rm_pagbank_checkout_blocks'))) {
-            $taxId = $this->order->get_meta('_rm_pagbank_customer_document');
+        $billingCompany = $this->order->get_billing_company();
+        $taxId = null;
+        
+        // Always check for CNPJ first (independent of company name)
+        $taxId = Functions::getParamFromOrderMetaOrPost($this->order, '_billing_cnpj', 'billing_cnpj');
+        
+        // If CNPJ not found in order meta/post, try from customer meta (only if customer exists)
+        if (empty($taxId) && $this->order->get_customer_id()) {
+            $wcCustomer = new \WC_Customer($this->order->get_customer_id());
+            $taxId = $wcCustomer->get_meta('billing_cnpj');
+        }
+        
+        // If still no taxId (no CNPJ found), use the standard customer data method (checks CPF first, then CNPJ)
+        if (empty($taxId)) {
+            $customerData = $this->getCustomerData();
+            $taxId = $customerData->getTaxId();
+            if (wc_string_to_bool($this->order->get_meta('_rm_pagbank_checkout_blocks'))) {
+                $taxId = $this->order->get_meta('_rm_pagbank_customer_document');
+            }
+        }
+        
+        // Clean taxId (remove non-numeric characters)
+        if (!empty($taxId)) {
+            $taxId = Params::removeNonNumeric($taxId);
         }
 
         $holder = new Holder();
-        $holder->setName($this->order->get_billing_first_name() . ' ' . $this->order->get_billing_last_name());
+        // Use company name if available, otherwise use person name
+        if (!empty($billingCompany)) {
+            $holder->setName(trim($billingCompany));
+        } else {
+            $holder->setName($this->order->get_billing_first_name() . ' ' . $this->order->get_billing_last_name());
+        }
         $holder->setTaxId($taxId);
         $holder->setEmail($this->order->get_billing_email());