Merge pull request #821 from mollie/release/2.42.0

Release/2.42.0
mollie · Oct 15, 2024 · 96fdc1f · 96fdc1f
2 parents cc70022 + 6b0fff7
commit 96fdc1f
Show file tree

Hide file tree

Showing 60 changed files with 1,316 additions and 170 deletions.
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -14,6 +14,11 @@ jobs:
                 MAGENTO_VERSION: 2.4.6-p4
               - PHP_VERSION: php83-fpm
                 MAGENTO_VERSION: 2.4.7
+              - PHP_VERSION: php83-fpm
+                MAGENTO_VERSION: 2.4.7
+                PHPSTAN_LEVEL: 2
+
+        name: PHP ${{ matrix.PHP_VERSION }} Magento ${{ matrix.MAGENTO_VERSION }}${{ matrix.PHPSTAN_LEVEL && format(' Level {0}', matrix.PHPSTAN_LEVEL) || '' }}
 
         runs-on: ubuntu-latest
         steps:
@@ -35,4 +40,12 @@ jobs:
               run: docker exec magento-project-community-edition ./retry "php bin/magento module:enable Mollie_Payment && php bin/magento setup:upgrade && php bin/magento setup:di:compile"
 
             - name: Run PHPStan
-              run: docker exec magento-project-community-edition /bin/bash -c "./vendor/bin/phpstan analyse --no-progress -c /data/extensions/*/phpstan.neon /data/extensions"
+              continue-on-error: ${{ matrix.PHPSTAN_LEVEL == 2 }}
+              run: |
+                LEVEL_OPTION=""
+
+                if [ -n "${{ matrix.PHPSTAN_LEVEL }}" ]; then
+                  LEVEL_OPTION="--level=${{ matrix.PHPSTAN_LEVEL }}"
+                fi
+
+                docker exec magento-project-community-edition /bin/bash -c "./vendor/bin/phpstan analyse --no-progress $LEVEL_OPTION -c /data/extensions/*/phpstan.neon /data/extensions"
diff --git a/.github/workflows/templates/magento/configure-mollie.sh b/.github/workflows/templates/magento/configure-mollie.sh
@@ -37,6 +37,7 @@ bin/magento config:set payment/mollie_methods_paymentlink/active 1 &
 bin/magento config:set payment/mollie_methods_paysafecard/active 1 &
 bin/magento config:set payment/mollie_methods_pointofsale/active 1 &
 bin/magento config:set payment/mollie_methods_riverty/active 1 &
+bin/magento config:set payment/mollie_methods_satispay/active 1 &
 bin/magento config:set payment/mollie_methods_sofort/active 1 &
 bin/magento config:set payment/mollie_methods_trustly/active 1 &
 bin/magento config:set payment/mollie_methods_twint/active 1 &

