Merge pull request #385 from pagarme/develop

Release 3.2.0

Author: mateus-picoloto

.github/workflows/pr.yml

@@ -43,20 +43,65 @@ jobs:
       -
         name: Install project dependences
         run:
-          php composer.phar install
+          php composer.phar install --no-dev --ignore-platform-reqs
+  phpunit:
+    name: PHP Unit
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout project
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        uses: php-actions/composer@v6
+
+      - name: Unit tests
+        uses: php-actions/phpunit@v3
+        env:
+          XDEBUG_MODE: coverage
+        with:
+          configuration: "phpunit.xml"
+          version: ${{ vars.phpunit_version }}
+          php_version : ${{ vars.unit_tests_php_version }}
+          php_extensions: "xdebug"
+          coverage_clover: "coverage/clover.xml"
+
+      - name: Upload coverage artifact
+        uses: actions/upload-artifact@master
+        with:
+          name: woo-coverage-${{ github.sha }}
+          path: coverage/clover.xml
 
   sonar:
     name: Sonar
     runs-on: ubuntu-latest
+    needs: phpunit
     steps:
       - name: Checkout project
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
+      - name: Download coverage artifact
+        uses: actions/download-artifact@master
+        with:
+          name: woo-coverage-${{ github.sha }}
+          path: coverage
+
       - name: Run Sonar
         uses: sonarsource/sonarcloud-github-action@master
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        with:
+          args: >
+            -Dsonar.php.coverage.reportPaths=coverage/clover.xml
+            -Dsonar.coverage.exclusions=tests/**,assets/**,templates/**,woo-pagarme-payments.php
+            -Dsonar.tests=tests/
+            -Dsonar.sources=src,assets,templates,woo-pagarme-payments.php
+
+      - name: Delete coverage artifact
+        uses: geekyeggo/delete-artifact@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          name: woo-coverage-${{ github.sha }}
 

.gitignore

@@ -5,3 +5,17 @@
 node_modules/
 .idea/
 .vscode/
+.phpunit.result.cache
+.phpunit.cache/
+vendor/antecedent/
+vendor/bin/
+vendor/brain/
+vendor/composer/autoload_files.php
+vendor/hamcrest/
+vendor/mockery/
+vendor/myclabs/
+vendor/nikic/
+vendor/phar-io/
+vendor/phpunit/
+vendor/sebastian/
+vendor/theseer/

assets/javascripts/admin/pagarme_settings.js

@@ -3,14 +3,19 @@
 (   function ($) {
         $('.wc_gateways').on(
             'click',
-            '.wc-payment-gateway-method-toggle-enabled',
+            '.wc-payment-gateway-method-toggle-enabled, .pagarme-toggle-payment-subscription',
             function () {
                 const $link = $(this),
-                      $row = $link.closest('tr'),
-                      $toggle = $link.find('.woocommerce-input-toggle');
+                    $row = $link.closest('tr'),
+                    $toggle = $link.find('.woocommerce-input-toggle');
+
+                let action = 'woocommerce_toggle_gateway_enabled';
+                if ($link.attr('class') === 'pagarme-toggle-payment-subscription') {
+                    action = 'pagarme_toggle_payment_subscription';
+                }
 
                 const data = {
-                    action: 'woocommerce_toggle_gateway_enabled',
+                    action: action,
                     security: pagarme_settings.nonces.gateway_toggle,
                     gateway_id: $row.data('gateway_id'),
                 };

assets/javascripts/front/checkout/model/payment.js

@@ -5,7 +5,10 @@ jQuery(function ($) {
         globalThis.wc_pagarme_checkout = wc_pagarme_checkout;
         $.jMaskGlobals.watchDataMask = true;
         wc_pagarme_checkout.validate = function () {
-            const checkedPayment = $('form .payment_methods input[name="payment_method"]:checked').val();
+            const checkedPayment = $('form .payment_methods input[name="payment_method"]:checked')?.val();
+            if (!checkedPayment) {
+                return true;
+            }
             const requiredFields = $('#shipping_number:visible, input[data-required=true]:visible,' +
                 'select[data-required=true]:visible,' +
                 `.wc_payment_method.payment_method_${checkedPayment} [data-pagarmecheckout-element="brand-input"]`);

assets/javascripts/front/checkout/model/payment/card.js

@@ -1,12 +1,13 @@
 /* globals wc_pagarme_checkout */
