Merge pull request #1 from MultiSafepay/MAGWIRE-16

MAGWIRE-16: Release version 2.0.0
MultiSafepay · Jan 30, 2024 · 33fbb9d · 33fbb9d
2 parents cd52d06 + 31cb14d
commit 33fbb9d
Show file tree

Hide file tree

Showing 16 changed files with 118 additions and 105 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.0.0] - 2024-01-25
+### Added
+- PLGMAG2V2-709: Added payment component for Card Payment
+- Added escapers and made strings translateable (thanks to @jesse-deboer)
+- Added support for preselected payment method (thanks to @jesse-deboer)
+- PLGMAG2V2-717: Added payment icons to all the gateways and gift cards (thanks to @xgerhard)
+
+### Fixed
+- Fixed issue 'CRITICAL: Magewire: Warning: Undefined array key issuer_id' happening in some cases (thanks to @jesse-deboer)
+
+### Changed
+- Changed from using container to ReferenceContainer for the payment methods in the Hyva xml layout (thanks to @jesse-deboer)
+- Removed the use of PlaceOrder and replaced it with canPlaceOrder (thanks to @jesse-deboer)
+- Changed to use checkout.payment.methods ReferenceBlock (thanks to @xgerhard)
+
+### Removed
+- DAVAMS-708: Removed Santander Betaal per Maand
+
 ## [1.0.0] - 2023-04-13
 
 ### Added

diff --git a/Model/Magewire/Payment/PlaceOrderService.php b/Model/Magewire/Payment/PlaceOrderService.php
@@ -11,14 +11,13 @@
  * See DISCLAIMER.md for disclaimer details.
  */
 
