Fix problems in checkout without data in the config

MONEI · Dec 19, 2024 · 900fbd1 · 900fbd1
1 parent 8012adb
commit 900fbd1
Show file tree

Hide file tree

Showing 8 changed files with 122 additions and 19 deletions.
diff --git a/Api/Config/AllMoneiPaymentModuleConfigInterface.php b/Api/Config/AllMoneiPaymentModuleConfigInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @author Monei Team
+ * @copyright Copyright © Monei (https://monei.com)
+ */
+
+declare(strict_types=1);
+
+namespace Monei\MoneiPayment\Api\Config;
+
+/**
+ * Get payment method configuration interface.
+ */
+interface AllMoneiPaymentModuleConfigInterface
+{
+
+    /**
+     * Check if any payment methods is enabled
+     *
+     * @param null $storeId
+     * @return bool
+     */
+    public function isAnyPaymentEnabled($storeId = null): bool;
+}
diff --git a/Model/CheckoutConfigProvider.php b/Model/CheckoutConfigProvider.php
@@ -13,11 +13,13 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\UrlInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Monei\MoneiPayment\Api\Config\AllMoneiPaymentModuleConfigInterface;
 use Monei\MoneiPayment\Api\Config\MoneiBizumPaymentModuleConfigInterface;
 use Monei\MoneiPayment\Api\Config\MoneiCardPaymentModuleConfigInterface;
 use Monei\MoneiPayment\Api\Config\MoneiGoogleApplePaymentModuleConfigInterface;
 use Monei\MoneiPayment\Api\Config\MoneiPaymentModuleConfigInterface;
 use Monei\MoneiPayment\Block\Monei\Customer\CardRenderer;
+use Monei\MoneiPayment\Model\Config\AllMoneiPaymentModuleConfig;
 use Monei\MoneiPayment\Model\Config\Source\Mode;
 use Monei\MoneiPayment\Model\Payment\Monei;
 use Monei\MoneiPayment\Service\Shared\IsEnabledApplePayInMoneiAccount;
@@ -40,6 +42,7 @@ class CheckoutConfigProvider implements ConfigProviderInterface
 
     public function __construct(
         UrlInterface                          $urlBuilder,
+        AllMoneiPaymentModuleConfigInterface $allMoneiPaymentModuleConfig,
         MoneiPaymentModuleConfigInterface $moneiPaymentConfig,
         MoneiCardPaymentModuleConfigInterface $moneiCardPaymentConfig,
         MoneiGoogleApplePaymentModuleConfigInterface $moneiGoogleApplePaymentConfig,
@@ -49,6 +52,7 @@ public function __construct(
         StoreManagerInterface                 $storeManager
     )
     {
+        $this->allMoneiPaymentModuleConfig = $allMoneiPaymentModuleConfig;
         $this->moneiGoogleApplePaymentConfig = $moneiGoogleApplePaymentConfig;
         $this->moneiBizumPaymentModuleConfig = $moneiBizumPaymentModuleConfig;
         $this->moneiCardPaymentConfig = $moneiCardPaymentConfig;
@@ -65,6 +69,7 @@ public function getConfig(): array
         return [
             'moneiAccountId' => $this->moneiPaymentConfig->getAccountId($storeId),
             'moneiApiKey' => $this->moneiPaymentConfig->getApiKey($storeId),
+            'moneiPaymentIsEnabled' => $this->allMoneiPaymentModuleConfig->isAnyPaymentEnabled($storeId),
             'isMoneiTestMode' => $this->moneiPaymentConfig->getMode($storeId) === Mode::MODE_TEST,
             'moneiLanguage' => $this->moneiPaymentConfig->getLanguage($storeId),
             'payment' => [

diff --git a/Model/Config/AllMoneiPaymentModuleConfig.php b/Model/Config/AllMoneiPaymentModuleConfig.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * @author Monei Team
+ * @copyright Copyright © Monei (https://monei.com)
+ */
+
+declare(strict_types=1);
+
+namespace Monei\MoneiPayment\Model\Config;
+
+use Monei\MoneiPayment\Api\Config\AllMoneiPaymentModuleConfigInterface;
+use Monei\MoneiPayment\Api\Config\MoneiBizumPaymentModuleConfigInterface;
+use Monei\MoneiPayment\Api\Config\MoneiCardPaymentModuleConfigInterface;
+use Monei\MoneiPayment\Api\Config\MoneiGoogleApplePaymentModuleConfigInterface;
+use Monei\MoneiPayment\Api\Config\MoneiPaymentModuleConfigInterface;
+
+class AllMoneiPaymentModuleConfig implements AllMoneiPaymentModuleConfigInterface
+{
+
+    private MoneiPaymentModuleConfigInterface $moneiPaymentModuleConfig;
+    private MoneiCardPaymentModuleConfigInterface $moneiCardPaymentModuleConfig;
+    private MoneiBizumPaymentModuleConfigInterface $moneiBizumPaymentModuleConfig;
+    private MoneiGoogleApplePaymentModuleConfigInterface $moneiGoogleApplePaymentModuleConfig;
+
+    public function __construct(
+        MoneiPaymentModuleConfigInterface $moneiPaymentModuleConfig,
+        MoneiCardPaymentModuleConfigInterface $moneiCardPaymentModuleConfig,
+        MoneiBizumPaymentModuleConfigInterface $moneiBizumPaymentModuleConfig,
+        MoneiGoogleApplePaymentModuleConfigInterface $moneiGoogleApplePaymentModuleConfig,
+    ) {
+
+        $this->moneiPaymentModuleConfig = $moneiPaymentModuleConfig;
+        $this->moneiCardPaymentModuleConfig = $moneiCardPaymentModuleConfig;
+        $this->moneiBizumPaymentModuleConfig = $moneiBizumPaymentModuleConfig;
+        $this->moneiGoogleApplePaymentModuleConfig = $moneiGoogleApplePaymentModuleConfig;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function isAnyPaymentEnabled($storeId = null): bool
+    {
+        return (bool) $this->moneiPaymentModuleConfig->isEnabled($storeId)
+            || (bool) $this->moneiCardPaymentModuleConfig->isEnabled($storeId)
+            || (bool) $this->moneiBizumPaymentModuleConfig->isEnabled($storeId)
+            || (bool) $this->moneiGoogleApplePaymentModuleConfig->isEnabled($storeId);
+    }
+}
diff --git a/Service/GetPaymentMethods.php b/Service/GetPaymentMethods.php
@@ -59,25 +59,29 @@ public function execute(): array
         $storeId = (int) $this->storeManager->getStore()->getId();
         $accountId = $this->registryAccountId->get() ?? $this->moduleConfig->getAccountId($storeId);
 
-        $client = $this->createClient();
+        if ($accountId) {
+            $client = $this->createClient();
 
-        $this->logger->debug('------------------ START GET PAYMENT METHODS REQUEST -----------------');
-        $this->logger->debug('Account id = ' . $accountId);
-        $this->logger->debug('------------------- END GET PAYMENT METHODS REQUEST ------------------');
-        $this->logger->debug('');
+            $this->logger->debug('------------------ START GET PAYMENT METHODS REQUEST -----------------');
+            $this->logger->debug('Account id = ' . $accountId);
+            $this->logger->debug('------------------- END GET PAYMENT METHODS REQUEST ------------------');
+            $this->logger->debug('');
 
-        $response = $client->get(
-            self::METHOD . '?accountId=' . $accountId . '&' . time(),
-            [
-                'headers' => $this->getHeaders(),
-            ]
-        );
+            $response = $client->get(
+                self::METHOD . '?accountId=' . $accountId . '&' . time(),
+                [
+                    'headers' => $this->getHeaders(),
+                ]
+            );
+
+            $this->logger->debug('----------------- START GET PAYMENT METHODS RESPONSE -----------------');
+            $this->logger->debug((string) $response->getBody());
+            $this->logger->debug('------------------ END GET PAYMENT METHODS RESPONSE ------------------');
+            $this->logger->debug('');
 
-        $this->logger->debug('----------------- START GET PAYMENT METHODS RESPONSE -----------------');
-        $this->logger->debug((string) $response->getBody());
-        $this->logger->debug('------------------ END GET PAYMENT METHODS RESPONSE ------------------');
-        $this->logger->debug('');
+            return $this->serializer->unserialize($response->getBody());
+        }
 
-        return $this->serializer->unserialize($response->getBody());
+        return [];
     }
 }
diff --git a/Service/Shared/IsEnabledApplePayInMoneiAccount.php b/Service/Shared/IsEnabledApplePayInMoneiAccount.php
@@ -9,20 +9,28 @@
 
 namespace Monei\MoneiPayment\Service\Shared;
 
+use Monei\MoneiPayment\Api\Config\MoneiGoogleApplePaymentModuleConfigInterface;
 use Monei\MoneiPayment\Model\Payment\Monei;
 
 class IsEnabledApplePayInMoneiAccount
 {
+    private MoneiGoogleApplePaymentModuleConfigInterface $moneiGoogleApplePaymentModuleConfig;
     private GetAvailableMoneiPaymentMethods $getAvailableMoneiPaymentMethods;
 
-    public function __construct(GetAvailableMoneiPaymentMethods $getAvailableMoneiPaymentMethods)
+    public function __construct(
+        MoneiGoogleApplePaymentModuleConfigInterface $moneiGoogleApplePaymentModuleConfig,
+        GetAvailableMoneiPaymentMethods $getAvailableMoneiPaymentMethods)
     {
+        $this->moneiGoogleApplePaymentModuleConfig = $moneiGoogleApplePaymentModuleConfig;
         $this->getAvailableMoneiPaymentMethods = $getAvailableMoneiPaymentMethods;
     }
 
 
     public function execute(): bool
     {
+        if (!$this->moneiGoogleApplePaymentModuleConfig->isEnabled()) {
+            return false;
+        }
         $availableMoneiPaymentMethods = $this->getAvailableMoneiPaymentMethods->execute();
 
         return in_array(Monei::MONEI_APPLE_CODE, $availableMoneiPaymentMethods, true);

diff --git a/Service/Shared/IsEnabledGooglePayInMoneiAccount.php b/Service/Shared/IsEnabledGooglePayInMoneiAccount.php
@@ -9,20 +9,28 @@
 
 namespace Monei\MoneiPayment\Service\Shared;
 
+use Monei\MoneiPayment\Api\Config\MoneiGoogleApplePaymentModuleConfigInterface;
 use Monei\MoneiPayment\Model\Payment\Monei;
 
 class IsEnabledGooglePayInMoneiAccount
 {
+    private MoneiGoogleApplePaymentModuleConfigInterface $moneiGoogleApplePaymentModuleConfig;
     private GetAvailableMoneiPaymentMethods $getAvailableMoneiPaymentMethods;
 
-    public function __construct(GetAvailableMoneiPaymentMethods $getAvailableMoneiPaymentMethods)
+    public function __construct(
+        MoneiGoogleApplePaymentModuleConfigInterface $moneiGoogleApplePaymentModuleConfig,
+        GetAvailableMoneiPaymentMethods $getAvailableMoneiPaymentMethods)
     {
         $this->getAvailableMoneiPaymentMethods = $getAvailableMoneiPaymentMethods;
+        $this->moneiGoogleApplePaymentModuleConfig = $moneiGoogleApplePaymentModuleConfig;
     }
 
 
     public function execute(): bool
     {
+        if (!$this->moneiGoogleApplePaymentModuleConfig->isEnabled()) {
+            return false;
+        }
         $availableMoneiPaymentMethods = $this->getAvailableMoneiPaymentMethods->execute();
 
         return in_array(Monei::MONEI_GOOGLE_CODE, $availableMoneiPaymentMethods, true);

diff --git a/etc/di.xml b/etc/di.xml
@@ -5,6 +5,8 @@
   -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Monei\MoneiPayment\Api\Config\AllMoneiPaymentModuleConfigInterface"
+                type="Monei\MoneiPayment\Model\Config\AllMoneiPaymentModuleConfig"/>
     <preference for="Monei\MoneiPayment\Api\Config\MoneiPaymentModuleConfigInterface"
                 type="Monei\MoneiPayment\Model\Config\MoneiPaymentModuleConfig"/>
     <preference for="Monei\MoneiPayment\Api\Config\MoneiCardPaymentModuleConfigInterface"

diff --git a/view/frontend/web/js/view/payment-mixin.js b/view/frontend/web/js/view/payment-mixin.js
@@ -12,6 +12,7 @@ define([
 
         accountId: '',
         apiKey: '',
+        isEnabled: false,
 
         initialize: function () {
             this._super();
@@ -25,7 +26,8 @@ define([
         showErrorMessages: function () {
             this.accountId = window.checkoutConfig.moneiAccountId;
             this.apiKey = window.checkoutConfig.moneiApiKey;
-            if(!this.accountId || !this.apiKey) {
+            this.isEnabled = window.checkoutConfig.moneiPaymentIsEnabled;
+            if(this.isEnabled && (!this.accountId || !this.apiKey)) {
                 globalMessageList.addErrorMessage({
                     message: $.mage.__('Monei payment methods are not available. Please, check your Monei configuration.')
                 });