Merge pull request #194 from mollie/1.7.1

1.7.1

Block/Form/Paymentlink.php

@@ -6,17 +6,44 @@
 
 namespace Mollie\Payment\Block\Form;
 
+use Magento\Framework\View\Element\Template\Context;
+use Mollie\Payment\Service\Mollie\Order\Transaction\Expires;
+
 /**
  * Class Paymentlink
  *
  * @package Mollie\Payment\Block\Form
  */
 class Paymentlink extends \Magento\Payment\Block\Form
 {
-
     /**
      * @var string
      */
     protected $_template = 'Mollie_Payment::form/mollie_paymentlink.phtml';
 
+    /**
+     * @var Expires
+     */
+    private $expires;
+
+    public function __construct(
+        Context $context,
+        Expires $expires,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->expires = $expires;
+    }
+
+    public function getExpiresAt()
+    {
+        $storeId = $this->getRequest()->getParam('store_id');
+
+        $days = $this->expires->getExpiresAtForMethod('paymentlink', $storeId);
+        if (!$days) {
+            return $days;
+        }
+
+        return $this->expires->atDateForMethod('paymentlink');
+    }
 }

Model/Client/Orders.php

@@ -26,6 +26,7 @@
 use Mollie\Payment\Model\Adminhtml\Source\InvoiceMoment;
 use Mollie\Payment\Model\OrderLines;
 use Mollie\Payment\Service\Mollie\Order\RefundUsingPayment;
+use Mollie\Payment\Service\Mollie\Order\Transaction\Expires;
 use Mollie\Payment\Service\Order\Lines\StoreCredit;
 use Mollie\Payment\Service\Order\OrderCommentHistory;
 use Mollie\Payment\Service\Order\PartialInvoice;
@@ -101,6 +102,10 @@ class Orders extends AbstractModel
      * @var PartialInvoice
      */
     private $partialInvoice;