-
+/*jshint esversion: 8 */
 let pagarmeCard = {
     limitTokenize: 10,
     tokenExpirationAttribute: 'data-pagarmecheckout-expiration',
     cardNumberTarget: 'input[data-element="pagarme-card-number"]',
     brandTarget: 'input[data-pagarmecheckout-element="brand-input"]',
     valueTarget: 'input[data-pagarmecheckout-element="order-value"]',
     installmentsTarget: '[data-pagarme-component="installments"]',
+    installmentsInfoTarget: '[data-pagarme-component="installments-info"]',
     mundiCdn: 'https://cdn.mundipagg.com/assets/images/logos/brands/png/',
     tokenElement: '[data-pagarmecheckout-element="token"]',
     fieldsetCardElements: 'fieldset[data-pagarmecheckout="card"]',
@@ -36,7 +37,18 @@ let pagarmeCard = {
         return jQuery('.wc_payment_method.payment_method_' + value);
     },
     isPagarmePayment: function () {
-        return jQuery('form .payment_methods input[name="payment_method"]:checked').val().indexOf('pagarme');
+        let paymentSelected = jQuery('form .payment_methods input[name="payment_method"]:checked');
+        if(paymentSelected.length <= 0) {
+            return false;
+        }
+        paymentSelected = paymentSelected.val();
+        if(!paymentSelected) {
+            return false;
+        }
+        if(paymentSelected.indexOf('pagarme') == '-1') {
+            return false;
+        }
+        return paymentSelected.indexOf('pagarme');
     },
     keyEventHandlerCard: function (event) {
         this.clearToken(event);
@@ -244,22 +256,26 @@ let pagarmeCard = {
         if (!elem) {
             return false;
         }
-        let brand = elem.closest('fieldset').find(this.brandTarget).val();
+        const brand = elem.closest('fieldset').find(this.brandTarget).val();
         let total = elem.closest('fieldset').find(this.valueTarget).val();
         if (total) {
             total = pagarmeCard.formatValue(total);
         }
-        let cardForm = elem.closest("fieldset");
-        let select = cardForm.find(this.installmentsTarget);
-        if (!total)
+        const cardForm = elem.closest("fieldset");
+        const select = cardForm.find(this.installmentsTarget);
+        const info = cardForm.find(this.installmentsInfoTarget);
+        if (!total) {
             total = cartTotal;
+        }
         if ((!total) ||
             (select.data("type") === 2 && !brand) ||
-            (select.data("type") === 1 && elem.data('element') !== "order-value"))
+            (select.data("type") === 1 && elem.data('element') !== "order-value")
+        ) {
             return false;
-        let storageName = btoa(brand + total);
+        }
+        const storageName = btoa(brand + total);
         sessionStorage.removeItem(storageName);
-        let storage = sessionStorage.getItem(storageName);
+        const storage = sessionStorage.getItem(storageName);
         if (storage) {
             select.html(storage);
         } else {
@@ -272,7 +288,7 @@ let pagarmeCard = {
                 }
             });
             ajax.done(function (response) {
-                pagarmeCard._done(select, storageName, cardForm, response);
+                pagarmeCard._done(select, info, storageName, cardForm, JSON.parse(response));
             });
             ajax.fail(function () {
                 pagarmeCard._fail(cardForm);
@@ -282,8 +298,14 @@ let pagarmeCard = {
         return true;
     },
 
-    _done: function (select, storageName, event, response) {
-        select.html(response);
+    _done: function (select, info, storageName, event, response) {
+        if (info.length) {
+            info.addClass('pagarme-hidden');
+            if(response.installmentsConfig > 1) {
+                info.removeClass('pagarme-hidden');
+            }
+        }
+        select.html(response.optionsHtml);
         sessionStorage.setItem(storageName, response);
         this.removeLoader(event);
     },

assets/stylesheets/admin/style.css

@@ -3,6 +3,10 @@
     background-color: #007cba;
 }
 
+.pagarme-toggle-payment-subscription:focus {
+    box-shadow: none;
+}
+
 .form-table td p.pagarme-hub-desintegration {
     margin: 0;
     font-style: italic;

assets/stylesheets/front/style.css

@@ -1,3 +1,7 @@
+.pagarme-hidden {
+    display: none!important;
+}
+
 #wcmp-checkout-errors {
     display: none;
 }
@@ -67,6 +71,13 @@
     pointer-events: none;
 }
 
+#payment .payment_methods li[class*="pagarme"] .payment_box .pagarme-installments-info {
+    display: block;
+    margin: 0 .75em .25em;
+    font-size: .9em;
+    font-style: italic;
+}
+
 .woocommerce-order .woocommerce-message .pagarme-response p:last-child {
     margin-bottom: 0;
 }
@@ -132,7 +143,7 @@
 
 /* sm  */
 /* @media (min-width: 576px) {
-    
+
 } */
 
 /* md  */
@@ -151,10 +162,10 @@
 
 /* xl  */
 /* @media (min-width: 1200px) {
-    
+
 } */
 
 /* xxl  */
 /* @media (min-width: 1400px) {
-    
+
 } */

composer.json

@@ -2,16 +2,27 @@
     "name": "pagarme/woocommerce-pagarme-payments",
     "description": "Pagar.me module for Woocommerce",
     "type": "wordpress-plugin",
-    "version": "3.1.9",
+    "version": "3.2.0",
     "license": "GPL",
     "autoload": {
         "psr-4": {
             "Woocommerce\\Pagarme\\": "src/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Woocommerce\\Pagarme\\Tests\\": "tests/"
+        }
+    },
     "require": {
         "mashape/unirest-php": "^3.0",
         "pagarme/ecommerce-module-core": "2.3.*",
-        "psr/log": "1.1.4"
+        "psr/log": "1.1.4",
+        "monolog/monolog": "<2"
+    },
+    "require-dev": {
+        "mockery/mockery": "1.6.*",
+        "phpunit/phpunit": "10.5.*",
+        "brain/monkey": "2.*"
     }
 }

