v1.6.0

mercadopago · Jan 3, 2024 · eab865c · eab865c
1 parent 757b60c
commit eab865c
Show file tree

Hide file tree

Showing 60 changed files with 2,535 additions and 786 deletions.
diff --git a/.github/workflows/ESLint.yml b/.github/workflows/ESLint.yml
@@ -1,4 +1,4 @@
-name: Run ESLint
+name: ESLint
 on: [pull_request]
 
 jobs:
@@ -11,4 +11,4 @@ jobs:
         with:
           node-version: 16
       - run: npm install -g eslint
-      - run: eslint
+      - run: eslint
diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml
@@ -70,7 +70,7 @@ jobs:
 
       - name: Detect Coding Standard Violations
         id: phpcs
-        run: magento2/vendor/bin/phpcs -qn --standard=Magento2 magento2/app/code/MercadoPago/
+        run: magento2/vendor/bin/phpcs -qn --standard=Magento2 --ignore=magento2/app/code/MercadoPago/AdbPayment/Tests magento2/app/code/MercadoPago/
 
       - name: Detect PHP Compatibility
         id: phpcs_compatibility

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -4,6 +4,7 @@ on: [pull_request]
 
 jobs:
   validate-tests:
+    name: Run Tests
     runs-on: ubuntu-22.04
 
     services:
@@ -59,14 +60,53 @@ jobs:
 
       - name: Run Unit Test
         id: unit-test
-        run: magento2/vendor/phpunit/phpunit/phpunit --configuration magento2/app/code/MercadoPago/AdbPayment/phpunit.xml --coverage-clover clover.xml --coverage-text magento2/app/code/MercadoPago/AdbPayment/Tests
+        run:
+          XDEBUG_MODE=coverage magento2/vendor/phpunit/phpunit/phpunit \
+            --configuration  magento2/app/code/MercadoPago/AdbPayment/phpunit.xml \
+            --coverage-html coverage/ \
+            --coverage-clover coverage/clover.xml \
+            --coverage-filter magento2/app/code/MercadoPago/AdbPayment
 
       - name: Repository Minimum Test Coverage
         id: repository-coverage
-        run: php magento2/app/code/MercadoPago/AdbPayment/Tests/coverage-checker.php clover.xml 80
+        run: php magento2/app/code/MercadoPago/AdbPayment/Tests/coverage-checker.php coverage/clover.xml 25
+
+      - id: pr-files-list
+        name: Get Pull Request Files
+        uses: ruslandulina/[email protected]
+
+      - id: save-modified-pr-files-list
+        name: Save modified PR Files List to a file
+        run: echo "${{join(steps.pr-files-list.outputs.modified, ' ')}}" > modified-files-list.txt
+
+      - id: save-added-pr-files-list
+        name: Save added PR Files List to a file
+        run: echo "${{join(steps.pr-added-list.outputs.added, ' ')}}" > added-files-list.txt
+
+      - name: PR Modified Files
+        run: cat modified-files-list.txt
+
+      - name: PR Added Files
+        run: cat added-files-list.txt
 
       - name: Pull Request Coverage
         id: pull-request-coverage
-        run: bash bin/pull-request-coverage.sh
-        env:
-          PR_NUMBER: ${{ github.event.number }}
+        run: php magento2/app/code/MercadoPago/AdbPayment/Tests/pr-coverage.php coverage/clover.xml modified-files-list.txt added-files-list.txt 25
+
+      - name: List
+        run: ls && ls coverage
+
+      - name: ZIP coverage results
+        run: zip coverage.zip coverage
+
+      - name: Archive code coverage results
+        uses: actions/upload-artifact@v3
+        with:
+          name: code-coverage-report
+          path: coverage.zip
+
+      - name: Archive code coverage folder
+        uses: actions/upload-artifact@v3
+        with:
+          name: code-coverage-report
+          path: coverage/
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ vendor
 .phpunit.result.cache
 testdoc.txt
 .idea
+coverage/
diff --git a/Block/Sales/Info/Card.php b/Block/Sales/Info/Card.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright © MercadoPago. All rights reserved.
  *
@@ -8,48 +9,20 @@
 
 namespace MercadoPago\AdbPayment\Block\Sales\Info;
 
