release: 2.6.2

Release 2.6.2
pagarme · Jan 21, 2025 · 0ba65f3 · 0ba65f3
2 parents bc6bda0 + 23de0d7
commit 0ba65f3
Show file tree

Hide file tree

Showing 14 changed files with 132 additions and 66 deletions.
diff --git a/Api/SubscriptionApiInterface.php b/Api/SubscriptionApiInterface.php
@@ -11,14 +11,6 @@ interface SubscriptionApiInterface
      */
     public function list();
 
-    /**
-     * List product subscription
-     *
-     * @param string $customerId
-     * @return \Pagarme\Core\Recurrence\Interfaces\SubscriptionInterface[]
-     */
-    public function listByCustomerId($customerId);
-
     /**
      * Cancel subscription
      *

diff --git a/Block/Payment/Info/BaseCardInfo.php b/Block/Payment/Info/BaseCardInfo.php
@@ -20,6 +20,10 @@ abstract class BaseCardInfo extends Cc
     public function getTransactionInfo()
     {
         $charge = $this->getLastCharge();
+
+        if (empty($charge) || empty($charge->getLastTransaction())) {
+            return [];
+        }
         if ($charge->getLastTransaction()->getCardData() == null) {
             return [];
         }
@@ -65,7 +69,7 @@ private function getLastCharge()
 
         return current($orderObject->getCharges());
     }
-    
+
     /**
      * @param mixed $orderService
      * @param mixed $pagarmeId

diff --git a/Concrete/Magento2CoreSetup.php b/Concrete/Magento2CoreSetup.php
@@ -91,6 +91,12 @@ static public function getDatabaseAccessObject()
 
     static protected function getPlatformHubAppPublicAppKey()
     {
+        $objectManager = ObjectManager::getInstance();
+        $config = $objectManager->get('Magento\Framework\App\Config\ScopeConfigInterface');
+        $key = $config->getValue('pagarme_pagarme/hub/partner_public_app_key');
+        if(!empty($key)) {
+            return $key;
+        }
         return '3470c63b-a233-4be0-9d2a-9ff56e349556';
     }
 

diff --git a/Controller/Adminhtml/Invoices/Delete.php b/Controller/Adminhtml/Invoices/Delete.php
@@ -64,15 +64,15 @@ public function execute()
 
         $message = $this->messageFactory->create(
             MessageInterface::TYPE_ERROR,
-            _("Unable to cancel invoice")
+            __("Unable to cancel invoice")
         );
 
         $invoice = $this->invoiceService->cancel($id);
 
         if ($invoice['code'] == 200) {
             $message = $this->messageFactory->create(
                 MessageInterface::TYPE_SUCCESS,
-                _("Invoice canceled.")
+                __("Invoice canceled.")
             );
         }
 

diff --git a/Controller/Adminhtml/Plans/Delete.php b/Controller/Adminhtml/Plans/Delete.php
@@ -32,7 +32,7 @@ public function execute()
 
         $planService->delete($productId);
 
-        $message = $this->messageFactory->create('success', _("Plan deleted."));
+        $message = $this->messageFactory->create('success', __("Plan deleted."));
         $this->messageManager->addMessage($message);
 
         $this->_redirect('pagarme_pagarme/plans/index');

diff --git a/Controller/Adminhtml/Subscriptions/Delete.php b/Controller/Adminhtml/Subscriptions/Delete.php
@@ -66,15 +66,15 @@ public function execute()
 
         $message = $this->messageFactory->create(
             MessageInterface::TYPE_ERROR,
-            _("Unable to cancel subscription")
+            __("Unable to cancel subscription")
         );
 
         $subscription = $this->subscriptionService->cancel($id);
 
         if ($subscription['code'] == 200) {
             $message = $this->messageFactory->create(
                 MessageInterface::TYPE_SUCCESS,
-                _("Subscription deleted.")
+                __("Subscription deleted.")
             );
         }
 

diff --git a/Model/Api/Subscription.php b/Model/Api/Subscription.php
@@ -2,42 +2,25 @@
 
 namespace Pagarme\Pagarme\Model\Api;
 
-use Magento\Framework\Webapi\Rest\Request;
-use Pagarme\Core\Kernel\Services\LocalizationService;
-use Pagarme\Core\Kernel\Services\MoneyService;
+use Magento\Framework\App\Area;
+use Magento\Framework\App\State;
 use Pagarme\Core\Recurrence\Services\SubscriptionService;
 use Pagarme\Pagarme\Api\SubscriptionApiInterface;
 use Pagarme\Pagarme\Concrete\Magento2CoreSetup;
 
 class Subscription implements SubscriptionApiInterface
 {
-
-    /**
-     * @var Request
-     */
-    protected $request;
     /**
      * @var SubscriptionService
      */
     protected $subscriptionService;
 
