Merge remote-tracking branch 'remotes/origin/feature/direct-flow' into feature/CMP-41_42_configure-api-credentials-and-connectivity

Resolving of conflicts

Author: Ivan Tagil

Api/Config/ConfigInterface.php

@@ -15,14 +15,14 @@ interface ConfigInterface
     /**
      * XML Paths of configuration settings
      */
-    public const XML_PATH_GENERAL_ENABLED = 'payment/cm_payments_general/enabled';
-    public const XML_PATH_GENERAL_TEST_MERCHANT_KEY = 'payment/cm_payments_general/test_merchant_key';
-    public const XML_PATH_GENERAL_TEST_MERCHANT_NAME = 'payment/cm_payments_general/test_merchant_name';
-    public const XML_PATH_GENERAL_TEST_MERCHANT_PASSWORD = 'payment/cm_payments_general/test_merchant_password';
-    public const XML_PATH_GENERAL_LIVE_MERCHANT_KEY = 'payment/cm_payments_general/live_merchant_key';
-    public const XML_PATH_GENERAL_LIVE_MERCHANT_NAME = 'payment/cm_payments_general/live_merchant_name';
-    public const XML_PATH_GENERAL_LIVE_MERCHANT_PASSWORD = 'payment/cm_payments_general/live_merchant_password';
-    public const XML_PATH_GENERAL_MODE = 'payment/cm_payments_general/mode';
+    public const XML_PATH_GENERAL_ENABLED = 'cm_payments/general/enabled';
+    public const XML_PATH_GENERAL_TEST_MERCHANT_NAME = 'cm_payments/general/test_merchant_name';
+    public const XML_PATH_GENERAL_TEST_MERCHANT_PASSWORD = 'cm_payments/general/test_merchant_password';
+    public const XML_PATH_GENERAL_TEST_MERCHANT_KEY = 'cm_payments/general/test_merchant_key';
+    public const XML_PATH_GENERAL_LIVE_MERCHANT_NAME = 'cm_payments/general/live_merchant_name';
+    public const XML_PATH_GENERAL_LIVE_MERCHANT_PASSWORD = 'cm_payments/general/live_merchant_password';
+    public const XML_PATH_GENERAL_LIVE_MERCHANT_KEY = 'cm_payments/general/live_merchant_key';
+    public const XML_PATH_GENERAL_MODE = 'cm_payments/general/mode';
     public const XML_PATH_PAYMENT_PROFILE = 'payment/cm_payments_methods/profile';
     public const XML_PATH_PAYMENT_CREDIT_CARD_PROFILE = 'payment/cm_payments_creditcard/profile';
     public const XML_PATH_PAYMENT_BANCONTACT_PROFILE = 'payment/cm_payments_bancontact/profile';

Client/Api/OrderInterface.php

@@ -10,7 +10,9 @@
 
 use CM\Payments\Client\Model\Response\OrderCreate;
 use CM\Payments\Client\Model\Response\OrderDetail;
+use CM\Payments\Client\Model\Response\PaymentMethod;
 use CM\Payments\Client\Request\OrderCreateRequest;
+use CM\Payments\Client\Request\OrderGetMethodsRequest;
 use GuzzleHttp\Exception\RequestException;
 
 interface OrderInterface
@@ -23,6 +25,14 @@ interface OrderInterface
      */
     public function getDetail(string $orderKey): OrderDetail;
 