diff --git a/Api/Data/PendingPaymentReminderInterface.php b/Api/Data/PendingPaymentReminderInterface.php
@@ -11,6 +11,8 @@
 interface PendingPaymentReminderInterface extends ExtensibleDataInterface
 {
     const ENTITY_ID = 'entity_id';
+    const CUSTOMER_ID = 'customer_id';
+    const HASH = 'hash';
     const ORDER_ID = 'order_id';
 
     /**
@@ -24,6 +26,28 @@ public function setEntityId(int $id);
      */
     public function getEntityId();
 
+    /**
+     * @param int|null $customerId
+     * @return \Mollie\Payment\Api\Data\PendingPaymentReminderInterface
+     */
+    public function setCustomerId(int $customerId = null);
+
+    /**
+     * @return int
+     */
+    public function getCustomerId();
+
+    /**
+     * @param string|null $hash
+     * @return \Mollie\Payment\Api\Data\PendingPaymentReminderInterface
+     */
+    public function setHash(string $hash = null);
+
+    /**
+     * @return string
+     */
+    public function getHash();
+
     /**
      * @param int $orderId
      * @return \Mollie\Payment\Api\Data\PendingPaymentReminderInterface
@@ -49,4 +73,4 @@ public function getExtensionAttributes();
     public function setExtensionAttributes(
         \Mollie\Payment\Api\Data\PendingPaymentReminderExtensionInterface $extensionAttributes
     );
-}
+}
diff --git a/Config.php b/Config.php
@@ -18,6 +18,7 @@ class Config
     const EXTENSION_CODE = 'Mollie_Payment';
     const ADVANCED_INVOICE_MOMENT = 'payment/mollie_general/invoice_moment';
     const ADVANCED_ENABLE_MANUAL_CAPTURE = 'payment/mollie_general/enable_manual_capture';
+    const ADVANCED_ENABLE_METHODS_API = 'payment/mollie_general/enable_methods_api';
     const GENERAL_ENABLED = 'payment/mollie_general/enabled';
     const GENERAL_APIKEY_LIVE = 'payment/mollie_general/apikey_live';
     const GENERAL_APIKEY_TEST = 'payment/mollie_general/apikey_test';
@@ -278,6 +279,15 @@ public function useManualCapture($storeId): bool
         return $this->isSetFlag(static::ADVANCED_ENABLE_MANUAL_CAPTURE, $storeId);
     }
 
+    /**
+     * @param int|null $storeId
+     * @return bool
+     */
+    public function isMethodsApiEnabled(int $storeId = null): bool
+    {
+        return $this->isSetFlag(static::ADVANCED_ENABLE_METHODS_API, $storeId);
+    }
+
     /**
      * @param null|int|string $storeId
      * @return bool

diff --git a/Model/Data/PendingPaymentReminder.php b/Model/Data/PendingPaymentReminder.php
@@ -31,6 +31,44 @@ public function setEntityId(int $id)
         return $this->setData(self::ENTITY_ID, $id);
     }
 
+    /**
+     * Get customer_id
+     * @return string|null
+     */
+    public function getCustomerId()
+    {
+        return $this->_get(self::CUSTOMER_ID);
+    }
+
+    /**
+     * Set customer_id
+     * @param int|null $customerId
+     * @return PendingPaymentReminderInterface
+     */
+    public function setCustomerId(int $customerId = null)
+    {
+        return $this->setData(self::CUSTOMER_ID, $customerId);
+    }
+
+    /**
+     * Get hash
+     * @return string|null
+     */
+    public function getHash()
+    {
+        return $this->_get(self::HASH);
+    }
+
+    /**
+     * Set hash
+     * @param string|null $hash
+     * @return PendingPaymentReminderInterface
+     */
+    public function setHash(string $hash = null)
+    {
+        return $this->setData(self::HASH, $hash);
+    }
+
     /**
      * @param int $orderId
      * @return PendingPaymentReminderInterface

diff --git a/Model/Methods/GooglePay.php b/Model/Methods/GooglePay.php
@@ -0,0 +1,24 @@
+<?php
+/*
+ * Copyright Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Mollie\Payment\Model\Methods;
+
+use Mollie\Payment\Model\Mollie;
+
+/**
+ * Class GooglePay
+ *
+ * @package Mollie\Payment\Model\Methods
+ */
+class GooglePay extends Mollie
+{
+    /**
+     * Payment method code
+     *
+     * @var string
+     */
+    const CODE = 'mollie_methods_googlepay';
+}
diff --git a/Model/Methods/Satispay.php b/Model/Methods/Satispay.php
@@ -0,0 +1,24 @@
+<?php
+/*
+ * Copyright Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Mollie\Payment\Model\Methods;
+
+use Mollie\Payment\Model\Mollie;
+
+/**
+ * Class Satispay
+ *
+ * @package Mollie\Payment\Model\Methods
+ */
+class Satispay extends Mollie
+{
+    /**
+     * Payment method code
+     *
+     * @var string
+     */
+    const CODE = 'mollie_methods_satispay';
+}
diff --git a/Model/Mollie.php b/Model/Mollie.php
@@ -214,15 +214,6 @@ public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
             return false;
         }
 
-        // The street can be a maximum of 100 characters. Disable if it's longer.
-        if ($quote && $quote->getShippingAddress()) {
-            $street = $quote->getShippingAddress()->getStreetFull();
-
-            if (mb_strlen($street) > 100) {
-                return false;
-            }
-        }
-
         return parent::isAvailable($quote);
     }