-namespace MultiSafepay\MagewireCheckout\Model\Magewire\Payment;
+namespace MultiSafepay\HyvaCheckout\Model\Magewire\Payment;
 
 use Hyva\Checkout\Model\Magewire\Payment\AbstractPlaceOrderService;
 use Magento\Quote\Model\Quote;
 
 class PlaceOrderService extends AbstractPlaceOrderService
 {
-
  public function canPlaceOrder(): bool
  {
  return true;

diff --git a/Observer/OrderRequestObserver.php b/Observer/OrderRequestObserver.php
@@ -11,7 +11,7 @@
  * See DISCLAIMER.md for disclaimer details.
  */
 
-namespace MultiSafepay\MagewireCheckout\Observer;
+namespace MultiSafepay\HyvaCheckout\Observer;
 
 use Exception;
 use Hyva\Checkout\Model\CheckoutInformation\Luma;
@@ -22,7 +22,7 @@
 use Magento\Store\Model\ScopeInterface;
 use MultiSafepay\Api\Transactions\OrderRequest;
 use MultiSafepay\ConnectCore\Logger\Logger;
-use MultiSafepay\MagewireCheckout\Util\VersionUtil;
+use MultiSafepay\HyvaCheckout\Util\VersionUtil;
 
 class OrderRequestObserver implements ObserverInterface
 {
@@ -80,23 +80,23 @@ public function execute(Observer $observer): void
  if ($pluginDetails === null) {
  $this->logger->logInfoForOrder(
  $order->getIncrementId(),
- 'plugin details object not found, could not prepend Magewire Checkout'
+ 'plugin details object not found, could not prepend Hyva Checkout'
  );
  }
 
  $applicationName = $pluginDetails->getApplicationName();
- $pluginDetails->addApplicationName($applicationName . ' - Magewire Checkout');
+ $pluginDetails->addApplicationName($applicationName . ' - Hyva Checkout');
 
  $pluginVersion = $pluginDetails->getPluginVersion()->getPluginVersion();
  $pluginDetails->addPluginVersion($pluginVersion . ' - ' . VersionUtil::VERSION);
 
- $magewireCheckoutVersion = 'unknown';
+ $hyvaCheckoutVersion = 'unknown';
 
  if (method_exists('\Composer\InstalledVersions', 'getVersion')) {
- $magewireCheckoutVersion = \Composer\InstalledVersions::getVersion('hyva-themes/magento2-hyva-checkout');
+ $hyvaCheckoutVersion = \Composer\InstalledVersions::getVersion('hyva-themes/magento2-hyva-checkout');
  }
 
  $applicationVersion = $pluginDetails->getApplicationVersion();
- $pluginDetails->addApplicationVersion($applicationVersion . ' - ' . $magewireCheckoutVersion);
+ $pluginDetails->addApplicationVersion($applicationVersion . ' - ' . $hyvaCheckoutVersion);
  }
 }
diff --git a/Payment/Method/MultiSafepayCreditCard.php b/Payment/Method/MultiSafepayCreditCard.php
@@ -13,7 +13,7 @@
 
 declare(strict_types=1);
 
-namespace MultiSafepay\MagewireCheckout\Payment\Method;
+namespace MultiSafepay\HyvaCheckout\Payment\Method;
 
 use Magento\Checkout\Model\Session as SessionCheckout;
 use Magento\Framework\Exception\LocalizedException;

diff --git a/Payment/Method/MultiSafepayIdeal.php b/Payment/Method/MultiSafepayIdeal.php
@@ -13,7 +13,7 @@
 
 declare(strict_types=1);
 
-namespace MultiSafepay\MagewireCheckout\Payment\Method;
+namespace MultiSafepay\HyvaCheckout\Payment\Method;
 
 use Hyva\Checkout\Model\Magewire\Component\EvaluationInterface;
 use Hyva\Checkout\Model\Magewire\Component\EvaluationResultFactory;

diff --git a/Payment/MethodListExtended.php b/Payment/MethodListExtended.php
@@ -13,7 +13,7 @@
 
 declare(strict_types=1);
 
-namespace MultiSafepay\MagewireCheckout\Payment;
+namespace MultiSafepay\HyvaCheckout\Payment;
 
 use Hyva\Checkout\Model\Magewire\Component\EvaluationResultFactory;
 use Hyva\Checkout\Magewire\Checkout\Payment\MethodList;

diff --git a/README.md b/README.md
@@ -1,16 +1,12 @@
 <p align="center">
- <img src="https://camo.githubusercontent.com/517483ae0eaba9884f397e9af1c4adc7bbc231575ac66cc54292e00400edcd10/68747470733a2f2f7777772e6d756c7469736166657061792e636f6d2f66696c6561646d696e2f74656d706c6174652f696d672f6d756c7469736166657061792d6c6f676f2d69636f6e2e737667" width="400px" position="center">
+ <img src="https://camo.githubusercontent.com/81fc6cfa9dd111f704e7e5eb0d0fd87b9096a942049377ed2295c6480f5cdf82/68747470733a2f2f7777772e6d756c7469736166657061792e636f6d2f66696c6561646d696e2f74656d706c6174652f696d672f6d756c7469736166657061792d6c6f676f2d69636f6e2e737667" width="400px" position="center">
 </p>
 
-# MultiSafepay module for the Magewire Checkout
+# MultiSafepay module for the Hyvä Checkout
 
-This is the module of our Magewire Checkout integration.
-Currently, this module only supports redirect payment methods.
-Checkout field integration will be added in a newer version.
+This is the module of our Hyvä Checkout integration.
 
-The module is currently in beta. Please use with caution.
-
-Before you get started with MultiSafepay and Magewire Checkout, please read and follow our [installation & configuration manual](https://docs.multisafepay.com/integrations/plugins/magento2/) first.
+Before you get started with MultiSafepay and Hyvä Checkout, please read and follow our [installation & configuration manual](https://docs.multisafepay.com/integrations/plugins/magento2/) first.
 
 ## About MultiSafepay ##
 MultiSafepay is a collecting payment service provider which means we take care of the agreements, technical details and payment collection required for each payment method. You can start selling online today and manage all your transactions from one place.
@@ -23,19 +19,19 @@ This module does not work in combination with Magento Vault yet. Please disable
 ## Requirements
 - To use the plugin you need a MultiSafepay account. You can create a test account on https://testmerchant.multisafepay.com/signup
 - Magento Open Source version 2.3.x & 2.4.x
-- Magewire Checkout
+- Hyvä Checkout
 - PHP 7.4+
 
 ## Installation
 This module can be installed via composer:
 
 ```shell
-composer require multisafepay/magewire-checkout
+composer require multisafepay/magento2-hyva-checkout
 ```
 
 Next, enable the module:
 ```bash
-php bin/magento module:enable MultiSafepay_MagewireCheckout
+php bin/magento module:enable MultiSafepay_HyvaCheckout
 ```
 
 Next, run the following commands:

diff --git a/Util/VersionUtil.php b/Util/VersionUtil.php
@@ -11,9 +11,9 @@
  * See DISCLAIMER.md for disclaimer details.
  */
 
-namespace MultiSafepay\MagewireCheckout\Util;
+namespace MultiSafepay\HyvaCheckout\Util;
 
 class VersionUtil
 {
- public const VERSION = '1.0.0';
+ public const VERSION = '2.0.0';
 }
diff --git a/composer.json b/composer.json
@@ -1,20 +1,20 @@
 {
- "name": "multisafepay/magewire-checkout",
- "description": "Integrate MultiSafepay payment methods into your Magewire Checkout",
- "version": "1.0.0",
+ "name": "multisafepay/magento2-hyva-checkout",
+ "description": "Integrate MultiSafepay payment methods into your Hyvä Checkout",
+ "version": "2.0.0",
  "type": "magento2-module",
  "license": "OSL-3.0",
  "minimum-stability": "dev",
  "require": {
  "php": ">=7.4",
- "multisafepay/magento2-core": "^3.3.1",
+ "multisafepay/magento2-core": "^3.3.2",
  "multisafepay/magento2-frontend": "^1.18 | ^2.0",
  "multisafepay/magento2-adminhtml": "^1.21",
- "hyva-themes/magento2-hyva-checkout":"^1.0"
+ "hyva-themes/magento2-hyva-checkout":"^1.1"
  },
  "autoload": {
  "psr-4": {
- "MultiSafepay\\MagewireCheckout\\": ""
+ "MultiSafepay\\HyvaCheckout\\": ""
  },
  "files": [
  "registration.php"

diff --git a/etc/events.xml b/etc/events.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
  <event name="before_send_multisafepay_order_request">
- <observer name="multisafepay_magewire_order_request" instance="MultiSafepay\MagewireCheckout\Observer\OrderRequestObserver" />
+ <observer name="multisafepay_hyva_order_request" instance="MultiSafepay\HyvaCheckout\Observer\OrderRequestObserver" />
  </event>
 </config>