+    /**
+     * @param string $orderKey
+     * @return PaymentMethod[]
+     *
+     * @throws RequestException
+     */
+    public function getMethods(string $orderKey): array;
+
     /**
      * @param OrderCreateRequest $orderCreateRequest
      * @return OrderCreate

Client/Model/Response/Method/IdealIssuer.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © CM.com. All rights reserved.
+ * See LICENSE.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace CM\Payments\Client\Model\Response\Method;
+
+class IdealIssuer
+{
+    /**
+     * @var string
+     */
+    private $id;
+
+    /**
+     * @var string
+     */
+    private $name;
+
+    /**
+     * Authorization constructor.
+     * @param array $authorization
+     */
+    public function __construct(
+        array $issuer
+    ) {
+        $this->id = $issuer['id'];
+        $this->name = $issuer['name'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getId(): string
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+}

Client/Model/Response/PaymentMethod.php

@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © CM.com. All rights reserved.
+ * See LICENSE.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace CM\Payments\Client\Model\Response;
+
+use CM\Payments\Client\Model\Response\Method\IdealIssuer;
+
+class PaymentMethod
+{
+    /**
+     * @var string|null
+     */
+    private $method;
+
+    /**
+     * @var IdealIssuer[]
+     */
+    private $idealIssuers;
+
+    /**
+     * PaymentMethod constructor
+     *
+     * @param array $orderCreate
+     */
+    public function __construct(
+        array $method
+    ) {
+        $this->method = $method['method'];
+        $this->idealIssuers = isset($method['ideal_details']) ?
+            $this->mapIssuers($method['ideal_details']['issuers']) : [];
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getMethod(): ?string
+    {
+        return $this->method;
+    }
+
+    /**
+     * @return IdealIssuer[]
+     */
+    public function getIdealIssuers(): array
+    {
+        return $this->idealIssuers;
+    }
+
+    /**
+     * @param array $issuers
+     * @return IdealIssuer[]
+     */
+    private function mapIssuers(array $issuers): array
+    {
+        return array_map(function ($issuer) {
+            return new IdealIssuer($issuer);
+        }, $issuers);
+    }
+}

Client/Order.php

@@ -12,7 +12,9 @@
 use CM\Payments\Client\Api\OrderInterface;
 use CM\Payments\Client\Model\Response\OrderCreate;
 use CM\Payments\Client\Model\Response\OrderDetail;
+use CM\Payments\Client\Model\Response\PaymentMethod;
 use CM\Payments\Client\Request\OrderCreateRequest;
+use CM\Payments\Client\Request\OrderGetMethodsRequest;
 use CM\Payments\Client\Request\OrderGetRequest;
 use GuzzleHttp\Exception\RequestException;
 
@@ -49,6 +51,22 @@ public function getDetail(string $orderKey): OrderDetail
         return new OrderDetail($response);
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function getMethods(string $orderKey): array
+    {
+        $orderGetRequest = new OrderGetMethodsRequest($orderKey);
+
+        $response = $this->apiClient->execute(
+            $orderGetRequest
+        );
+
+        return array_map(function ($method) {
+            return new PaymentMethod($method);
+        }, $response);
+    }
+
     /**
      * @inheritDoc
      */

Gateway/Validator/CurrencyValidator.php

@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © CM.com. All rights reserved.
+ * See LICENSE.txt for license details.
+ */
+namespace CM\Payments\Gateway\Validator;
+
+use Magento\Payment\Gateway\ConfigInterface;
+use Magento\Payment\Gateway\Validator\AbstractValidator;
+use Magento\Payment\Gateway\Validator\ResultInterface;
+use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
+
+class CurrencyValidator extends AbstractValidator
+{
+    /**
+     * @var \Magento\Payment\Gateway\ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @param ResultInterfaceFactory $resultFactory
+     * @param \Magento\Payment\Gateway\ConfigInterface $config
+     */
+    public function __construct(
+        ResultInterfaceFactory $resultFactory,
+        ConfigInterface $config
+    ) {
+        $this->config = $config;
+        parent::__construct($resultFactory);
+    }
+
+    /**
+     * @param array $validationSubject
+     * @return ResultInterface
+     */
+    public function validate(array $validationSubject)
+    {
+        $storeId = $validationSubject['storeId'];
+
+        if ((int)$this->config->getValue('allow_specific_currency', $storeId) !== 1) {
+            return $this->createResult(true);
+        }
+
+        $availableCurrencies = $this->getAvailableCurrencies($storeId);
+        if (!empty($availableCurrencies) && !in_array($validationSubject['currency'], $availableCurrencies)) {
+            return $this->createResult(false);
+        }
+
+        return $this->createResult(true);
+    }
+
+    /**
+     * @param string $storeId
+     *
+     * @return string[]
+     */
+    private function getAvailableCurrencies(string $storeId): array
+    {
+        $specificCurrency = $this->config->getValue('specific_currency', $storeId);
+        if (empty($specificCurrency)) {
+            return [];
+        }
+
+        return explode(',', $specificCurrency);
+    }
+}

Model/Adminhtml/Source/AllSpecificCurrencies.php

@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © CM.com. All rights reserved.
+ * See LICENSE.txt for license details.
+ */
+namespace CM\Payments\Model\AdminHtml\Source;
+
+class AllSpecificCurrencies implements \Magento\Framework\Option\ArrayInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function toOptionArray()
+    {
+        return [
+            ['value' => 0, 'label' => __('All Allowed Currencies')],
+            ['value' => 1, 'label' => __('Specific Currencies')]
+        ];
+    }
+}

Model/Adminhtml/Source/Currency.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © CM.com. All rights reserved.
+ * See LICENSE.txt for license details.
+ */
+namespace CM\Payments\Model\AdminHtml\Source;
+
+class Currency implements \Magento\Framework\Option\ArrayInterface
+{
+    /**
+     * Countries
+     *
+     * @var \Magento\Directory\Model\Currency
+     */
+    protected $currencyModel;
+
+    /**
+     * Options array
+     *
+     * @var array
+     */
+    protected $options;
+
+    /**
+     * @param \Magento\Directory\Model\Currency $currency
+     */
+    public function __construct(\Magento\Directory\Model\Currency $currency)
+    {
+        $this->currencyModel = $currency;
+    }
+
+    /**
+     * Return options array
+     *
+     * @param boolean $isMultiselect
+     * @param string|array $foregroundCountries
+     * @return array
+     */
+    public function toOptionArray($isMultiselect = false, $foregroundCountries = '')
+    {
+        if (!$this->options) {
+            $this->options = array_map(function ($currency) {
+                return ['value' => $currency, 'label' => $currency];
+            }, $this->currencyModel->getConfigAllowCurrencies());
+        }
+
+        $options = $this->options;
+
+        if (!$isMultiselect) {
+            array_unshift($options, ['value' => '', 'label' => __('--Please Select--')]);
+        }
+
+        return $options;
+    }
+}