Merge branch 'develop' into BP-3807-Add-iDEAL-fast-checkout-Shopware-6

# Conflicts:
#	composer.json
#	src/Resources/app/storefront/dist/storefront/js/buckaroo-payments/buckaroo-payments.js
#	src/Resources/app/storefront/src/main.js

.github/workflows/tests.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup php
-        uses: nanasess/setup-php@v3.3.2
+        uses: nanasess/setup-php@v4
         with:
           php-version: 8.1
       - uses: actions/checkout@v3

CHANGELOG.md

@@ -268,4 +268,24 @@ Compatible from Shopware 6.5.0 up to 6.5.6.1
 - BP-3629 Adjust the default Riverty | Afterpay name just to Riverty
 - BP-3711 Adjust the Riverty | Afterpay logo to the new Riverty logo
 - BP-3637 Fix Javascript error: Plugin "BuckarooPaymentValidateSubmit" is already registered
-- BP-3785 Remove payment method Giropay (discontinued)
+- BP-3785 Remove payment method Giropay (discontinued)
+
+# 2.5.0
+
+-BP-3911 Add support for Shopware 6.6.8.2
+-BP-3850 Add support for Shopware 6.6.7.0 & 6.6.7.1
+-BP-4015 Added support for EUR currency in Przelewy24.
+-BP-3877 Enhanced Security for Cards (with Cliënt Side Encryption): ensuring a safer checkout experience.
+-BP-3888 Improved Security for Bancontact (with Cliënt Side Encryption): ensuring a safer checkout experience.
+-BP-4016 Remove the payment method Sofort (Discontinued).
+-BP-4017 Updated the bank transfer logo to a globally recognized version.
+-BP-3594 Resolved an extension conflict with the Wexo DHLShipping module regarding Riverty and B2B orders.
+-BP-3868 Resolved an issue where canceling an iDEAL transaction could result in an error page.
+-BP-3893 Resolved an issue with the PayPal Express button that was sometimes not displayed (in the cart page).
+-BP-3906 Resolved an error: The selected payment method does not exist.
+-BP-3910 Resolved an error: Plugin "BuckarooPaymentValidateSubmit" is already registered.
+-BP-3799 Resolve an issue with PayPal orders that contain a “+” sign and can’t process the PUSH correctly.
+-BP-3893 Resolve an issue where the PayPal Express button occasionally failed to appear on the product page.
+-BP-3985 Resolve an issue with Klarna KP and refunds that triggered an error when “Automatically Pay Reservation” was enabled in the Plaza.
+-BP-3886 iDEAL cancellation can result into a error page.
+-BP-3985 Resolved an issue where Klarna refunds from Shopware displayed an error when Automatic Capture was enabled in the Buckaroo Plaza.

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="https://www.buckaroo.nl/media/3476/shopware6_icon.png" width="200px" position="center">
+  <img src="https://github.com/user-attachments/assets/fec1c08d-c555-48ad-beab-671488a33295" width="200px" position="center">
 </p>
 
 # Buckaroo Shopware 6 Payments Plugin

composer.json

@@ -2,7 +2,7 @@
     "name": "buckaroo/shopware6",
     "description": "Buckaroo payment provider plugin for Shopware 6",
     "type": "shopware-platform-plugin",
