Merge pull request #497 from mollie/release/2.7.0

Release/2.7.0
mollie · Mar 4, 2022 · 1f66e7c · 1f66e7c
2 parents bc94f54 + 93026e7
commit 1f66e7c
Show file tree

Hide file tree

Showing 54 changed files with 2,936 additions and 543 deletions.
diff --git a/Config.php b/Config.php
@@ -7,6 +7,7 @@
 namespace Mollie\Payment;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\Encryption\EncryptorInterface;
 use Magento\Framework\Module\Manager;
 use Magento\Store\Model\ScopeInterface;
@@ -81,16 +82,23 @@ class Config
      */
     private $encryptor;
 
+    /**
+     * @var ProductMetadataInterface
+     */
+    private $productMetadata;
+
     public function __construct(
         ScopeConfigInterface $config,
         MollieLogger $logger,
         Manager $moduleManager,
-        EncryptorInterface $encryptor
+        EncryptorInterface $encryptor,
+        ProductMetadataInterface $productMetadata
     ) {
         $this->config = $config;
         $this->logger = $logger;
         $this->moduleManager = $moduleManager;
         $this->encryptor = $encryptor;
+        $this->productMetadata = $productMetadata;
     }
 
     /**
@@ -141,6 +149,14 @@ public function getVersion()
         return $this->getPath(static::GENERAL_VERSION, null);
     }
 
+    /**
+     * Returns current version of Magento
+     */
+    public function getMagentoVersion(): string
+    {
+        return $this->productMetadata->getVersion();
+    }
+
     /**
      * Returns API key
      *

diff --git a/GraphQL/Resolver/Cart/AvailableIssuersForCart.php b/GraphQL/Resolver/Cart/AvailableIssuersForCart.php
@@ -16,28 +16,14 @@
 
 class AvailableIssuersForCart implements ResolverInterface
 {
-    /**
-     * @var Mollie
-     */
-    private $mollieModel;
-
-    /**
-     * @var General
-     */
-    private $mollieHelper;
-
     /**
      * @var GetIssuers
      */
     private $getIssuers;
 
     public function __construct(
-        Mollie $mollieModel,
-        General $mollieHelper,
         GetIssuers $getIssuers
     ) {
-        $this->mollieModel = $mollieModel;
-        $this->mollieHelper = $mollieHelper;
         $this->getIssuers = $getIssuers;
     }
 

diff --git a/Helper/General.php b/Helper/General.php
@@ -555,11 +555,11 @@ public function getPaymentLinkMessage($checkoutUrl, $storeId = null)
     /**
      * Order Currency and Value array for payment request
      *
-     * @param \Magento\Sales\Model\Order $order
+     * @param OrderInterface $order
      *
-     * @return array
+     * @return array{currency: string, value: string}
      */
-    public function getOrderAmountByOrder($order)
+    public function getOrderAmountByOrder(OrderInterface $order): array
     {
         if ($this->useBaseCurrency($order->getStoreId())) {
             return $this->getAmountArray($order->getBaseCurrencyCode(), $order->getBaseGrandTotal());
@@ -579,16 +579,16 @@ public function useBaseCurrency($storeId = 0)
     }
 
     /**
-     * @param $currency
-     * @param $value
+     * @param string|null $currency
+     * @param float|null $value
      *
-     * @return array
+     * @return array{currency: string, value: string}
      */
-    public function getAmountArray($currency, $value)
+    public function getAmountArray(?string $currency, ?float $value): array
     {
         return [
-            "currency" => $currency,
-            "value"    => $this->formatCurrencyValue($value, $currency)
+            'currency' => $currency,
+            'value'    => $this->formatCurrencyValue($value, $currency)
         ];
     }
 

diff --git a/Logger/MollieLogger.php b/Logger/MollieLogger.php
@@ -25,11 +25,11 @@ class MollieLogger extends Logger
     public function addInfoLog($type, $data)
     {
         if (is_array($data)) {
-            $this->addInfo($type . ': ' . json_encode($data));
+            $this->addRecord(static::INFO, $type . ': ' . json_encode($data));
         } elseif (is_object($data)) {
-            $this->addInfo($type . ': ' . json_encode($data));
+            $this->addRecord(static::INFO, $type . ': ' . json_encode($data));
         } else {
-            $this->addInfo($type . ': ' . $data);
+            $this->addRecord(static::INFO, $type . ': ' . $data);
         }
     }
 
@@ -42,11 +42,11 @@ public function addInfoLog($type, $data)
     public function addErrorLog($type, $data)
     {
         if (is_array($data)) {
-            $this->addError($type . ': ' . json_encode($data));
+            $this->addRecord(static::ERROR, $type . ': ' . json_encode($data));
         } elseif (is_object($data)) {
-            $this->addError($type . ': ' . json_encode($data));
+            $this->addRecord(static::ERROR, $type . ': ' . json_encode($data));
         } else {
-            $this->addError($type . ': ' . $data);
+            $this->addRecord(static::ERROR, $type . ': ' . $data);
         }
     }
 }
diff --git a/Model/Client/OrderProcessorInterface.php b/Model/Client/OrderProcessorInterface.php
@@ -0,0 +1,20 @@
+<?php
+/*
+ * Copyright Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Mollie\Payment\Model\Client;
+
+use Magento\Sales\Api\Data\OrderInterface;
+use Mollie\Api\Resources\Order;
+
+interface OrderProcessorInterface
+{
+    public function process(
+        OrderInterface $magentoOrder,
+        Order $mollieOrder,
+        string $type,
+        ProcessTransactionResponse $response
+    ): ?ProcessTransactionResponse;
+}