+    /**
+     * @var Expires
+     */
+    private $expires;
 
     /**
      * Orders constructor.
@@ -116,10 +121,11 @@ class Orders extends AbstractModel
      * @param Registry              $registry
      * @param MollieHelper          $mollieHelper
      * @param ProcessAdjustmentFee  $adjustmentFee
-     * @param StoreCredit           $storeCredit
-     * @param RefundUsingPayment    $refundUsingPayment
      * @param OrderCommentHistory   $orderCommentHistory
      * @param PartialInvoice        $partialInvoice
+     * @param StoreCredit           $storeCredit
+     * @param RefundUsingPayment    $refundUsingPayment
+     * @param Expires               $expires
      */
     public function __construct(
         OrderLines $orderLines,
@@ -136,7 +142,8 @@ public function __construct(
         OrderCommentHistory $orderCommentHistory,
         PartialInvoice $partialInvoice,
         StoreCredit $storeCredit,
-        RefundUsingPayment $refundUsingPayment
+        RefundUsingPayment $refundUsingPayment,
+        Expires $expires
     ) {
         $this->orderLines = $orderLines;
         $this->orderSender = $orderSender;
@@ -153,6 +160,7 @@ public function __construct(
         $this->refundUsingPayment = $refundUsingPayment;
         $this->orderCommentHistory = $orderCommentHistory;
         $this->partialInvoice = $partialInvoice;
+        $this->expires = $expires;
     }
 
     /**
@@ -210,6 +218,10 @@ public function startTransaction(Order $order, $mollieApi)
             $orderData['method'] = $additionalData['limited_methods'];
         }
 
+        if ($this->expires->availableForMethod($method, $storeId)) {
+            $orderData['expiresAt'] = $this->expires->atDateForMethod($method, $storeId);
+        }
+
         $this->mollieHelper->addTolog('request', $orderData);
         $mollieOrder = $mollieApi->orders->create($orderData);
         $this->processResponse($order, $mollieOrder);

Model/Mollie.php

@@ -198,7 +198,7 @@ public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
         }
 
         $activeMethods = $this->mollieHelper->getAllActiveMethods($quote->getStoreId());
-        if (!array_key_exists($this->_code, $activeMethods)) {
+        if ($this->_code != 'mollie_methods_paymentlink' && !array_key_exists($this->_code, $activeMethods)) {
             return false;
         }
 

Model/MollieConfigProvider.php

@@ -79,6 +79,11 @@ class MollieConfigProvider implements ConfigProviderInterface
      */
     private $checkoutSession;
 
+    /**
+     * @var array|null
+     */
+    private $methodData;
+
     /**
      * MollieConfigProvider constructor.
      *
@@ -198,10 +203,8 @@ public function getConfig()
      */
     public function getActiveMethods($mollieApi)
     {
-        static $methodData = null;
-
-        if ($methodData !== null) {
-            return $methodData;
+        if ($this->methodData !== null) {
+            return $this->methodData;
         }
 
         try {
@@ -217,16 +220,16 @@ public function getActiveMethods($mollieApi)
 
             foreach ($apiMethods as $method) {
                 $methodId = 'mollie_methods_' . $method->id;
-                $methodData[$methodId] = [
+                $this->methodData[$methodId] = [
                     'image' => $method->image->size2x
                 ];
             }
         } catch (\Exception $e) {
             $this->mollieHelper->addTolog('error', 'Function: getActiveMethods: ' . $e->getMessage());
-            $methodData = [];
+            $this->methodData = [];
         }
 
-        return $methodData;
+        return $this->methodData;
     }
 
     /**

Service/Mollie/Order/Transaction/Expires.php

@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © 2019 Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Mollie\Payment\Service\Mollie\Order\Transaction;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+
+class Expires
+{
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var TimezoneInterface
+     */
+    private $timezone;
+
+    /**
+     * @var RequestInterface
+     */
+    private $request;
+
+    public function __construct(
+        ScopeConfigInterface $config,
+        TimezoneInterface $timezone,
+        RequestInterface $request
+    ) {
+        $this->config = $config;
+        $this->timezone = $timezone;
+        $this->request = $request;
+    }
+
+    public function availableForMethod(string $method = null, $storeId = null)
+    {
+        $value = $this->getExpiresAtForMethod($method, $storeId);
+        return (bool)$value;
+    }
+
+    public function atDateForMethod(string $method = null, $storeId = null)
+    {
+        $days = $this->getExpiresAtForMethod($method, $storeId);
+
+        if (strtotime($days)) {
+            return $days;
+        }
+
+        $date = $this->timezone->scopeDate($storeId);
+        $date->add(new \DateInterval('P' . $days . 'D'));
+
+        return $date->format('Y-m-d');
+    }
+
+    /**
+     * @param string $method
+     * @param $storeId
+     * @return mixed
+     */
+    public function getExpiresAtForMethod(string $method = null, $storeId = null)
+    {
+        if (!$method && $value = $this->getValueFromRequest()) {
+            return $value;
+        }
+
+        $path = sprintf('payment/mollie_methods_%s/days_before_expire', $method);
+
+        return $this->config->getValue($path, 'store', $storeId);
+    }
+
+    /**
+     * @return mixed
+     */
+    private function getValueFromRequest()
+    {
+        $payment = $this->request->getParam('payment');
+
+        if (!$payment || !isset($payment['days_before_expire'])) {
+            return false;
+        }
+
+        return $payment['days_before_expire'];
+    }
+}

Setup/UpgradeData.php

@@ -91,14 +91,13 @@ public function upgrade(
             $this->removeBitcoinConfiguration();
         }
 
-        if (version_compare($context->getVersion(), '1.6.1', '<')) {
-            $this->upgradeActiveState();
-        }
-
         if (version_compare($context->getVersion(), '1.6.2', '<')) {
             $this->addIndexes($setup);
         }
 
+        // This should run every time
+        $this->upgradeActiveState();
+
         $setup->endSetup();
     }
 

Test/Integration/Block/Form/PaymentlinkTest.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © 2019 Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Mollie\Payment\Test\Integration\Block\Form;
+
+use Mollie\Payment\Block\Form\Paymentlink;
+use Mollie\Payment\Test\Integration\IntegrationTestCase;
+
+class PaymentlinkTest extends IntegrationTestCase
+{
+    /**
+     * @magentoConfigFixture current_store payment/mollie_methods_paymentlink/days_before_expire 10
+     */
+    public function testReturnsTheCorrectDate()
+    {
+        /** @var Paymentlink $instance */
+        $instance = $this->objectManager->create(Paymentlink::class);
+
+        $now = new \DateTimeImmutable('now');
+        $expected = $now->add(new \DateInterval('P10D'));
+
+        $this->assertEquals($expected->format('Y-m-d'), $instance->getExpiresAt());
+    }
+
+    /**
+     * @magentoConfigFixture current_store payment/mollie_methods_paymentlink/days_before_expire
+     */
+    public function testAnEmptyStringWhenNoConfigAvailable()
+    {
+        /** @var Paymentlink $instance */
+        $instance = $this->objectManager->create(Paymentlink::class);
+
+        $this->assertEmpty($instance->getExpiresAt());
+    }
+}

Test/Integration/Model/Client/OrdersTest.php

@@ -223,4 +223,40 @@ protected function mollieOrderMock($status, $currency)
 
         return $mollieOrder;
     }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/order.php
+     * @magentoConfigFixture default_store payment/mollie_methods_ideal/days_before_expire 5
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Mollie\Api\Exceptions\ApiException
+     */
+    public function testStartTransactionIncludesTheExpiresAtParameter()
+    {
+        $order = $this->loadOrder('100000001');
+        $order->getPayment()->setMethod('mollie_methods_ideal');
+
+        $mollieApiMock = $this->createMock(MollieApiClient::class);
+        $orderEndpointMock = $this->createMock(OrderEndpoint::class);
+        $orderEndpointMock->method('create')->with( $this->callback(function ($orderData) {
+            $this->assertArrayHasKey('expiresAt', $orderData);
+            $this->assertNotEmpty($orderData['expiresAt']);
+
+            $now = new \DateTimeImmutable('now');
+            $expected = $now->add(new \DateInterval('P5D'));
+
+            $this->assertEquals($expected->format('Y-m-d'), $orderData['expiresAt']);
+
+            return true;
+        }))->willReturn($this->createMock(\Mollie\Api\Resources\Order::class));
+
+        $mollieApiMock->orders = $orderEndpointMock;
+
+        /** @var Orders $instance */
+        $instance = $this->objectManager->create(Orders::class, [
+            'orderLines' => $this->createMock(\Mollie\Payment\Model\OrderLines::class),
+        ]);
+
+        $instance->startTransaction($order, $mollieApiMock);
+    }
 }