Merge remote-tracking branch 'origin/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/public/administration/js/buckaroo-payments.js # src/Resources/views/storefront/component/buy-widget/buy-widget-form.html.twig
buckaroo-it · Dec 13, 2024 · f2b4912 · f2b4912
2 parents bf12da0 + e9542a6
commit f2b4912
Show file tree

Hide file tree

Showing 14 changed files with 87 additions and 227 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -257,4 +257,15 @@ Compatible from Shopware 6.5.0 up to 6.5.6.1
 - BP-3614 Fix: Manual capture is not always working for Klarna (authorize/capture).
 
 # 2.3.1
-- Minor fixes
+- Minor fixes
+
+# 2.4.0
+
+- Add support for Shopware 6.6.6.0
+- Add support for Shopware 6.5.8.14
+- BP-3629 Add payment method: Blik
+- BP-3490 Add a Bancontact option to let consumer fill in card information in the Shopware checkout instead of the Buckaroo hosted payment page.
+- 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)
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ Start accepting payments within a few minutes.
 
 To use the Buckaroo plugin, please be aware of the following minimum requirements:
 - A Buckaroo account ([Dutch](https://www.buckaroo.nl/start) or [English](https://www.buckaroo.eu/solutions/request-form))
-- Shopware 6.5.0 up to 6.6.3.0
+- Shopware 6.5.0 up to 6.6.6.0
 - PHP 8.1, 8.2, 8.3
 
 ### Installation

diff --git a/src/Handlers/SofortPaymentHandler.php b/src/Handlers/SofortPaymentHandler.php
diff --git a/src/Helpers/GatewayHelper.php b/src/Helpers/GatewayHelper.php
@@ -14,7 +14,6 @@
 use Buckaroo\Shopware6\PaymentMethods\Alipay;
 use Buckaroo\Shopware6\PaymentMethods\Klarna;
 use Buckaroo\Shopware6\PaymentMethods\Paypal;
-use Buckaroo\Shopware6\PaymentMethods\Sofort;
 use Buckaroo\Shopware6\PaymentMethods\Belfius;
 use Buckaroo\Shopware6\PaymentMethods\Billink;
 use Buckaroo\Shopware6\PaymentMethods\IdealQr;
@@ -45,7 +44,6 @@ class GatewayHelper
         Creditcard::class,
         Creditcards::class,
         AfterPay::class,
-        Sofort::class,
         Paypal::class,
         Transfer::class,
         ApplePay::class,

diff --git a/src/Migration/Migration1733844659RemoveSofort.php b/src/Migration/Migration1733844659RemoveSofort.php
@@ -0,0 +1,35 @@
+<?php declare(strict_types=1);
+
+namespace Buckaroo\Shopware6\Migration;
+
+use Doctrine\DBAL\Connection;
+use Shopware\Core\Framework\Migration\MigrationStep;
+
+/**
+ * @internal
+ */
+class Migration1733844659RemoveSofort extends MigrationStep
+{
+    public const HANDLER_IDENTIFIER = 'Buckaroo\\Shopware6\\Handlers\\SofortPaymentHandler';
+    public function getCreationTimestamp(): int
+    {
+        return 1733844659;
+    }
+
+    public function update(Connection $connection): void
+    {
+        $connection->executeStatement(
+            "DELETE FROM `payment_method`
+                WHERE `handler_identifier` = :handlerIdentifier",
+            ['handlerIdentifier' => self::HANDLER_IDENTIFIER]
+        );
+    }
+    public function updateDestructive(Connection $connection): void
+    {
+        $connection->executeStatement(
+            "DELETE FROM `payment_method`
+                WHERE `handler_identifier` = :handlerIdentifier",
+            ['handlerIdentifier' => self::HANDLER_IDENTIFIER]
+        );
+    }
+}
diff --git a/src/PaymentMethods/Sofort.php b/src/PaymentMethods/Sofort.php
diff --git a/src/Resources/app/administration/src/components/buckaroo-payment-list/index.js b/src/Resources/app/administration/src/components/buckaroo-payment-list/index.js
@@ -117,10 +117,6 @@ Component.register("buckaroo-payment-list", {
                     code: "afterpay",
                     logo: "afterpay.svg"
                 },
-                {
-                    code: "sofortueberweisung",
-                    logo: "sofort.svg"
-                },
                 {
                     code: "sepadirectdebit",
                     logo: "sepa-directdebit.svg"

diff --git a/src/Resources/config/config.xml b/src/Resources/config/config.xml
@@ -984,59 +984,6 @@
         </input-field>
     </card>
 
-    <card>
-        <title>Sofort</title>
-        <name>sofortueberweisung</name>
-        <input-field type="bool">
-            <name>sofortueberweisungEnabled</name>
-            <label lang="en-GB">Enabled</label>
-            <label lang="nl-NL">Ingeschakeld</label>
-            <label lang="de-DE">Aktiviert</label>
-			<label lang="fr-FR">Activé</label>
-        </input-field>
-
-        <input-field type="single-select">
-            <name>sofortueberweisungEnvironment</name>
-            <label lang="en-GB">Test or Live:</label>
-            <label lang="de-DE">Test oder Live:</label>
-            <label lang="nl-NL">Test of Live:</label>
-			<label lang="fr-FR">Tester ou Vivre:</label>
-            <defaultValue>test</defaultValue>
-            <options>
-                <option>
-                    <id>test</id>
-                    <name>Test</name>
-                </option>
-                <option>
-                    <id>live</id>
-                    <name>Live</name>
-                </option>
-            </options>
-        </input-field>
-
-        <input-field>
-            <name>sofortueberweisungLabel</name>
-			<label lang="en-GB">Frontend label</label>
-			<label lang="de-DE">Frontend-Label</label>
-			<label lang="nl-NL">Frontend label</label>
-			<label lang="fr-FR">Étiquette frontale</label>
-			<helpText lang="en-GB">This displays the payment method name entered in the checkout (Frontend label).</helpText>
-			<helpText lang="de-DE">Hier wird der im Checkout eingegebene Name der Zahlungsmethode (Frontend-Label) angezeigt.</helpText>
-			<helpText lang="nl-NL">Dit weergeeft de ingevoerde betaalmethode naam in de checkout (Frontend-label).</helpText>
-			<helpText lang="fr-FR">Cela affiche le nom du mode de paiement saisi lors du paiement (Étiquette frontale).</helpText>	
-            <defaultValue>Sofort</defaultValue>
-        </input-field>
-
-        <input-field type="float">
-            <name>sofortueberweisungFee</name>
-            <min>0</min>
-            <max>1000</max>
-            <label lang="en-GB">Buckaroo Fee</label>
-            <label lang="nl-NL">Buckaroo betaaltoeslag</label>
-            <label lang="de-DE">Buckaroo Gebühr</label>
-			<label lang="fr-FR">Frais de buckaroo</label>
-        </input-field>
-    </card>
 
     <card>
     <title>PayPal</title>
@@ -1985,10 +1932,6 @@
                     <id>paypal</id>
                     <name>PayPal</name>
                 </option>
-                <option>
-                    <id>sofortueberweisung</id>
-                    <name>SOFORT</name>
-                </option>
                 <option>
                     <id>Przelewy24</id>
                     <name>Przelewy24</name>
@@ -2836,10 +2779,6 @@
                     <id>sepadirectdebit</id>
                     <name>SEPA Direct Debit</name>
                 </option>
-                <option>
-                    <id>sofortueberweisung</id>
-                    <name>Sofort Banking</name>
-                </option>
                 <option>
                     <id>belfius</id>
                     <name>Belfius</name>

diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
@@ -227,18 +227,14 @@
             <argument type="service" id="Buckaroo\Shopware6\Handlers\AfterPayOld" />
             <tag name="shopware.payment.method.async" />
         </service>
-
-        <service id="Buckaroo\Shopware6\Handlers\SofortPaymentHandler">
-            <argument type="service" id="Buckaroo\Shopware6\Service\AsyncPaymentService"/>
-            <tag name="shopware.payment.method.async" />
-        </service>
+
 
         <service id="Buckaroo\Shopware6\Handlers\PaypalPaymentHandler">
             <argument type="service" id="Buckaroo\Shopware6\Service\AsyncPaymentService"/>
             <argument type="service" id="Buckaroo\Shopware6\Service\UpdateOrderWithPaypalExpressData" />
             <tag name="shopware.payment.method.async" />
         </service>
-        
+
         <service id="Buckaroo\Shopware6\Handlers\TransferPaymentHandler">
             <argument type="service" id="Buckaroo\Shopware6\Service\AsyncPaymentService"/>
             <tag name="shopware.payment.method.async" />
@@ -263,12 +259,12 @@
             <argument type="service" id="Buckaroo\Shopware6\Service\AsyncPaymentService"/>
             <tag name="shopware.payment.method.async" />
         </service>
-        
+
         <service id="Buckaroo\Shopware6\Handlers\SepaDirectDebitPaymentHandler">
             <argument type="service" id="Buckaroo\Shopware6\Service\AsyncPaymentService"/>
             <tag name="shopware.payment.method.async" />
         </service>
-        
+
         <service id="Buckaroo\Shopware6\Handlers\PayconiqPaymentHandler">
             <argument type="service" id="Buckaroo\Shopware6\Service\AsyncPaymentService"/>
             <tag name="shopware.payment.method.async" />
@@ -283,7 +279,7 @@
             <argument type="service" id="Buckaroo\Shopware6\Service\AsyncPaymentService"/>
             <tag name="shopware.payment.method.async" />
         </service>
-       
+
         <service id="Buckaroo\Shopware6\Handlers\In3PaymentHandler">
             <argument type="service" id="Buckaroo\Shopware6\Service\AsyncPaymentService"/>
             <argument type="service" id="Buckaroo\Shopware6\Handlers\In3V2"/>
@@ -329,12 +325,12 @@
             <argument type="service" id="Buckaroo\Shopware6\Service\AsyncPaymentService"/>
             <tag name="shopware.payment.method.async" />
         </service>
-        
+
         <service id="Buckaroo\Shopware6\Handlers\BillinkPaymentHandler">
             <argument type="service" id="Buckaroo\Shopware6\Service\AsyncPaymentService"/>
             <tag name="shopware.payment.method.async" />
         </service>
-        
+
         <service id="Buckaroo\Shopware6\Handlers\BelfiusPaymentHandler">
             <argument type="service" id="Buckaroo\Shopware6\Service\AsyncPaymentService"/>
             <tag name="shopware.payment.method.async" />
@@ -345,7 +341,7 @@
             <argument type="service" id="Buckaroo\Shopware6\Service\CustomerService"/>
             <tag name="shopware.payment.method.async" />
         </service>
-        
+
         <service id="Buckaroo\Shopware6\Handlers\PayPerEmailPaymentHandler">
             <argument type="service" id="Buckaroo\Shopware6\Service\AsyncPaymentService"/>
             <argument type="service" id="Buckaroo\Shopware6\Service\PayLinkService"/>

diff --git a/src/Resources/public/administration/css/buckaroo-payments.css b/src/Resources/public/administration/css/buckaroo-payments.css