-    "version": "2.3.1",
+    "version": "2.5.0",
     "license": "proprietary",
     "minimum-stability": "stable",
     "require": {
@@ -12,7 +12,7 @@
         "ext-pcre": "*",
         "ext-fileinfo": "*",
         "buckaroo/sdk": "^1.17.1",
-        "shopware/core": "*"
+        "shopware/core": "6.5.*|6.6.*"
     },
     "authors": [{
         "name": "Buckaroo",

src/Handlers/AsyncPaymentHandler.php

@@ -170,7 +170,14 @@ protected function handleResponse(
                 ],
                 $salesChannelContext->getContext()
             );
+
+        $this->asyncPaymentService->transactionService
+            ->updateTransactionCustomFields($transaction->getOrderTransaction()->getId(), [
+                'originalTransactionKey'    => $response->getTransactionKey()
+            ]);
+
         $this->setFeeOnOrder($transaction, $salesChannelContext, $paymentCode);
+
         if ($response->hasRedirect()) {
             $this->asyncPaymentService
                 ->checkoutHelper

src/Resources/app/storefront/src/main.js

@@ -2,7 +2,6 @@ import BuckarooPaymentCreditcards from './creditcards/buckaroo-payment.creditcar
 import BuckarooPaymentHelper from './helper/buckaroo-payment.helper';
 import BuckarooPaymentValidateSubmit from './helper/buckaroo-validate';
 import PaypalExpressPlugin from './paypal-express/paypal-express.plugin';
-import IdealFastCheckoutPlugin from './ideal-fast-checkout/ideal-fast-checkout.plugin';
 import ApplePayPlugin from './applepay/applepay.plugin';
 import BuckarooLoadScripts from './scripts/scripts.plugin';
 import IdealQrPlugin from './ideal-qr/ideal-qr.plugin';
@@ -11,14 +10,23 @@ import BuckarooPayByBankLogo from './paybybank/logo.plugin';
 import BuckarooBanContact from './bancontact/buckaroo-payment.bancontact';
 
 const PluginManager = window.PluginManager;
-PluginManager.register('BuckarooPaymentValidateSubmit', BuckarooPaymentValidateSubmit);
-PluginManager.register('BuckarooPaymentCreditcards', BuckarooPaymentCreditcards);
-PluginManager.register('BuckarooPaymentHelper', BuckarooPaymentHelper);
-PluginManager.register('PaypalExpressPlugin', PaypalExpressPlugin, '[data-paypal-express]');
-PluginManager.register('BuckarooIdealQrPlugin', IdealQrPlugin, '[data-ideal-qr]');
-PluginManager.register('BuckarooApplePayPlugin', ApplePayPlugin, '[data-bk-applepay]');
-PluginManager.register('BuckarooLoadScripts', BuckarooLoadScripts);
-PluginManager.register('BuckarooBanContact', BuckarooBanContact);
-PluginManager.register('BuckarooPayByBankSelect', BuckarooPayByBankSelect, '[data-bk-select]');
-PluginManager.register('BuckarooPayByBankLogo', BuckarooPayByBankLogo, '[data-bk-paybybank-logo]');
-PluginManager.register('IdealFastCheckoutPlugin', IdealFastCheckoutPlugin, '[data-bk-ideal-fast-checkout]');
+
+
+const init = () => {
+    if('BuckarooPaymentValidateSubmit' in window.PluginManager.getPluginList()) {
+        return;
+    }
+
+    PluginManager.register('BuckarooPaymentValidateSubmit', BuckarooPaymentValidateSubmit);
+    PluginManager.register('BuckarooPaymentCreditcards', BuckarooPaymentCreditcards);
+    PluginManager.register('BuckarooPaymentHelper', BuckarooPaymentHelper);
+    PluginManager.register('PaypalExpressPlugin', PaypalExpressPlugin, '[data-paypal-express]');
+    PluginManager.register('BuckarooIdealQrPlugin', IdealQrPlugin, '[data-ideal-qr]');
+    PluginManager.register('BuckarooApplePayPlugin', ApplePayPlugin, '[data-bk-applepay]');
+    PluginManager.register('BuckarooLoadScripts', BuckarooLoadScripts);
+    PluginManager.register('BuckarooBanContact', BuckarooBanContact);
+    PluginManager.register('BuckarooPayByBankSelect', BuckarooPayByBankSelect, '[data-bk-select]');
+    PluginManager.register('BuckarooPayByBankLogo', BuckarooPayByBankLogo, '[data-bk-paybybank-logo]');
+}
+
+init();

src/Resources/config/services.xml

@@ -150,6 +150,7 @@
             <argument type="service" id="Buckaroo\Shopware6\Service\StateTransitionService"/>
             <argument type="service" id="Buckaroo\Shopware6\Service\Buckaroo\ClientService"/>
             <argument type="service" id="Buckaroo\Shopware6\Helpers\CheckoutHelper"/>
+            <argument type="service" id="Buckaroo\Shopware6\Service\TransactionService"/>
             <argument type="service" id="Buckaroo\Shopware6\Helpers\Logger"/>
             <argument type="service" id="Buckaroo\Shopware6\Service\FormatRequestParamService"/>
             <argument type="service" id="Buckaroo\Shopware6\Service\PaymentStateService"/>