constants.php

@@ -12,7 +12,7 @@ function wc_pagarme_define($name, $value)
 
 wc_pagarme_define('WCMP_SLUG', 'woo-pagarme-payments');
 wc_pagarme_define('WCMP_PREFIX', 'pagarme');
-wc_pagarme_define('WCMP_VERSION', '3.1.9');
+wc_pagarme_define('WCMP_VERSION', '3.2.0');
 wc_pagarme_define('WCMP_ROOT_PATH', dirname(__FILE__) . '/');
 wc_pagarme_define('WCMP_ROOT_SRC', WCMP_ROOT_PATH . 'src/');
 wc_pagarme_define('WCMP_ROOT_FILE', WCMP_ROOT_PATH . WCMP_SLUG . '.php');

docs/README.md

@@ -39,5 +39,6 @@ Se você está interessado em contribuir para o desenvolvimento deste projeto, f
 
 ## Contribuidores
 
-| ![eduardobattisti avatar](https://avatars.githubusercontent.com/u/56602897?s=60&v=4)<br/> [eduardobattisti](https://github.com/eduardobattisti) |
-|----------------------------------------------------------------------------------------------------------------------------------|
+| ![eduardobattisti avatar](https://avatars.githubusercontent.com/u/56602897?s=60&v=4) | ![tiagopapile avatar](https://avatars.githubusercontent.com/u/82596706?s=60&v=4) |
+|--------------------------------------------------------------------------------------|----------------------------------------------------------------------------------|
+| [eduardobattisti](https://github.com/eduardobattisti)                                | [tiagopapile](https://github.com/tiagopapile)                                    |

languages/woo-pagarme-payments-pt_BR.mo

@@ -5,15 +5,15 @@ msgstr ""
 "Project-Id-Version: WooCommerce Pagar.me Payments 1.0\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/woo-pagarme-payments\n"
 "POT-Creation-Date: 2018-06-22 13:58-0300\n"
-"PO-Revision-Date: 2023-11-17 16:02-0300\n"
+"PO-Revision-Date: 2024-01-19 11:54-0300\n"
 "Last-Translator: Pagar.me\n"
 "Language-Team: \n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 3.4.1\n"
+"X-Generator: Poedit 3.4.2\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: __;_e;__ngettext:1,2;_n:1,2;__ngettext_noop:1,2;_n_noop:1,2;_c;_nc:1,2;_x:1,2c;_ex:1,2c;"
 "_nx:4c,1,2;_nx_noop:4c,1,2\n"
@@ -1266,3 +1266,39 @@ msgstr "Acessar o Dash da Pagar.me"
 
 msgid "If your Pagar.me Antifraud is active, orders will fail."
 msgstr "Se o seu Antifraude Pagar.me estiver ativo, os pedidos irão falhar."
+
+msgid "Active for subscription"
+msgstr "Ativo para assinatura"
+
+msgid "Enable credit card for subscription"
+msgstr "Habilita cartão de crédito para assinatura"
+
+msgid "Activates credit card payment method for subscriptions."
+msgstr "Ativa o método de pagamento de cartão de crédito para assinaturas."
+
+msgid "Enable Pix for subscription"
+msgstr "Habilita Pix para assinatura"
+
+msgid "Activates Pix payment method for subscriptions."
+msgstr "Ativa o método de pagamento de Pix para assinaturas."
+
+msgid "Enable billet for subscription"
+msgstr "Habilita boleto para assinatura"
+
+msgid "Activates billet payment method for subscriptions."
+msgstr "Ativa o método de pagamento de boleto para assinaturas."
+
+msgid "Allow installments for subscription"
+msgstr "Permitir parcelamento para assinatura"
+
+msgid "Enable installments for subscription"
+msgstr "Habilita parcelamento para assinatura"
+
+msgid "Activates credit card installments for subscriptions."
+msgstr "Ativa parcelamento de cartão de crédito para assinaturas."
+
+msgid "Works only for monthly and yearly subscriptions."
+msgstr "Funciona apenas para assinaturas mensais e anuais."
+
+msgid "Your cart has one or more daily or weekly subscription products, which do not allow installments."
+msgstr "Seu carrinho possui um ou mais produtos de assinatura diário ou semanal, que não permitem parcelamentos."

languages/woo-pagarme-payments-pt_BR.po

@@ -1,6 +1,6 @@
 {
   "name": "woo-pagarme-payments",
-  "version": "3.1.9",
+  "version": "3.2.0",
   "description": "Pagar.me module for Woocommerce",
   "main": "woo-pagarme-payments.php",
   "dependencies": {},