-    /**
-     * @var LocalizationService
-     */
-    protected $i18n;
-
-    /**
-     * @var MoneyService
-     */
-    protected $moneyService;
-
-    public function __construct(Request $request)
+    public function __construct(State $state)
     {
-        $this->request = $request;
-        Magento2CoreSetup::bootstrap();
-        $this->i18n = new LocalizationService();
-        $this->moneyService = new MoneyService();
-        $this->subscriptionService = new SubscriptionService();
+        if ($state->getAreaCode() === Area::AREA_WEBAPI_REST) {
+            Magento2CoreSetup::bootstrap();
+            $this->subscriptionService = new SubscriptionService();
+        }
     }
 
     /**
@@ -69,15 +52,4 @@ public function cancel($id)
             ];
         }
     }
-
-    /**
-     * List product subscription
-     *
-     * @param string $customerId
-     * @return \Pagarme\Core\Recurrence\Interfaces\SubscriptionInterface[]
-     */
-    public function listByCustomerId($customerId)
-    {
-        // TODO: Implement listByCustomerId() method.
-    }
 }
diff --git a/Model/Notifications.php b/Model/Notifications.php
@@ -206,16 +206,6 @@ private function addDashSettingsMessages()
         $noticesList = [
             CoreAccount::ACCOUNT_DISABLED => __('Your account is <b>disabled</b> on Pagar.me Dash. '
                 . 'Please, contact our support team to enable it.'),
-            CoreAccount::DOMAIN_EMPTY => sprintf(
-                __('No <b>domain</b> registered on Pagar.me Dash. Please enter your website\'s domain on the <b>%s</b> '
-                . 'to be able to process payment in your store.'),
-                $this->buildDashLink($linkLabel, $linkAccount)
-            ),
-            CoreAccount::DOMAIN_INCORRECT => sprintf(
-                __('The registered <b>domain</b> is different from the URL of your website. Please correct the '
-                . 'domain configured on the <b>%s</b> to be able to process payment in your store.'),
-                $this->buildDashLink($linkLabel, $linkAccount)
-            ),
             CoreAccount::WEBHOOK_INCORRECT => sprintf(
                 __('The URL for receiving <b>webhooks</b> registered in Pagar.me Dash is different from the URL of '
                 . 'your website. Please, <b>%s</b> to access the Hub and click the Delete > Confirm '

diff --git a/README.md b/README.md
@@ -39,6 +39,6 @@ See in [releases](https://github.com/pagarme/magento2-module/releases)
 
 
 ## Contributors
-| ![robsoned avatar](https://avatars.githubusercontent.com/u/18008565?v=4) | 
-|--------------------------------------------------------------------------------------
-| [robsoned](https://github.com/robsoned)                                | 
+| <img src="https://avatars.githubusercontent.com/u/18008565" alt="robsoned avatar" width="120"/> | <img src="https://avatars.githubusercontent.com/u/1132274" alt="rafaelsiqueira avatar" width="120"/> |
+|:-:|:-:|
+| [robsoned](https://github.com/robsoned) | [rafaelsiqueira](https://github.com/rafaelsiqueira) |
diff --git a/Test/Unit/Model/Api/SubscriptionTest.php b/Test/Unit/Model/Api/SubscriptionTest.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace Pagarme\Pagarme\Test\Unit\Model\Api;
+
+use Exception;
+use Magento\Framework\App\Area;
+use Magento\Framework\App\State;
+use Mockery;
+use Pagarme\Pagarme\Test\Unit\BaseTest;
+use Pagarme\Pagarme\Model\Api\Subscription;
+use Pagarme\Core\Recurrence\Aggregates\Subscription as SubscriptionModel;
+
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ */
+class SubscriptionTest extends BaseTest
+{
+    public function testListShouldReturnAllSubscriptions()
+    {
+        $subscriptionServiceMock = Mockery::mock('overload:Pagarme\Core\Recurrence\Services\SubscriptionService');
+        $magento2CoreSetupMock = Mockery::mock('alias:Pagarme\Pagarme\Concrete\Magento2CoreSetup');
+        $magento2CoreSetupMock->shouldReceive('bootstrap')
+            ->andReturnSelf();
+
+        $subscriptionModel = new SubscriptionModel();
+        $subscriptionModel->setId("123");
+        $subscriptionModels = [$subscriptionModel];
+
+        $subscriptionServiceMock->shouldReceive('listAll')
+            ->andReturn($subscriptionModels);
+
+        $stateMock = Mockery::mock(State::class);
+        $stateMock->shouldReceive('getAreaCode')
+            ->andReturn(Area::AREA_WEBAPI_REST);
+
+        $subscription = new Subscription($stateMock);
+
+        $expectedResult = json_decode(json_encode($subscriptionModels), true);
+
+        $result = $subscription->list();
+
+        $this->assertSame($result, $expectedResult);
+    }
+
+    public function testCancelShouldReturnSucessArray()
+    {
+        $subscriptionServiceMock = Mockery::mock('overload:Pagarme\Core\Recurrence\Services\SubscriptionService');
+        $magento2CoreSetupMock = Mockery::mock('alias:Pagarme\Pagarme\Concrete\Magento2CoreSetup');
+        $magento2CoreSetupMock->shouldReceive('bootstrap')
+            ->andReturnSelf();
+
+        $expectedResult = [
+            "message" => 'Subscription canceled with success!',
+            "code" => 200
+        ];
+        $subscriptionServiceMock->shouldReceive('cancel')
+            ->andReturn($expectedResult);
+
+        $stateMock = Mockery::mock(State::class);
+        $stateMock->shouldReceive('getAreaCode')
+            ->andReturn(Area::AREA_WEBAPI_REST);
+
+        $subscription = new Subscription($stateMock);
+
+        $id = '123';
+        $result = $subscription->cancel($id);
+
+        $this->assertSame($result, $expectedResult);
+    }
+
+    public function testCancelShouldReturnErrorArray()
+    {
+        $subscriptionServiceMock = Mockery::mock('overload:Pagarme\Core\Recurrence\Services\SubscriptionService');
+        $magento2CoreSetupMock = Mockery::mock('alias:Pagarme\Pagarme\Concrete\Magento2CoreSetup');
+        $magento2CoreSetupMock->shouldReceive('bootstrap')
+            ->andReturnSelf();
+
+        $expectedResult = [
+            "code" => 400,
+            "message" => 'Error while canceling subscription',
+        ];
+
+        $exception = new Exception('Error while canceling subscription', 400);
+        $subscriptionServiceMock->shouldReceive('cancel')
+            ->andThrow($exception);
+
+        $stateMock = Mockery::mock(State::class);
+        $stateMock->shouldReceive('getAreaCode')
+            ->andReturn(Area::AREA_WEBAPI_REST);
+
+        $subscription = new Subscription($stateMock);
+
+        $id = '123';
+        $result = $subscription->cancel($id);
+
+        $this->assertSame($result, $expectedResult);
+    }
+}
diff --git a/composer.json b/composer.json
@@ -1,12 +1,12 @@
 {
     "name": "pagarme/pagarme-magento2-module",
     "license": "MIT",
-    "version": "2.6.1",
+    "version": "2.6.2",
     "type": "magento2-module",
     "description": "Magento 2 Module Pagar.me",
     "require": {
         "php": ">=7.1",
-        "pagarme/ecommerce-module-core": "2.7.0"
+        "pagarme/ecommerce-module-core": "2.7.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^5 | ^6 | ^7 | ^8 | ^9",

diff --git a/etc/adminhtml/system/global.xml b/etc/adminhtml/system/global.xml
@@ -48,5 +48,8 @@
             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
             <config_path>pagarme_pagarme/global/sendmail</config_path>
         </field>
+        <field id="partner_public_app_key" type="string">
+            <config_path>pagarme_pagarme/hub/partner_public_app_key</config_path>
+        </field>
     </group>
 </include>
diff --git a/etc/module.xml b/etc/module.xml
@@ -9,7 +9,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Pagarme_Pagarme" setup_version="2.6.1">
+    <module name="Pagarme_Pagarme" setup_version="2.6.2">
         <sequence>
             <module name="Magento_Sales" />
             <module name="Magento_Payment" />

diff --git a/view/frontend/templates/info/card.phtml b/view/frontend/templates/info/card.phtml
@@ -2,7 +2,7 @@
     /**
      * @var \Pagarme\Core\Kernel\Aggregates\Transaction $info
      */
-    $info =  $this->getTransactionInfo();
+    $info =  $block->getTransactionInfo();
     if(empty($info)) {
         return;
     }