-use Magento\Payment\Block\ConfigurableInfo;
-use Magento\Framework\Pricing\PriceCurrencyInterface;
-use Magento\Framework\View\Element\Template\Context;
-use Magento\Payment\Gateway\ConfigInterface;
+use MercadoPago\AdbPayment\Block\Sales\Info\Info;
+
 
 /**
  * Payment details form block by card.
  *
  * @SuppressWarnings(PHPMD.CamelCaseMethodName)
  */
-class Card extends ConfigurableInfo
+class Card extends Info
 {
     /**
      * Checkout Pro Info template.
      *
      * @var string
      */
     protected $_template = 'MercadoPago_AdbPayment::info/cc/instructions.phtml';
-
-    /** @var PriceCurrencyInterface $priceCurrency */
-    protected $priceCurrency;
-
-    public function __construct(
-        Context $context,
-        ConfigInterface $config,
-        PriceCurrencyInterface $priceCurrency,
-        array $data = []
-    ) {
-        parent::__construct($context, $config, $data);
-
-        $this->priceCurrency = $priceCurrency;
-    }
-
-    /**
-     * Function getFormatedPrice
-     *
-     * @param float $price
-     *
-     * @return string
-     */
-    public function getFormatedPrice($amount)
-    {
-        return $this->priceCurrency->convertAndFormat($amount);
-    }
 }
diff --git a/Block/Sales/Info/CheckoutCredits.php b/Block/Sales/Info/CheckoutCredits.php
@@ -9,14 +9,14 @@
 
 namespace MercadoPago\AdbPayment\Block\Sales\Info;
 
-use Magento\Payment\Block\ConfigurableInfo;
+use MercadoPago\AdbPayment\Block\Sales\Info\Info;
 
 /**
  * Payment details form block by Checkout Credits.
  *
  * @SuppressWarnings(PHPMD.CamelCasePropertyName)
  */
