diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 355bc791..01f4022d 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -28,7 +28,7 @@ No interesse de promover um ambiente aberto e acolhedor, nós, como colaboradore - Desvios, argumentos de tom e outras formas de jogar com os desejos das pessoas de serem gentis não são bem-vindos, especialmente em discussões sobre violações a este Código de Conduta. - Por favor, evite críticas não construtivas. - Da mesma forma, qualquer spamming, trolling, flaming, baiting ou outro comportamento de roubo de atenção não é bem-vindo. -- Patrocinadores do vindi-woocommerce-subscriptions também estão sujeitos a este Código de Conduta. Em particular, os patrocinadores são obrigados a não usar imagens sexualizadas, atividades ou outro material que não esteja de acordo com este Código de Conduta. +- Patrocinadores do Vindi Hub também estão sujeitos a este Código de Conduta. Em particular, os patrocinadores são obrigados a não usar imagens sexualizadas, atividades ou outro material que não esteja de acordo com este Código de Conduta. ## Nossas Responsabilidades @@ -42,7 +42,7 @@ Este Código de Conduta se aplica tanto nos espaços do projeto quanto nos espa ## Cumprimento -Casos de comportamento abusivo, ofensivo ou inaceitável podem ser relatados entrando em contato com a equipe do projeto em comunidade@vindi.com.br. A equipe do projeto analisará e investigará todas as reclamações e responderá da maneira que julgar apropriada às circunstâncias. A equipe do projeto é obrigada a manter a confidencialidade em relação ao relator de um incidente. Detalhes adicionais de políticas de execução específicas podem ser publicados separadamente. Esse código de conduta delineia nossas expectativas para os participantes da comunidade vindi-woocommerce-subscriptions, bem como as etapas para relatar comportamento inaceitável. Estamos comprometidos em fornecer uma +Casos de comportamento abusivo, ofensivo ou inaceitável podem ser relatados entrando em contato com a equipe do projeto em comunidade@vindi.com.br. A equipe do projeto analisará e investigará todas as reclamações e responderá da maneira que julgar apropriada às circunstâncias. A equipe do projeto é obrigada a manter a confidencialidade em relação ao relator de um incidente. Detalhes adicionais de políticas de execução específicas podem ser publicados separadamente. Esse código de conduta delineia nossas expectativas para os participantes da comunidade Vindi Hub, bem como as etapas para relatar comportamento inaceitável. Estamos comprometidos em fornecer uma acolhedora e inspiradora para todos e esperamos que nosso código de conduta seja honrado. Qualquer pessoa que viole este código de conduta pode ser banida da comunidade. Os mantenedores do projeto que não seguem ou aplicam o Código de Conduta de boa fé podem enfrentar repercussões temporárias ou permanentes, conforme determinado por outros membros da liderança do projeto. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 659a0871..421727d5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ -# Contribuindo para o Vindi-Woocommerce +# Contribuindo para o Vindi Hub :clap::grin: Antes de mais nada, muito obrigado por sua contribuição :thumbsup: diff --git a/README.md b/README.md index 59cf70ea..ffd83bc4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Vindi Woocommerce 2 +# Vindi Hub Gateway de pagamentos recorrentes para Wordpress | Woocommerce. @@ -7,18 +7,18 @@ Gateway de pagamentos recorrentes para Wordpress | Woocommerce. [![Licença do Software][badge-license]](LICENSE) [![Última Versão no WordPress][badge-version]][link-version] -**Vindi WooCommerce 2** oferece uma solução completa para pagamentos únicos e assinaturas com cartão de crédito e boleto utilizando o [Woocommerce Subscriptions](https://www.woothemes.com/products/woocommerce-subscriptions/). +**Vindi Hub** oferece uma solução completa para pagamentos únicos e assinaturas com cartão de crédito e boleto utilizando o [Woocommerce Subscriptions](https://www.woothemes.com/products/woocommerce-subscriptions/). ## Instalação -Para verificar os requisitos e efetuar a instalação do plugin, basta seguir nosso [Guia de instalação Vindi Woocommerce 2](https://atendimento.vindi.com.br/hc/pt-br/articles/4411755134747-Guia-de-instala%C3%A7%C3%A3o-Vindi-Woocommerce-2). +Para verificar os requisitos e efetuar a instalação do plugin, basta seguir nosso [Guia de instalação Vindi Hub](https://atendimento.vindi.com.br/hc/pt-br/articles/4411755134747-Guia-de-instala%C3%A7%C3%A3o-Vindi-Woocommerce-2). ## Limitações - Não prestamos suporte para problemas oriundos de plugins terceiros, nem ao uso de plugins terceiros; - Não possuimos os métodos pix e débito em conta; - Não recomendamos a utilização simultânea de outros plugins que modificam o checkout; - Não é possível utilizar plugins que criem ou editem descontos. Cupons de desconto integrais não registram o cartão de crédito para cobranças subsequentes; -- Não é possível efetuar upgrades ou downgrades de assinaturas através do plugin Vindi WooCommerce. Modificações dessa natureza devem ser feitas no painel de administração da Vindi Recorrência; +- Não é possível efetuar upgrades ou downgrades de assinaturas através do plugin Vindi hub. Modificações dessa natureza devem ser feitas no painel de administração da Vindi Recorrência; - Na utilização do Woocommerce, ou qualquer plataforma pré-integrada de e-commerce indicamos a integração do emissor de nota fical, como o bling/nfe-io diretamente na plataforma; - Não é possível habilitar no checkout a opção de vender somente para pessoa Jurídica; - Não somos compatíveis ao plugin All Products for WooCommerce Subscriptions. diff --git a/assets/banner.png b/assets/banner.png index 5efc64c3..bcc9a3d0 100644 Binary files a/assets/banner.png and b/assets/banner.png differ diff --git a/phpunit.xml b/phpunit.xml old mode 100755 new mode 100644 diff --git a/readme.txt b/readme.txt index 9eff0c63..80043456 100644 --- a/readme.txt +++ b/readme.txt @@ -1,24 +1,24 @@ -=== Vindi WooCommerce 2 === +=== Vindi Hub === Contributors: apiki, aguiart0, laertejr -Plugin Name: Vindi WooCommerce +Plugin Name: Vindi Hub Plugin URI: https://github.com/vindi/vindi-woocommerce Website Link: https://www.vindi.com.br Tags: vindi, cobrança-recorrente, vindi-woocommerce, assinaturas, woocommerce-subscriptions Author URI: https://vindi.com.br/ | https://mentores.com.br Author: Vindi | Mentores Digital Requires at least: 4.4 -Tested up to: 6.4 +Tested up to: 6.8 WC requires at least: 3.0.0 WC tested up to: 8.6.1 Requires PHP: 5.6 -Stable Tag: 1.3.7 +Stable Tag: 1.4.2 License: GPLv3 License URI: http://www.gnu.org/licenses/gpl-3.0.html Venda de assinaturas de produtos e serviços pelo plugin de cobrança recorrente para o WooCommerce. == Description == -O **Vindi WooCommerce** oferece uma solução completa para pagamentos únicos e assinaturas com cartão de crédito, boleto, bolePix e Pix utilizando o [Woocommerce Subscriptions](https://www.woothemes.com/products/woocommerce-subscriptions/). Basta ter [uma conta habilitada na Vindi](https://www.vindi.com.br/cadastro/) para começar a cobrar seus clientes. +O **Vindi Hub** oferece uma solução completa para pagamentos únicos e assinaturas com cartão de crédito, boleto, bolePix e Pix utilizando o [Woocommerce Subscriptions](https://www.woothemes.com/products/woocommerce-subscriptions/). Basta ter [uma conta habilitada na Vindi](https://www.vindi.com.br/cadastro/) para começar a cobrar seus clientes. A [Vindi](https://www.vindi.com.br/) é líder em cobrança recorrente no Brasil. Com milhares de clientes usando soluções como pagamento online, soluções de notas fiscais integradas, emissão de boletos por email e PDF, integrações com ERPs e diversos relatórios, a Vindi possibilita um sistema online completo para negócios de venda recorrente. Além disso, empresas podem usar o gateway de pagamento integrado ao billing recorrente ou para faturas avulsas. @@ -39,6 +39,26 @@ Para dúvidas e suporte técnico, entre em contato com a equipe Vindi através d 5. Configurações de pagamentos via cartão de crédito == Changelog == += 1.4.2 - 29/09/2025 = +-Lançamento da versão de patch. +- **Correção:** Hook de criação e atualização de produtos alterados. + += 1.4.1 - 08/08/2025 = +-Lançamento da versão de patch. +- **Melhoria:** Alteração no nome do plugin. + += 1.4.0 - 31/07/2025 = +-Lançamento da versão de patch. +- **Correção:** fatal error ao excluir posts. + += 1.3.9 - 05/06/2025 = +-Lançamento da versão de patch. +- **Melhoria:** Adaptando o plugin para HPos. + += 1.3.8 - 24/04/2025 = +-Lançamento da versão de patch. +- **Correção:** Alteração no test up de 6.4 para 6.8. + = 1.3.7 - 05/11/2024 = -Lançamento da versão de patch. - **Correção:** Alteração no método de pagamento para assinaturas ativas. @@ -278,8 +298,8 @@ Patch de correções para o plugin Vindi == License == -Vindi WooCommerce is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. +Vindi Hub is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -Vindi WooCommerce is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +Vindi Hub is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License along with Vindi WooCommerce. If not, see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with Vindi Hub. If not, see http://www.gnu.org/licenses/. diff --git a/src/assets/js/editpost.js b/src/assets/js/editpost.js index d6d10070..b73fa6ac 100644 --- a/src/assets/js/editpost.js +++ b/src/assets/js/editpost.js @@ -1,13 +1,16 @@ jQuery(document).ready(function ($) { - let side = document.querySelector(".page-title-action"); - if (side && orderData.typePost == "shop_order") { - let button = document.createElement('a'); - button.className = 'button button-primary'; - button.style.marginLeft = '10px'; - button.style.marginTop = '10px'; - button.setAttribute("target", "_blank"); - button.innerText = "Gerar Link de Pagamento"; - button.setAttribute("href", `${location.origin}/wp-admin/post-new.php?post_type=shop_order&vindi-payment-link=true`); - side.after(button); + if (orderData.isOrderPage) { + let side = document.querySelector(".page-title-action"); + if (side && !document.querySelector('#vindi-payment-link-btn')) { + let button = document.createElement('a'); + button.id = 'vindi-payment-link-btn'; + button.className = 'button button-primary'; + button.style.marginLeft = '10px'; + button.style.marginTop = '10px'; + button.setAttribute("target", "_blank"); + button.innerText = "Gerar Link de Pagamento"; + button.setAttribute("href", `${location.origin}/wp-admin/post-new.php?post_type=shop_order&vindi-payment-link=true`); + side.after(button); + } } -}) \ No newline at end of file +}); diff --git a/src/controllers/PlansController.php b/src/controllers/PlansController.php index d40f04b2..ee6bba84 100644 --- a/src/controllers/PlansController.php +++ b/src/controllers/PlansController.php @@ -2,6 +2,8 @@ namespace VindiPaymentGateways; +use WC_Subscriptions_Product; + /** * Creation and edition of products with reflection within Vindi * @@ -26,24 +28,49 @@ class PlansController /** * @var VindiLogger */ - private $logger; + private $logger; /** * @var array */ - private $allowedTypes; + private $allowedTypes; function __construct(VindiSettings $vindi_settings) { $this->routes = $vindi_settings->routes; $this->logger = $vindi_settings->logger; - $this->allowedTypes = array('variable-subscription', 'subscription'); + $this->allowedTypes = array('variable-subscription', 'subscription'); - add_action('wp_insert_post', array($this, 'create'), 10, 3); + add_action('wp_insert_post', array($this, 'handle_post_insert'), 20, 3); + add_action('woocommerce_update_product', array($this, 'update'), 10, 2); add_action('wp_trash_post', array($this, 'trash'), 10, 1); add_action('untrash_post', array($this, 'untrash'), 10, 1); } + function handle_post_insert($post_id, $post, $update) + { + if ($post->post_type !== 'product') { + return; + } + + if (str_contains($post->post_status, 'draft')) { + return; + } + + $product = wc_get_product($post_id); + + if (!$product || !in_array($product->get_type(), $this->allowedTypes)) { + return; + } + + $vindi_plan_id = $product->get_meta('vindi_plan_id', true); + if (!empty($vindi_plan_id)) { + return; + } + + $this->create($post_id, $product); + } + /** * When the user creates a subscription in Woocomerce, it is created in the Vindi. * @@ -52,46 +79,42 @@ function __construct(VindiSettings $vindi_settings) * * @SuppressWarnings(PHPMD.MissingImport) */ - function create($post_id, $post, $update, $recreated = false) + function create($product_id, $product = null) { + if (!$product) { + $product = wc_get_product($product_id); + } - // Check if the post is a draft - if (strpos(get_post_status($post_id), 'draft') !== false) { + if (!$product) { return; } - // Check if the post is product - if (get_post_type($post_id) != 'product') { + + $post_status = $product->get_status(); + if (str_contains($post_status, 'draft')) { return; } - $post_meta = new PostMeta(); - if ($post_meta->check_vindi_item_id($post_id, 'vindi_plan_id') > 1) { - update_post_meta($post_id, 'vindi_plan_id', ''); - } - - if ($post_meta->check_vindi_item_id($post_id, 'vindi_product_id') > 1) { - update_post_meta($post_id, 'vindi_product_id', ''); - } - - // Check if it's a new post - // The $update value is unreliable because of the auto_draft functionality - $post_status = get_post_status($post_id); - $vindi_plan_id = get_post_meta($post_id, 'vindi_plan_id', true); - - if (!$recreated && $post_status != 'publish' || !empty($vindi_plan_id)) { - return $this->update($post_id); - } + if (!in_array($product->get_type(), $this->allowedTypes)) { + return; + } - $product = wc_get_product($post_id); + $vindi_plan_id = $product->get_meta('vindi_plan_id', true); + if (!empty($vindi_plan_id)) { + return; + } - // Check if the post is of the subscription type - if (!in_array($product->get_type(), $this->allowedTypes)) { - return; - } + $post_meta = new PostMeta(); + if ($post_meta->check_vindi_item_id($product_id, 'vindi_plan_id') > 1) { + $product->update_meta_data('vindi_plan_id', ''); + $product->save_meta_data(); + } + if ($post_meta->check_vindi_item_id($product_id, 'vindi_product_id') > 1) { + $product->update_meta_data('vindi_product_id', ''); + $product->save_meta_data(); + } // Checks if the plan is a variation and creates it if ($product->get_type() == 'variable-subscription') { - $variations = $product->get_available_variations(); $variations_products = $variations_plans = []; @@ -103,13 +126,13 @@ function create($post_id, $post, $update, $recreated = false) $interval_type = $variation_product->get_meta('_subscription_period'); $interval_count = $variation_product->get_meta('_subscription_period_interval'); $plan_interval = VindiConversions::convert_interval($interval_count, $interval_type); - $variation_id = $variation['variation_id']; + $variation_id = $variation['variation_id']; - $plan_installments = $variation_product->get_meta("vindi_max_credit_installments_$variation_id"); + $plan_installments = $variation_product->get_meta("vindi_max_credit_installments_$variation_id"); - if (!$plan_installments || $plan_installments === 0) { - $plan_installments = 1; - } + if (!$plan_installments || $plan_installments === 0) { + $plan_installments = 1; + } $trigger_day = VindiConversions::convertTriggerToDay( $product->get_meta('_subscription_trial_length'), @@ -117,21 +140,21 @@ function create($post_id, $post, $update, $recreated = false) ); // Creates the product within the Vindi - $vindi_product_id = get_post_meta($post_id, 'vindi_product_id', true); + $vindi_product_id = $product->get_meta('vindi_product_id', true); $createdProduct = !empty($vindi_product_id) ? $this->routes->findProductById($vindi_product_id) : - $this->routes->createProduct( - array( - 'name' => VINDI_PREFIX_PRODUCT . $data['name'], - 'code' => 'WC-' . $data['id'], - 'status' => ($data['status'] == 'publish') ? 'active' : 'inactive', - 'invoice' => 'always', - 'pricing_schema' => array( - 'price' => ($data['price']) ? $data['price'] : 0, - 'schema_type' => 'flat', - ) - ) - ); + $this->routes->createProduct( + array( + 'name' => VINDI_PREFIX_PRODUCT . $data['name'], + 'code' => 'WC-' . $data['id'], + 'status' => ($data['status'] == 'publish') ? 'active' : 'inactive', + 'invoice' => 'always', + 'pricing_schema' => array( + 'price' => ($data['price']) ? $data['price'] : 0, + 'schema_type' => 'flat', + ) + ) + ); // Creates the plan within the Vindi $createdPlan = $this->routes->createPlan(array( @@ -142,7 +165,7 @@ function create($post_id, $post, $update, $recreated = false) 'billing_trigger_day' => $trigger_day, 'billing_cycles' => ($product->get_meta('_subscription_length') == 0) ? null : $product->get_meta('_subscription_length'), 'code' => 'WC-' . $data['id'], - 'installments' => $plan_installments, + 'installments' => $plan_installments, 'status' => ($data['status'] == 'publish') ? 'active' : 'inactive', 'plan_items' => array( ($product->get_meta('_subscription_length') == 0) ? array( @@ -156,22 +179,29 @@ function create($post_id, $post, $update, $recreated = false) $variations_products[$variation['variation_id']] = $createdProduct; $variations_plans[$variation['variation_id']] = $createdPlan; - // Saving product id and plan in the WC goal - if (isset($variation['variation_id']) && $createdProduct['id']) { - update_post_meta($variation['variation_id'], 'vindi_product_id', $createdProduct['id']); - } + if (isset($variation['variation_id']) && $createdProduct['id']) { + $variation_product = wc_get_product($variation['variation_id']); + $variation_product->update_meta_data('vindi_product_id', $createdProduct['id']); + $variation_product->save_meta_data(); + } - if (isset($variation['variation_id']) && $createdPlan['id']) { - update_post_meta($variation['variation_id'], 'vindi_plan_id', $createdPlan['id']); - } + if (isset($variation['variation_id']) && $createdPlan['id']) { + $variation_product = wc_get_product($variation['variation_id']); + $variation_product->update_meta_data('vindi_plan_id', $createdPlan['id']); + $variation_product->save_meta_data(); + } } - $product_id = end($variations_products)['id']; + $variation_id = array_key_last($variations_products); - if ($product_id) { - update_post_meta($post_id, 'vindi_product_id', end($variations_products)['id']); - update_post_meta($post_id, 'vindi_plan_id', end($variations_products)['id']); - } + if ($variation_id) { + $variation_product = wc_get_product($variation_id); + if ($variation_product) { + $variation_product->update_meta_data('vindi_product_id', end($variations_products)['id']); + $variation_product->update_meta_data('vindi_plan_id', end($variations_plans)['id']); + $variation_product->save_meta_data(); + } + } return array( 'product' => $variations_products, @@ -181,9 +211,15 @@ function create($post_id, $post, $update, $recreated = false) $data = $product->get_data(); - - $interval_type = $product->get_meta('_subscription_period'); - $interval_count = $product->get_meta('_subscription_period_interval'); + if (class_exists('WC_Subscriptions_Product')) { + $interval_type = WC_Subscriptions_Product::get_period($product); + $interval_count = WC_Subscriptions_Product::get_interval($product); + $subscription_length = WC_Subscriptions_Product::get_length($product); + } else { + $interval_type = $product->get_meta('_subscription_period'); + $interval_count = $product->get_meta('_subscription_period_interval'); + $subscription_length = $product->get_meta('_subscription_length'); + } $plan_interval = VindiConversions::convert_interval($interval_count, $interval_type); $trigger_day = VindiConversions::convertTriggerToDay( @@ -191,27 +227,28 @@ function create($post_id, $post, $update, $recreated = false) $product->get_meta('_subscription_trial_period') ); - $plan_installments = $product->get_meta("vindi_max_credit_installments_$post_id"); - if (!$plan_installments || $plan_installments === 0) { - $plan_installments = 1; - } + + $plan_installments = $product->get_meta("vindi_max_credit_installments_$product_id"); + if (!$plan_installments || $plan_installments === 0) { + $plan_installments = 1; + } // Creates the product within the Vindi - $vindi_product_id = get_post_meta($post_id, 'vindi_product_id', true); + $vindi_product_id = $product ? $product->get_meta('vindi_product_id', true) : ''; $createdProduct = !empty($vindi_product_id) ? $this->routes->findProductById($vindi_product_id) : - $this->routes->createProduct( - array( - 'name' => VINDI_PREFIX_PRODUCT . $data['name'], - 'code' => 'WC-' . $data['id'], - 'status' => ($data['status'] == 'publish') ? 'active' : 'inactive', - 'invoice' => 'always', - 'pricing_schema' => array( - 'price' => ($data['price']) ? $data['price'] : 0, - 'schema_type' => 'flat', - ) - ) - ); + $this->routes->createProduct( + array( + 'name' => VINDI_PREFIX_PRODUCT . $data['name'], + 'code' => 'WC-' . $data['id'], + 'status' => ($data['status'] == 'publish') ? 'active' : 'inactive', + 'invoice' => 'always', + 'pricing_schema' => array( + 'price' => ($data['price']) ? $data['price'] : 0, + 'schema_type' => 'flat', + ) + ) + ); // Creates the plan within the Vindi $createdPlan = $this->routes->createPlan(array( @@ -220,28 +257,29 @@ function create($post_id, $post, $update, $recreated = false) 'interval_count' => $plan_interval['interval_count'], 'billing_trigger_type' => 'beginning_of_period', 'billing_trigger_day' => $trigger_day, - 'billing_cycles' => ($product->get_meta('_subscription_length') == 0) ? null : $product->get_meta('_subscription_length'), + 'billing_cycles' => ($subscription_length == 0) ? null : $subscription_length, 'code' => 'WC-' . $data['id'], - 'installments' => $plan_installments, + 'installments' => $plan_installments, 'status' => ($data['status'] == 'publish') ? 'active' : 'inactive', 'plan_items' => array( - ($product->get_meta('_subscription_length') == 0) ? array( + ($subscription_length == 0) ? array( 'product_id' => $createdProduct['id'] ) : array( - 'cycles' => $product->get_meta('_subscription_length'), + 'cycles' => $subscription_length, 'product_id' => $createdProduct['id'] ) ), )); - // Saving product id and plan in the WC goal - if ($createdProduct && isset($createdProduct['id'])) { - update_post_meta($post_id, 'vindi_product_id', $createdProduct['id']); - } - if ($createdPlan && isset($createdPlan['id'])) { - update_post_meta($post_id, 'vindi_plan_id', $createdPlan['id']); - } + if ($createdProduct && isset($createdProduct['id'])) { + $product->update_meta_data('vindi_product_id', $createdProduct['id']); + $product->save_meta_data(); + } + if ($createdPlan && isset($createdPlan['id'])) { + $product->update_meta_data('vindi_plan_id', $createdPlan['id']); + $product->save_meta_data(); + } if ($createdPlan && $createdProduct) { set_transient('vindi_product_message', 'created', 60); @@ -257,23 +295,24 @@ function create($post_id, $post, $update, $recreated = false) return $response; } - function update($post_id) + function update($product_id, $product = null) { - $product = wc_get_product($post_id); - - // Check if the post is of the signature type - if (!in_array($product->get_type(), $this->allowedTypes)) { - return; - } + if (!$product) { + $product = wc_get_product($product_id); + } - // Checks whether there is a vindi plan ID created within - if ($product->get_type() == 'subscription') { + if (!$product) { + return; + } - $vindi_plan_id = get_post_meta($post_id, 'vindi_plan_id', true); + if (!in_array($product->get_type(), $this->allowedTypes)) { + return; + } + if ($product->get_type() == 'subscription') { + $vindi_plan_id = $product->get_meta('vindi_plan_id', true); if (empty($vindi_plan_id)) { - - return $this->create($post_id, '', '', true); + return $this->create($product_id, $product); } } @@ -287,27 +326,24 @@ function update($post_id) $variation_product = wc_get_product($variation['variation_id']); // Checks whether there is a vindi plan ID created within - $vindi_plan_id = get_post_meta($variation['variation_id'], 'vindi_plan_id', true); - $vindi_product_id = get_post_meta($variation['variation_id'], 'vindi_product_id', true); + $vindi_plan_id = $variation_product->get_meta('vindi_plan_id', true); + $vindi_product_id = $variation_product->get_meta('vindi_product_id', true); if (empty($vindi_plan_id)) { - - return $this->create($post_id, '', '', true); - break; + return $this->create($product_id, $product); } $data = $variation_product->get_data(); - $interval_type = $variation_product->get_meta('_subscription_period'); $interval_count = $variation_product->get_meta('_subscription_period_interval'); $plan_interval = VindiConversions::convert_interval($interval_count, $interval_type); - $variation_id = $variation['variation_id']; + $variation_id = $variation['variation_id']; - $plan_installments = $variation_product->get_meta("vindi_max_credit_installments_$variation_id"); + $plan_installments = $variation_product->get_meta("vindi_max_credit_installments_$variation_id"); - if (!$plan_installments || $plan_installments === 0) { - $plan_installments = 1; - } + if (!$plan_installments || $plan_installments === 0) { + $plan_installments = 1; + } $trigger_day = VindiConversions::convertTriggerToDay( $product->get_meta('_subscription_trial_length'), @@ -340,7 +376,7 @@ function update($post_id) 'billing_trigger_day' => $trigger_day, 'billing_cycles' => ($product->get_meta('_subscription_length') == 0) ? null : $product->get_meta('_subscription_length'), 'code' => 'WC-' . $data['id'], - 'installments' => $plan_installments, + 'installments' => $plan_installments, 'status' => ($data['status'] == 'publish') ? 'active' : 'inactive', ) ); @@ -366,7 +402,7 @@ function update($post_id) $product->get_meta('_subscription_trial_period') ); - $vindi_product_id = get_post_meta($post_id, 'vindi_product_id', true); + $vindi_product_id = $product->get_meta('vindi_product_id', true); // Updates the product within the Vindi $updatedProduct = $this->routes->updateProduct( @@ -383,11 +419,11 @@ function update($post_id) ) ); - $vindi_plan_id = get_post_meta($post_id, 'vindi_plan_id', true); - $plan_installments = $product->get_meta("vindi_max_credit_installments_$post_id"); - if (!$plan_installments || $plan_installments === 0) { - $plan_installments = 1; - } + $vindi_plan_id = $product->get_meta('vindi_plan_id', true); + $plan_installments = $product->get_meta("vindi_max_credit_installments_$product_id"); + if (!$plan_installments || $plan_installments === 0) { + $plan_installments = 1; + } // Updates the plan within the Vindi $updatedPlan = $this->routes->updatePlan( @@ -400,7 +436,7 @@ function update($post_id) 'billing_trigger_day' => $trigger_day, 'billing_cycles' => ($product->get_meta('_subscription_length') == 0) ? null : $product->get_meta('_subscription_length'), 'code' => 'WC-' . $data['id'], - 'installments' => $plan_installments, + 'installments' => $plan_installments, 'status' => ($data['status'] == 'publish') ? 'active' : 'inactive', ) ); @@ -426,19 +462,23 @@ function update($post_id) */ function trash($post_id) { + $product = wc_get_product($post_id); + + if (!$product) { + return; + } // Check if the post is product - if (get_post_type($post_id) != 'product') { + if ($product->get_type() != 'product') { return; } - $product = wc_get_product($post_id); // Check if the post is of the signature type - if (!in_array($product->get_type(), $this->allowedTypes)) { - return; - } + if (!in_array($product->get_type(), $this->allowedTypes)) { + return; + } - $vindi_product_id = get_post_meta($product->id, 'vindi_product_id', true); - $vindi_plan_id = get_post_meta($product->id, 'vindi_plan_id', true); + $vindi_product_id = $product->get_meta('vindi_product_id', true); + $vindi_plan_id = $product->get_meta('vindi_plan_id', true); if (empty($vindi_product_id) || empty($vindi_plan_id)) { return; @@ -468,19 +508,23 @@ function trash($post_id) */ function untrash($post_id) { + $product = wc_get_product($post_id); + + if (!$product) { + return; + } // Check if the post is product - if (get_post_type($post_id) != 'product') { + if ($product->get_type() != 'product') { return; } - $product = wc_get_product($post_id); // Check if the post is of the signature type - if (!in_array($product->get_type(), $this->allowedTypes)) { - return; - } + if (!in_array($product->get_type(), $this->allowedTypes)) { + return; + } - $vindi_product_id = get_post_meta($product->id, 'vindi_product_id', true); - $vindi_plan_id = get_post_meta($product->id, 'vindi_plan_id', true); + $vindi_product_id = $product->get_meta('vindi_product_id', true); + $vindi_plan_id = $product->get_meta('vindi_plan_id', true); if (empty($vindi_product_id) || empty($vindi_plan_id)) { return; diff --git a/src/controllers/ProductController.php b/src/controllers/ProductController.php index 14ecf76b..f5996a3a 100644 --- a/src/controllers/ProductController.php +++ b/src/controllers/ProductController.php @@ -36,19 +36,20 @@ class ProductController function __construct(VindiSettings $vindi_settings) { - $this->routes = $vindi_settings->routes; - $this->logger = $vindi_settings->logger; - - /** - * Define wich product types to NOT handle in this controller. - * Basically they are the same as the PlansController, but - * the check is reversed to ignore this types - */ - $this->ignoredTypes = array('variable-subscription', 'subscription'); - - add_action('wp_insert_post', array($this, 'create'), 10, 3); - add_action('wp_trash_post', array($this, 'trash'), 10, 1); - add_action('untrash_post', array($this, 'untrash'), 10, 1); + $this->routes = $vindi_settings->routes; + $this->logger = $vindi_settings->logger; + + /** + * Define wich product types to NOT handle in this controller. + * Basically they are the same as the PlansController, but + * the check is reversed to ignore this types + */ + $this->ignoredTypes = array('variable-subscription', 'subscription'); + + add_action('woocommerce_new_product', array($this, 'create'), 10, 2); + add_action('woocommerce_update_product', array($this, 'update'), 10, 2); + add_action('wp_trash_post', array($this, 'trash'), 10, 1); + add_action('untrash_post', array($this, 'untrash'), 10, 1); } /** @@ -59,34 +60,36 @@ function __construct(VindiSettings $vindi_settings) * * @SuppressWarnings(PHPMD.MissingImport) */ - function create($post_id, $post, $update, $recreated = false) + function create($product_id, $product = null) { - // Check if the post is a draft - if (strpos(get_post_status($post_id), 'draft') !== false) { - return; + if (!$product) { + $product = wc_get_product($product_id); } - // Check if the post is product - if (get_post_type($post_id) != 'product') { + + if (!$product) { return; } - $post_meta = new PostMeta(); - if ($post_meta->check_vindi_item_id($post_id, 'vindi_product_id') > 1) { - update_post_meta($post_id, 'vindi_product_id', ''); + + $post_status = $product->get_status(); + if (str_contains($post_status, 'draft')) { + return; } - // Check if it's a new post - // The $update value is unreliable because of the auto_draft functionality - if(!$recreated && get_post_status($post_id) != 'publish' || !empty(get_post_meta($post_id, 'vindi_product_id', true))) { - return $this->update($post_id); + if (in_array($product->get_type(), $this->ignoredTypes)) { + return; } - $product = wc_get_product($post_id); - - // Check if the post is NOT of the subscription type - if (in_array($product->get_type(), $this->ignoredTypes)) { + $vindi_product_id = $product->get_meta('vindi_product_id', true); + if (!empty($vindi_product_id)) { return; } + $post_meta = new PostMeta(); + if ($post_meta->check_vindi_item_id($product_id, 'vindi_product_id') > 1) { + $product->update_meta_data('vindi_product_id', ''); + $product->save_meta_data(); + } + $data = $product->get_data(); // Creates the product within the Vindi @@ -101,9 +104,9 @@ function create($post_id, $post, $update, $recreated = false) ) )); - // Saving product id and plan in the WC goal - if ($createdProduct && isset($createdProduct['id'])) { - update_post_meta( $post_id, 'vindi_product_id', $createdProduct['id'] ); + if ($createdProduct && isset($createdProduct['id'])) { + $product->update_meta_data('vindi_product_id', $createdProduct['id']); + $product->save_meta_data(); set_transient('vindi_product_message', 'created', 60); } else { set_transient('vindi_product_message', 'error', 60); @@ -112,25 +115,27 @@ function create($post_id, $post, $update, $recreated = false) return $createdProduct; } - function update($post_id) + function update($product_id, $product = null) { - $product = wc_get_product($post_id); + if (!$product) { + $product = wc_get_product($product_id); + } + + if (!$product) { + return; + } - // Check if the post is NOT of the subscription type if (in_array($product->get_type(), $this->ignoredTypes)) { return; } - // Checks whether there is a vindi product ID associated within - $vindi_product_id = get_post_meta($post_id, 'vindi_product_id', true); + $vindi_product_id = $product->get_meta('vindi_product_id', true); if(empty($vindi_product_id)) { - - return $this->create($post_id, '', '', true); + return $this->create($product_id, $product); } $data = $product->get_data(); - // Updates the product within the Vindi $updatedProduct = $this->routes->updateProduct( $vindi_product_id, @@ -164,18 +169,16 @@ function update($post_id) function trash($post_id) { // Check if the post is product - if (get_post_type($post_id) != 'product') { + $product = wc_get_product($post_id); + if (!$product) { return; } - - $product = wc_get_product($post_id); - // Check if the post is NOT of the subscription type if (in_array($product->get_type(), $this->ignoredTypes)) { return; } - $vindi_product_id = get_post_meta($post_id, 'vindi_product_id', true); + $vindi_product_id = $product->get_meta('vindi_product_id', true); if(empty($vindi_product_id)) { return; @@ -197,20 +200,17 @@ function trash($post_id) */ function untrash($post_id) { + $product = wc_get_product($post_id); // Check if the post is product - if (get_post_type($post_id) != 'product') { + if (!$product) { return; } - - $product = wc_get_product($post_id); - // Check if the post is NOT of the subscription type if (in_array($product->get_type(), $this->ignoredTypes)) { return; } - $vindi_product_id = get_post_meta($post_id, 'vindi_product_id', true); - + $vindi_product_id = $product->get_meta('vindi_product_id', true); if(empty($vindi_product_id)) { return; } diff --git a/src/i18n/languages/vindi-woocommerce.pot b/src/i18n/languages/vindi-woocommerce.pot index 46c47da8..9fc17117 100644 --- a/src/i18n/languages/vindi-woocommerce.pot +++ b/src/i18n/languages/vindi-woocommerce.pot @@ -2,7 +2,7 @@ # This file is distributed under the same license as the package. msgid "" msgstr "" -"Project-Id-Version: Vindi WooCommerce\n" +"Project-Id-Version: Vindi Hub\n" "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/vindi-plugin\n" "POT-Creation-Date: 2020-06-22 17:57:53+00:00\n" "MIME-Version: 1.0\n" @@ -337,7 +337,7 @@ msgstr "" #: templates/admin-gateway-settings.html.php:6 #: templates/admin-settings.html.php:6 -msgid "Vindi WooCommerce Desabilitado" +msgid "Vindi Hub Desabilitado" msgstr "" #: templates/admin-gateway-settings.html.php:7 @@ -574,12 +574,12 @@ msgstr "" #: views/missing-critical-dependency.php:15 msgid "" -"O Plugin Vindi WooCommerce depende da versão %s+ do %s para funcionar! Como " +"O Plugin Vindi Hub depende da versão %s+ do %s para funcionar! Como " "a versão atual do %s é mais antiga, o plugin foi DESATIVADO!" msgstr "" #: views/missing-dependency.php:15 -msgid "O Plugin Vindi WooCommerce depende da versão %s do %s para funcionar!" +msgid "O Plugin Vindi Hub depende da versão %s do %s para funcionar!" msgstr "" #: views/product-status.php:15 diff --git a/src/includes/admin/CouponsMetaBox.php b/src/includes/admin/CouponsMetaBox.php index 75192ab2..176e49c7 100644 --- a/src/includes/admin/CouponsMetaBox.php +++ b/src/includes/admin/CouponsMetaBox.php @@ -24,7 +24,7 @@ public static function output($coupon_id, $coupon) $arr = array( 'id' => 'cycle_count', 'label' => __('Número de ciclos do cupom', VINDI), - 'value' => get_post_meta($coupon_id, 'cycle_count')[0], + 'value' => $coupon->get_meta('cycle_count', true), 'options' => array( '0' => 'Todos os ciclos', '1' => '1 ciclo', diff --git a/src/includes/admin/ProductsMetabox.php b/src/includes/admin/ProductsMetabox.php index 9e085472..3465766d 100644 --- a/src/includes/admin/ProductsMetabox.php +++ b/src/includes/admin/ProductsMetabox.php @@ -1,4 +1,5 @@ ID); if (!$product) { return; @@ -65,12 +65,16 @@ public function woocommerce_variable_subscription_custom_fields($loop, $variatio private function show_meta_custom_data($subscription_id) { + $product = wc_get_product($subscription_id); + $field_id = "vindi_max_credit_installments_$subscription_id"; + $value = $product ? $product->get_meta($field_id, true) : ''; + echo '
'; woocommerce_wp_text_input( array( - 'id' => "vindi_max_credit_installments_$subscription_id", - 'value' => get_post_meta($subscription_id, "vindi_max_credit_installments_$subscription_id", true), + 'id' => $field_id, + 'value' => $value, 'label' => __('Máximo de parcelas com cartão de crédito', 'woocommerce'), 'type' => 'number', 'description' => 'Esse campo controla a quantidade máxima de parcelas @@ -133,10 +137,9 @@ private function handle_saving_simple_subscription($product) { $post_id = $product->get_id(); - $period = $this->get_post_vars('_subscription_period'); - $interval = $this->get_post_vars('_subscription_period_interval'); + $period = $product->get_meta('_subscription_period', true); + $interval = $product->get_meta('_subscription_period_interval', true); $installments = $this->get_post_vars("vindi_max_credit_installments_$post_id"); - if ($period && $interval) { $this->save_woocommerce_product_custom_fields($post_id, $installments, $period, $interval); } @@ -144,18 +147,19 @@ private function handle_saving_simple_subscription($product) private function save_woocommerce_product_custom_fields($post_id, $installments, $period, $interval) { + $product = wc_get_product($post_id); if ($period === 'year' && $installments > 12) { $installments = 12; } + error_log(var_export("interval: $interval, period: $period, installments: $installments", true)); if ($period === 'month' && $installments > $interval) { $installments = $interval; } - if (!$installments) { $installments = 1; } - - update_post_meta($post_id, "vindi_max_credit_installments_$post_id", $installments); + $product->update_meta_data("vindi_max_credit_installments_$post_id", $installments); + $product->save(); } private function check_credit_payment_active($woocommerce) diff --git a/src/includes/gateways/CreditPayment.php b/src/includes/gateways/CreditPayment.php index 6f1bc4d9..dfa77cbe 100644 --- a/src/includes/gateways/CreditPayment.php +++ b/src/includes/gateways/CreditPayment.php @@ -112,7 +112,6 @@ public function payment_fields() } $is_trial = $this->check_is_trial(); - $this->vindi_settings->get_template('creditcard-checkout.html.php', compact( 'installments', 'is_trial', @@ -237,17 +236,21 @@ protected function get_installments() if ($this->is_single_order()) { return $this->installments; } + $installments = 0; foreach ($this->vindi_settings->woocommerce->cart->cart_contents as $item) { - $plan_id = $item['data']->get_meta('vindi_plan_id'); + $product = $item['data']; + $product_id = $product->get_id(); + + $product_installments = $product->get_meta("vindi_max_credit_installments_$product_id", true); - if (!empty($plan_id)) { - $plan = $this->routes->getPlan($plan_id); + if (!empty($product_installments)) { + $product_installments = intval($product_installments); if ($installments == 0) { - $installments = $plan['installments']; - } elseif ($plan['installments'] < $installments) { - $installments = $plan['installments']; + $installments = $product_installments; + } elseif ($product_installments < $installments) { + $installments = $product_installments; } } } diff --git a/src/routes/RoutesApi.php b/src/routes/RoutesApi.php index 16a989d5..0f7f0c77 100644 --- a/src/routes/RoutesApi.php +++ b/src/routes/RoutesApi.php @@ -52,7 +52,6 @@ public function findProductById($product_id) */ public function createPlan($data) { - $response = $this->api->request('plans', 'POST', $data); return $response['plan']; diff --git a/src/services/Api.php b/src/services/Api.php index c3205b11..c4101c25 100644 --- a/src/services/Api.php +++ b/src/services/Api.php @@ -179,7 +179,7 @@ public function test_api_key($api_key) 'headers' => [ 'Authorization' => 'Basic ' . base64_encode($api_key . ':'), 'Content-Type' => 'application/json', - 'User-Agent' => sprintf('Vindi-WooCommerce/%s; %s', VINDI_VERSION, get_bloginfo('url')), + 'User-Agent' => sprintf('Vindi-Hub/%s; %s', VINDI_VERSION, get_bloginfo('url')), ], 'method' => $method, 'timeout' => 60, diff --git a/src/services/Webhooks.php b/src/services/Webhooks.php index 0d00a143..2b5dadb7 100644 --- a/src/services/Webhooks.php +++ b/src/services/Webhooks.php @@ -6,6 +6,7 @@ use Exception; use WP_Query; use WC_Order; +use WC_Order_Query; class VindiWebhooks { @@ -175,7 +176,7 @@ private function bill_paid($data) $order = $this->find_order_by_subscription_and_cycle($vindi_subscription_id, $cycle); } - $vindi_order = get_post_meta($order->id, 'vindi_order', true); + $vindi_order = $order->get_meta('vindi_order', true); if (!is_array($vindi_order)) { return wp_send_json(['message' => 'Pedido Vindi não encontrado.'], 422); } @@ -435,22 +436,27 @@ private function find_order_by_id($id) * * @return WC_Order */ - private function find_order_by_bill_id($bill_id) + private function find_order_by_bill_id($bill_id) { - $args = array( - 'post_type' => 'shop_order', - 'meta_key' => 'vindi_bill_id', - 'meta_value' => $bill_id, - 'post_status' => 'any', - ); - - $query = new WP_Query($args); - - if (false === $query->have_posts()) - throw new Exception(sprintf(__('Pedido com bill_id #%s não encontrado!', VINDI), $bill_id), 2); - - return wc_get_order($query->post->ID); - } + $query = new WC_Order_Query(array( + 'limit' => 1, + 'type' => 'shop_order', + 'status' => array_keys(wc_get_order_statuses()), + 'meta_key' => 'vindi_bill_id', + 'meta_value' => $bill_id, + 'return' => 'ids', + )); + + $order_ids = $query->get_orders(); + + if (empty($order_ids)) { + throw new Exception( + sprintf(__('Pedido com bill_id #%s não encontrado!', VINDI), $bill_id), 2 + ); + } + + return wc_get_order($order_ids[0]); + } /** * Query orders containing cycle meta diff --git a/src/templates/admin-gateway-settings.html.php b/src/templates/admin-gateway-settings.html.php index 4c685e57..87829682 100644 --- a/src/templates/admin-gateway-settings.html.php +++ b/src/templates/admin-gateway-settings.html.php @@ -3,7 +3,7 @@ vindi_settings->check_ssl()): ?>

- : + : Certificado SSL para ativar este método de pagamento em modo de produção. Por favor, verifique se um certificado SSL está instalado em seu servidor !')); ?>

diff --git a/src/templates/admin-settings.html.php b/src/templates/admin-settings.html.php index 850a824d..2d2b1887 100644 --- a/src/templates/admin-settings.html.php +++ b/src/templates/admin-settings.html.php @@ -4,7 +4,7 @@ if (!$settings->check_ssl()): ?>

- : + : Certificado SSL para ativar este método de pagamento em modo de produção. Por favor, verifique se um certificado SSL está instalado em seu servidor!', VINDI));?>

diff --git a/src/utils/CreditPaymentHelpers.php b/src/utils/CreditPaymentHelpers.php index 04ed7287..a5da86e2 100644 --- a/src/utils/CreditPaymentHelpers.php +++ b/src/utils/CreditPaymentHelpers.php @@ -4,14 +4,17 @@ class CreditHelpers { - public function get_cart_total($cart) { $total = $cart->total; - $recurring = end($cart->recurring_carts); - if (floatval($cart->total) == 0 && is_object($recurring)) { - $total = $recurring->total; + if (is_array($cart->recurring_carts) && !empty($cart->recurring_carts)) { + $recurring = end($cart->recurring_carts); + + if (floatval($cart->total) == 0 && is_object($recurring)) { + $total = $recurring->total; + } } + foreach ($cart->get_fees() as $fee) { if ($fee->name == __('Juros', VINDI)) { $total -= $fee->amount; diff --git a/src/utils/DefinitionVariables.php b/src/utils/DefinitionVariables.php index 653958de..a663e081 100644 --- a/src/utils/DefinitionVariables.php +++ b/src/utils/DefinitionVariables.php @@ -1,6 +1,6 @@ is_shop_order_or_subscription($post)) { - $has_subscription = $this->order_has_subscription($post->ID); - $this->enqueue_notification_script($has_subscription); + + $post_type = isset($post) && isset($post->post_type) ? $post->post_type : null; + $screen_post_type = isset($current_screen) && isset($current_screen->post_type) ? $current_screen->post_type : null; + + if ($this->is_shop_order_or_subscription($post_type) || $this->is_shop_order_or_subscription($screen_post_type)) { + $post_id = isset($post) && isset($post->ID) ? $post->ID : (isset($_GET['id']) ? $_GET['id'] : null); + + if ($post_id) { + $has_subscription = $this->order_has_subscription($post_id); + $this->enqueue_notification_script($has_subscription); + } } } private function is_shop_order_or_subscription($post) { - return $post->post_type === 'shop_order' || $post->post_type === 'shop_subscription'; + return $post === 'shop_order' || $post === 'shop_subscription'; } - private function order_has_subscription($order_id) { $order = wc_get_order($order_id); + if (!$order) { + return false; + } + $subscriptions_product = new WC_Subscriptions_Product(); foreach ($order->get_items() as $item) { @@ -150,15 +162,18 @@ private function enqueue_notification_script($has_subscription) )); } - public function enqueue_payment_link_generator_script() + public function enqueue_payment_link_generator_script($hook) { - $post = get_post_type(); - $dir_path = plugins_url('/assets/js/edit.js', plugin_dir_path(__FILE__)); - wp_register_script('edit-js', $dir_path, array('jquery'), VINDI_VERSION, true); - wp_enqueue_script('edit-js'); - - wp_localize_script('edit-js', 'orderData', array( - 'typePost' => $post - )); + global $current_screen; + + if ($current_screen->post_type === 'shop_order') { + $dir_path = plugins_url('/assets/js/editpost.js', plugin_dir_path(__FILE__)); + wp_register_script('edit-js', $dir_path, array('jquery'), VINDI_VERSION, true); + wp_enqueue_script('edit-js'); + wp_localize_script('edit-js', 'orderData', array( + 'isOrderPage' => true, + 'hpos' => isset($_GET['page']) && $_GET['page'] === 'wc-orders' + )); + } } } diff --git a/src/utils/GenerateUser.php b/src/utils/GenerateUser.php index 7a85a99c..56cf8b97 100644 --- a/src/utils/GenerateUser.php +++ b/src/utils/GenerateUser.php @@ -42,7 +42,7 @@ private function set_customer_data($customer_id, $order) $customer = new WC_Customer($customer_id); $billing_address_2 = $order->get_billing_address_2(); - $billing_neighborhood = get_post_meta($order->get_id(), '_billing_neighborhood', true); + $billing_neighborhood = $order->get_meta('_billing_neighborhood', true); $full_address_2 = ''; if (!empty($billing_address_2) && !empty($billing_neighborhood)) { diff --git a/src/utils/PaymentProcessor.php b/src/utils/PaymentProcessor.php index fc648cac..060b872c 100644 --- a/src/utils/PaymentProcessor.php +++ b/src/utils/PaymentProcessor.php @@ -415,7 +415,12 @@ public function process_order() throw new Exception($message); } - update_post_meta($wc_subscription_id, 'vindi_subscription_id', $subscription_id); + $subscription_obj = wcs_get_subscription( $wc_subscription_id ); + if ( $subscription_obj && is_a( $subscription_obj, 'WC_Subscription' ) ) { + $subscription_obj->update_meta_data( 'vindi_subscription_id', $subscription_id ); + $subscription_obj->save(); + } + continue; } catch (Exception $err) { $message = $err->getMessage(); @@ -480,12 +485,12 @@ private function group_order_items_by_subscription($order_items) private function process_subscription_item($order_item, &$subscriptions_grouped_by_period, &$subscription_products) { $product = $order_item->get_product(); - $product_id = $product->get_id(); if ($this->is_variable($product)) { $product_id = $order_item['variation_id']; + $product = wc_get_product($product_id); } - $period = get_post_meta($product_id, '_subscription_period', true); - $interval = get_post_meta($product_id, '_subscription_period_interval', true); + $period = $product->get_meta('_subscription_period', true); + $interval = $product->get_meta('_subscription_period_interval', true); $subscriptions_grouped_by_period[$period . $interval][] = $order_item; $subscription_products[] = $order_item; } @@ -579,7 +584,7 @@ private function get_cycle_from_product_type($item) } if ($product) { - $cycles = (int) get_post_meta($product->get_id(), '_subscription_length', true); + $cycles = (int) $product->get_meta('_subscription_length', true); } return $cycles > 0 ? $cycles : null; } @@ -593,7 +598,7 @@ private function get_cycle_from_product_type($item) */ private function is_one_time_shipping($product) { - return get_post_meta($product->get_id(), '_subscription_one_time_shipping', true) == 'yes'; + return $product->get_meta('_subscription_one_time_shipping', true) == 'yes'; } /** @@ -812,7 +817,7 @@ protected function build_product_from_order_item_bill($order_items) if ($this->is_variable($product)) { $product_id = $order_item['product_id']; } - $vindi_id = get_post_meta($product_id, 'vindi_product_id', true); + $vindi_id = $product->get_meta('vindi_product_id', true); if (!$vindi_id) { $vindi_id = $this->routes->findProductByCode('WC-' . $product_id)['id']; } @@ -1163,7 +1168,7 @@ protected function build_discount_item_for_subscription($coupon, $order_item, $p */ protected function config_discount_cycles($coupon, $plan_cycles = 0) { - $cycle_count = get_post_meta($coupon->get_id(), 'cycle_count', true); + $cycle_count = $coupon->get_meta('cycle_count', true); if ($coupon->get_discount_type() == 'recurring_percent') { $subscriptions_coupon = new WC_Subscriptions_Coupon(); $cycle_count = $subscriptions_coupon->get_coupon_limit($coupon->get_id()); @@ -1226,12 +1231,13 @@ public function get_plan_from_order_item($order_item) $product = $order_item->get_product(); if (isset($order_item['variation_id']) && $order_item['variation_id'] != 0) { - $vindi_plan = get_post_meta($order_item['variation_id'], 'vindi_plan_id', true); + $product_variation = wc_get_product($order_item['variation_id']); + $vindi_plan = $product_variation ? $product_variation->get_meta('vindi_plan_id', true) : null; if (empty($vindi_plan) || !is_numeric($vindi_plan) || is_null($vindi_plan) || $vindi_plan == 0) { - $vindi_plan = get_post_meta($product->get_id(), 'vindi_plan_id', true); + $vindi_plan = $product->get_meta('vindi_plan_id', true); } } else { - $vindi_plan = get_post_meta($product->get_id(), 'vindi_plan_id', true); + $vindi_plan = $product->get_meta('vindi_plan_id', true); } if ($this->is_subscription_type($product) and !empty($vindi_plan)) { @@ -1494,7 +1500,7 @@ protected function get_product($order_item) $product = $order_item->get_product(); $product_id = $order_item->get_id(); - $vindi_product_id = get_post_meta($product, 'vindi_product_id', true); + $vindi_product_id = $product->get_meta('vindi_product_id', true); if (!$vindi_product_id) { $vindi_product = 63; diff --git a/src/utils/PostMeta.php b/src/utils/PostMeta.php index 5f409af1..7a54a072 100644 --- a/src/utils/PostMeta.php +++ b/src/utils/PostMeta.php @@ -1,6 +1,7 @@ prefix}postmeta - WHERE - meta_key LIKE '$meta' AND - meta_value LIKE $vindi_id - "; - - $result = $wpdb->get_results($sql); - - if (is_array($result) && !empty($result)) { - return count($result); + + $vindi_id = $product->get_meta($meta, true); + + if (!$vindi_id) { + return 0; } - - return 0; + + $args = [ + 'post_type' => 'product', + 'meta_key' => $meta, + 'meta_value' => $vindi_id, + 'fields' => 'ids', + 'posts_per_page' => -1, + ]; + + $query = new WP_Query($args); + + return count($query->posts); } } diff --git a/src/utils/SubscriptionStatusHandler.php b/src/utils/SubscriptionStatusHandler.php index 936f5c8f..2a2f7b74 100644 --- a/src/utils/SubscriptionStatusHandler.php +++ b/src/utils/SubscriptionStatusHandler.php @@ -105,8 +105,15 @@ public function active_status($wc_subscription, $old_status) */ public function get_wc_subscription_id($subscription_id) { - return get_post_meta($subscription_id, 'vindi_subscription_id', true) ? : - get_post_meta($subscription_id, 'vindi_wc_subscription_id', true); + + $subscription = wcs_get_subscription($subscription_id); + if ($subscription) { + $vindi_subscription_id = $subscription->get_meta('vindi_subscription_id', true); + if (!empty($vindi_subscription_id)) { + return $vindi_subscription_id; + } + return $subscription->get_meta('vindi_wc_subscription_id', true); + } } public function get_vindi_subscription_id($wc_subscription) diff --git a/src/views/missing-critical-dependency.php b/src/views/missing-critical-dependency.php index 69d661a6..25d4f20d 100644 --- a/src/views/missing-critical-dependency.php +++ b/src/views/missing-critical-dependency.php @@ -12,7 +12,7 @@

diff --git a/tests/bootstrap.php b/tests/bootstrap.php old mode 100755 new mode 100644 diff --git a/tests/phpunit/vindi/base/test-payment-processor.php b/tests/phpunit/vindi/base/test-payment-processor.php index 26fc1973..bac467f7 100644 --- a/tests/phpunit/vindi/base/test-payment-processor.php +++ b/tests/phpunit/vindi/base/test-payment-processor.php @@ -74,7 +74,8 @@ public function test_processor_build_items() $product->set_price(20); $product->save(); - update_post_meta($product->get_id(), 'vindi_product_id', 63); + $product->update_meta_data('vindi_product_id', 63); + $product->save(); // Arrange: Set up an order $order = WC_Helper_Order::create_order($this->customer->get_id()); diff --git a/tests/phpunit/vindi/base/test-product.php b/tests/phpunit/vindi/base/test-product.php index e3e3a012..416a653c 100644 --- a/tests/phpunit/vindi/base/test-product.php +++ b/tests/phpunit/vindi/base/test-product.php @@ -58,7 +58,8 @@ public function test_create_product() $product_controller = new ProductController($settings); $product = WC_Helper_Product::create_simple_product(); - delete_post_meta($product->get_id(), 'vindi_product_id'); + $product->delete_meta_data('vindi_product_id'); + $product->save(); $createdProduct = $product_controller->create($product->get_id(), '', '', true); $this->assertEquals($createdProduct, $this->mock_data); diff --git a/vindi.php b/vindi.php index a84d0610..872f995d 100644 --- a/vindi.php +++ b/vindi.php @@ -1,14 +1,14 @@