-class CheckoutCredits extends ConfigurableInfo
+class CheckoutCredits extends Info
 {
     /**
      * Checkout Pro Info template.

diff --git a/Block/Sales/Info/CheckoutPro.php b/Block/Sales/Info/CheckoutPro.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright © MercadoPago. All rights reserved.
  *
@@ -8,14 +9,14 @@
 
 namespace MercadoPago\AdbPayment\Block\Sales\Info;
 
-use Magento\Payment\Block\ConfigurableInfo;
+use MercadoPago\AdbPayment\Block\Sales\Info\Info;
 
 /**
  * Payment details form block by Checkout Pro.
  *
  * @SuppressWarnings(PHPMD.CamelCasePropertyName)
  */
-class CheckoutPro extends ConfigurableInfo
+class CheckoutPro extends Info
 {
     /**
      * Checkout Pro Info template.

diff --git a/Block/Sales/Info/Info.php b/Block/Sales/Info/Info.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * Copyright © MercadoPago. All rights reserved.
+ *
+ * @author      Mercado Pago
+ * @license     See LICENSE for license details.
+ */
+
+namespace MercadoPago\AdbPayment\Block\Sales\Info;
+
+use Magento\Payment\Block\ConfigurableInfo;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Payment\Gateway\ConfigInterface;
+
+/**
+ * Payment details form block.
+ *
+ * @SuppressWarnings(PHPMD.CamelCasePropertyName)
+ */
+class Info extends ConfigurableInfo
+{
+  private TimezoneInterface $timezone;
+
+  /** @var PriceCurrencyInterface $priceCurrency */
+  protected $priceCurrency;
+
+  /**
+   * @param Context $context
+   * @param ConfigInterface $config
+   * @param TimezoneInterface $timezone
+   * @param PriceCurrencyInterface $priceCurrency
+   * @param array $data
+   */
+  public function __construct(
+    Context $context,
+    ConfigInterface $config,
+    TimezoneInterface $timezone,
+    PriceCurrencyInterface $priceCurrency,
+    array $data = []
+  ) {
+    parent::__construct($context, $config, $data);
+    $this->timezone = $timezone;
+    $this->priceCurrency = $priceCurrency;
+  }
+
+  /**
+   * Function FormatedDate
+   *
+   * @param string $date
+   *
+   * @return string
+   */
+  public function date($date)
+  {
+    $localeDate = $this->timezone->date($date);
+
+    $format = $localeDate->format('Y-m-d\TH:i:s.000O');
+
+
+    return $this->formatDate(
+      $format,
+      \IntlDateFormatter::MEDIUM,
+      true,
+    );
+  }
+
+  /**
+   * Function getFormatedPrice
+   *
+   * @param float $price
+   *
+   * @return string
+   */
+  public function getFormatedPrice($amount)
+  {
+    return $this->priceCurrency->convertAndFormat($amount);
+  }
+}
diff --git a/Block/Sales/Info/PaymentMethodsOff.php b/Block/Sales/Info/PaymentMethodsOff.php
@@ -2,14 +2,14 @@
 
 namespace MercadoPago\AdbPayment\Block\Sales\Info;
 
-use Magento\Payment\Block\ConfigurableInfo;
+use MercadoPago\AdbPayment\Block\Sales\Info\Info;
 
 /**
  * Payment details form block by PaymentMethodsOff.
  *
  * @SuppressWarnings(PHPMD.CamelCasePropertyName)
  */
-class PaymentMethodsOff extends ConfigurableInfo
+class PaymentMethodsOff extends Info
 {
     /**
      * PaymentMethodsOff Info template.

diff --git a/Block/Sales/Info/Pix.php b/Block/Sales/Info/Pix.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright © MercadoPago. All rights reserved.
  *
@@ -8,14 +9,14 @@
 
 namespace MercadoPago\AdbPayment\Block\Sales\Info;
 
-use Magento\Payment\Block\ConfigurableInfo;
+use MercadoPago\AdbPayment\Block\Sales\Info\Info;
 
 /**
  * Payment details form block by Pix.
  *
  * @SuppressWarnings(PHPMD.CamelCasePropertyName)
  */
-class Pix extends ConfigurableInfo
+class Pix extends Info
 {
     /**
      * Pix Info template.

diff --git a/Block/Sales/Info/Pse.php b/Block/Sales/Info/Pse.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright © MercadoPago. All rights reserved.
  *
@@ -8,14 +9,14 @@
 
 namespace MercadoPago\AdbPayment\Block\Sales\Info;
 
-use Magento\Payment\Block\ConfigurableInfo;
+use MercadoPago\AdbPayment\Block\Sales\Info\Info;
 
 /**
  * Payment details form block by Pse.
  *
  * @SuppressWarnings(PHPMD.CamelCasePropertyName)
  */
-class Pse extends ConfigurableInfo
+class Pse extends Info
 {
     /**
      * Pse Info template.

diff --git a/Block/Sales/Info/TwoCc.php b/Block/Sales/Info/TwoCc.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright © MercadoPago. All rights reserved.
  *
@@ -7,48 +8,19 @@
 
 namespace MercadoPago\AdbPayment\Block\Sales\Info;
 
-use Magento\Payment\Block\ConfigurableInfo;
-use Magento\Framework\Pricing\PriceCurrencyInterface;
-use Magento\Framework\View\Element\Template\Context;
-use Magento\Payment\Gateway\ConfigInterface;
+use MercadoPago\AdbPayment\Block\Sales\Info\Info;
 
 /**
  * Payment details form block by Webpay.
  *
  * @SuppressWarnings(PHPMD.CamelCasePropertyName)
  */
-class TwoCc extends ConfigurableInfo
+class TwoCc extends Info
 {
     /**
      * TwoCc Info template.
      *
      * @var string
      */
     protected $_template = 'MercadoPago_AdbPayment::info/twocc/instructions.phtml';
-
-    /** @var PriceCurrencyInterface $priceCurrency */
-    protected $priceCurrency;
-
-    public function __construct(
-        Context $context,
-        ConfigInterface $config,
-        PriceCurrencyInterface $priceCurrency,
-        array $data = []
-    ) {
-        parent::__construct($context, $config, $data);
-
-        $this->priceCurrency = $priceCurrency;
-    }
-
-    /**
-     * Function getFormatedPrice
-     *
-     * @param float $price
-     *
-     * @return string
-     */
-    public function getFormatedPrice($amount)
-    {
-        return $this->priceCurrency->convertAndFormat($amount);
-    }
 }