From c603de82b683502329b818170026445505cb44b5 Mon Sep 17 00:00:00 2001
From: "v.carkaxhija" <vegim.carkaxhija@gmail.com>
Date: Mon, 20 Jan 2025 10:03:11 +0100
Subject: [PATCH] update payment methods name, and add default name when you
 leave name empty

---
 Model/Config/Backend/EmptyToDelete.php        | 74 +++++++++++++++++++
 Setup/UpgradeData.php                         | 18 ++++-
 .../system/payment_methods/afterpay.xml       |  1 +
 .../system/payment_methods/afterpay2.xml      |  1 +
 .../system/payment_methods/afterpay20.xml     |  1 +
 .../system/payment_methods/alipay.xml         |  1 +
 .../system/payment_methods/applepay.xml       |  3 +-
 .../system/payment_methods/belfius.xml        |  1 +
 .../system/payment_methods/billink.xml        |  1 +
 etc/adminhtml/system/payment_methods/blik.xml |  1 +
 .../system/payment_methods/capayable_in3.xml  |  1 +
 .../payment_methods/capayable_postpay.xml     |  1 +
 .../system/payment_methods/creditcards.xml    |  1 +
 .../system/payment_methods/emandate.xml       |  1 +
 etc/adminhtml/system/payment_methods/eps.xml  |  1 +
 .../system/payment_methods/giftcards.xml      |  3 +-
 .../system/payment_methods/ideal.xml          |  1 +
 .../payment_methods/idealprocessing.xml       |  1 +
 etc/adminhtml/system/payment_methods/kbc.xml  |  1 +
 .../system/payment_methods/klarna.xml         |  1 +
 .../system/payment_methods/klarnain.xml       |  1 +
 .../system/payment_methods/klarnakp.xml       |  1 +
 .../system/payment_methods/knaken.xml         |  1 +
 .../system/payment_methods/mbway.xml          |  1 +
 .../system/payment_methods/mrcash.xml         |  1 +
 .../system/payment_methods/multibanco.xml     |  1 +
 etc/adminhtml/system/payment_methods/p24.xml  |  1 +
 .../system/payment_methods/paybybank.xml      |  3 +-
 .../system/payment_methods/payconiq.xml       |  1 +
 .../system/payment_methods/paypal.xml         |  1 +
 .../system/payment_methods/payperemail.xml    |  1 +
 .../system/payment_methods/pospayment.xml     |  1 +
 .../payment_methods/sepa_direct_debit.xml     |  1 +
 .../system/payment_methods/transfer.xml       |  1 +
 .../system/payment_methods/trustly.xml        |  1 +
 .../system/payment_methods/voucher.xml        |  1 +
 .../system/payment_methods/wechatpay.xml      |  1 +
 etc/config.xml                                |  1 +
 38 files changed, 130 insertions(+), 4 deletions(-)
 create mode 100644 Model/Config/Backend/EmptyToDelete.php

diff --git a/Model/Config/Backend/EmptyToDelete.php b/Model/Config/Backend/EmptyToDelete.php
new file mode 100644
index 000000000..38d230fcc
--- /dev/null
+++ b/Model/Config/Backend/EmptyToDelete.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace Buckaroo\Magento2\Model\Config\Backend;
+
+use Magento\Framework\App\Config\Value;
+use Magento\Framework\App\ResourceConnection;
+
+class EmptyToDelete extends Value
+{
+    /**
+     * @var ResourceConnection
+     */
+    protected $resourceConnection;
+
+    /**
+     * Constructor
+     *
+     * @param ResourceConnection $resourceConnection
+     * @param \Magento\Framework\Model\Context $context
+     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
+     * @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
+     * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
+     * @param array $data
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        \Magento\Framework\Model\Context $context,
+        \Magento\Framework\Registry $registry,
+        \Magento\Framework\App\Config\ScopeConfigInterface $config,
+        \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList,
+        \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
+        \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
+        array $data = []
+    ) {
+        $this->resourceConnection = $resourceConnection;
+        parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data);
+    }
+
+    /**
+     * Delete row from core_config_data if value is empty
+     *
+     * @return $this
+     */
+    public function beforeSave()
+    {
+        try {
+            $value = $this->getValue();
+
+            // If the value is empty, delete the row
+            if (empty($value)) {
+                $connection = $this->resourceConnection->getConnection();
+                $tableName = $this->resourceConnection->getTableName('core_config_data');
+
+                $connection->delete(
+                    $tableName,
+                    [
+                        'path = ?' => $this->getPath(),
+                        'scope = ?' => $this->getScope(),
+                        'scope_id = ?' => $this->getScopeId()
+                    ]
+                );
+
+                // Prevent saving an empty value
+                $this->setValue(null);
+            }
+        } catch (\Exception $e) {
+            $this->_logger->critical($e->getMessage());
+        }
+
+        return parent::beforeSave();
+    }
+}
diff --git a/Setup/UpgradeData.php b/Setup/UpgradeData.php
index 60bc4bc03..52cdbd124 100644
--- a/Setup/UpgradeData.php
+++ b/Setup/UpgradeData.php
@@ -568,8 +568,24 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
             $this->addCustomerLastPayByBankIssuer($setup);
         }
 
+        if (version_compare($context->getVersion(), '1.51.0', '<')) {
+            // Update buckaroo_magento2_mrcash title to 'Bancontact'
+            $setup->getConnection()->update(
+                $setup->getTable('core_config_data'),
+                ['value' => 'Bancontact'],
+                ['path = ?' => 'payment/buckaroo_magento2_mrcash/title']
+            );
+
+            // Update buckaroo_magento2_billink title to 'Billink'
+            $setup->getConnection()->update(
+                $setup->getTable('core_config_data'),
+                ['value' => 'Billink'],
+                ['path = ?' => 'payment/buckaroo_magento2_billink/title']
+            );
+        }
+
         $this->setCustomerIDIN($setup);
-        
+
         $this->setCustomerIsEighteenOrOlder($setup);
 
         $this->setProductIDIN($setup);
diff --git a/etc/adminhtml/system/payment_methods/afterpay.xml b/etc/adminhtml/system/payment_methods/afterpay.xml
index 7c3241434..b73b1ae62 100644
--- a/etc/adminhtml/system/payment_methods/afterpay.xml
+++ b/etc/adminhtml/system/payment_methods/afterpay.xml
@@ -36,6 +36,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_afterpay/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/afterpay2.xml b/etc/adminhtml/system/payment_methods/afterpay2.xml
index c0c5bdaa9..befd71e53 100644
--- a/etc/adminhtml/system/payment_methods/afterpay2.xml
+++ b/etc/adminhtml/system/payment_methods/afterpay2.xml
@@ -36,6 +36,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_afterpay2/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/afterpay20.xml b/etc/adminhtml/system/payment_methods/afterpay20.xml
index 777cdea99..38a21cdac 100644
--- a/etc/adminhtml/system/payment_methods/afterpay20.xml
+++ b/etc/adminhtml/system/payment_methods/afterpay20.xml
@@ -36,6 +36,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_afterpay20/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/alipay.xml b/etc/adminhtml/system/payment_methods/alipay.xml
index 06d0eeb54..32d88ccbe 100644
--- a/etc/adminhtml/system/payment_methods/alipay.xml
+++ b/etc/adminhtml/system/payment_methods/alipay.xml
@@ -36,6 +36,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_alipay/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/applepay.xml b/etc/adminhtml/system/payment_methods/applepay.xml
index 77d82e06b..8a0369c5b 100644
--- a/etc/adminhtml/system/payment_methods/applepay.xml
+++ b/etc/adminhtml/system/payment_methods/applepay.xml
@@ -42,6 +42,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_applepay/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -49,7 +50,7 @@
             <comment><![CDATA[This controls the description which the user sees during checkout.]]></comment>
             <config_path>payment/buckaroo_magento2_applepay/subtext</config_path>
         </field>
-        
+
         <field id="subtext_style" translate="label comment" type="select" sortOrder="26" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Frontend subtext style</label>
             <comment><![CDATA[Choose a font style for the subtext.]]></comment>
diff --git a/etc/adminhtml/system/payment_methods/belfius.xml b/etc/adminhtml/system/payment_methods/belfius.xml
index da72fedbe..37226b813 100644
--- a/etc/adminhtml/system/payment_methods/belfius.xml
+++ b/etc/adminhtml/system/payment_methods/belfius.xml
@@ -36,6 +36,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_belfius/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/billink.xml b/etc/adminhtml/system/payment_methods/billink.xml
index 4ecdd83f8..8233786e5 100644
--- a/etc/adminhtml/system/payment_methods/billink.xml
+++ b/etc/adminhtml/system/payment_methods/billink.xml
@@ -36,6 +36,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_billink/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/blik.xml b/etc/adminhtml/system/payment_methods/blik.xml
index 70f399cc1..9ed3d9cc0 100644
--- a/etc/adminhtml/system/payment_methods/blik.xml
+++ b/etc/adminhtml/system/payment_methods/blik.xml
@@ -36,6 +36,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_blik/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/capayable_in3.xml b/etc/adminhtml/system/payment_methods/capayable_in3.xml
index 72cae7f4c..2190b352a 100644
--- a/etc/adminhtml/system/payment_methods/capayable_in3.xml
+++ b/etc/adminhtml/system/payment_methods/capayable_in3.xml
@@ -41,6 +41,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_capayablein3/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/capayable_postpay.xml b/etc/adminhtml/system/payment_methods/capayable_postpay.xml
index 239694c6a..41298c37a 100644
--- a/etc/adminhtml/system/payment_methods/capayable_postpay.xml
+++ b/etc/adminhtml/system/payment_methods/capayable_postpay.xml
@@ -34,6 +34,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_capayablepostpay/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/creditcards.xml b/etc/adminhtml/system/payment_methods/creditcards.xml
index a0112fb53..32fbc902a 100644
--- a/etc/adminhtml/system/payment_methods/creditcards.xml
+++ b/etc/adminhtml/system/payment_methods/creditcards.xml
@@ -55,6 +55,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_creditcards/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/emandate.xml b/etc/adminhtml/system/payment_methods/emandate.xml
index b00c9c3f7..33a397c15 100644
--- a/etc/adminhtml/system/payment_methods/emandate.xml
+++ b/etc/adminhtml/system/payment_methods/emandate.xml
@@ -33,6 +33,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_emandate/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/eps.xml b/etc/adminhtml/system/payment_methods/eps.xml
index aaafdc9ed..4f7ca5f63 100644
--- a/etc/adminhtml/system/payment_methods/eps.xml
+++ b/etc/adminhtml/system/payment_methods/eps.xml
@@ -36,6 +36,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_eps/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/giftcards.xml b/etc/adminhtml/system/payment_methods/giftcards.xml
index 0ab1b0ee8..b85cc4037 100644
--- a/etc/adminhtml/system/payment_methods/giftcards.xml
+++ b/etc/adminhtml/system/payment_methods/giftcards.xml
@@ -35,6 +35,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_giftcards/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -42,7 +43,7 @@
             <comment><![CDATA[This controls the description which the user sees during checkout.]]></comment>
             <config_path>payment/buckaroo_magento2_giftcards/subtext</config_path>
         </field>
-        
+
         <field id="subtext_style" translate="label comment" type="select" sortOrder="26" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Frontend subtext style</label>
             <comment><![CDATA[Choose a font style for the subtext.]]></comment>
diff --git a/etc/adminhtml/system/payment_methods/ideal.xml b/etc/adminhtml/system/payment_methods/ideal.xml
index e49a53568..e95fd4a8d 100644
--- a/etc/adminhtml/system/payment_methods/ideal.xml
+++ b/etc/adminhtml/system/payment_methods/ideal.xml
@@ -44,6 +44,7 @@ For precise cost details, please reach out to <a href="mailto:wecare@buckaroo.nl
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_ideal/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/idealprocessing.xml b/etc/adminhtml/system/payment_methods/idealprocessing.xml
index 722f0fd32..edbed5192 100644
--- a/etc/adminhtml/system/payment_methods/idealprocessing.xml
+++ b/etc/adminhtml/system/payment_methods/idealprocessing.xml
@@ -42,6 +42,7 @@ For precise cost details, please reach out to <a href="mailto:wecare@buckaroo.nl
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_idealprocessing/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/kbc.xml b/etc/adminhtml/system/payment_methods/kbc.xml
index 226ffb178..b4a58099b 100644
--- a/etc/adminhtml/system/payment_methods/kbc.xml
+++ b/etc/adminhtml/system/payment_methods/kbc.xml
@@ -34,6 +34,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_kbc/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/klarna.xml b/etc/adminhtml/system/payment_methods/klarna.xml
index 83e71765b..376344b84 100644
--- a/etc/adminhtml/system/payment_methods/klarna.xml
+++ b/etc/adminhtml/system/payment_methods/klarna.xml
@@ -36,6 +36,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_klarna/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/klarnain.xml b/etc/adminhtml/system/payment_methods/klarnain.xml
index 6c2c4aa97..7f2560a64 100644
--- a/etc/adminhtml/system/payment_methods/klarnain.xml
+++ b/etc/adminhtml/system/payment_methods/klarnain.xml
@@ -36,6 +36,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_klarnain/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/klarnakp.xml b/etc/adminhtml/system/payment_methods/klarnakp.xml
index 7e80678fd..fb7ed04b6 100644
--- a/etc/adminhtml/system/payment_methods/klarnakp.xml
+++ b/etc/adminhtml/system/payment_methods/klarnakp.xml
@@ -36,6 +36,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_klarnakp/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/knaken.xml b/etc/adminhtml/system/payment_methods/knaken.xml
index ff2dcc5e4..1d4f1e313 100644
--- a/etc/adminhtml/system/payment_methods/knaken.xml
+++ b/etc/adminhtml/system/payment_methods/knaken.xml
@@ -34,6 +34,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_knaken/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/mbway.xml b/etc/adminhtml/system/payment_methods/mbway.xml
index ab34946b0..89432fb04 100644
--- a/etc/adminhtml/system/payment_methods/mbway.xml
+++ b/etc/adminhtml/system/payment_methods/mbway.xml
@@ -34,6 +34,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_mbway/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/mrcash.xml b/etc/adminhtml/system/payment_methods/mrcash.xml
index 7f770666e..e14f145dd 100644
--- a/etc/adminhtml/system/payment_methods/mrcash.xml
+++ b/etc/adminhtml/system/payment_methods/mrcash.xml
@@ -36,6 +36,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_mrcash/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/multibanco.xml b/etc/adminhtml/system/payment_methods/multibanco.xml
index e402c00fa..8e65869f5 100644
--- a/etc/adminhtml/system/payment_methods/multibanco.xml
+++ b/etc/adminhtml/system/payment_methods/multibanco.xml
@@ -34,6 +34,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_multibanco/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/p24.xml b/etc/adminhtml/system/payment_methods/p24.xml
index 9d026ce91..f2175b262 100644
--- a/etc/adminhtml/system/payment_methods/p24.xml
+++ b/etc/adminhtml/system/payment_methods/p24.xml
@@ -36,6 +36,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_p24/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/paybybank.xml b/etc/adminhtml/system/payment_methods/paybybank.xml
index 3ec7053d0..2310b75dc 100644
--- a/etc/adminhtml/system/payment_methods/paybybank.xml
+++ b/etc/adminhtml/system/payment_methods/paybybank.xml
@@ -36,6 +36,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_paybybank/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -43,7 +44,7 @@
             <comment><![CDATA[This controls the description which the user sees during checkout.]]></comment>
             <config_path>payment/buckaroo_magento2_paybybank/subtext</config_path>
         </field>
-        
+
         <field id="subtext_style" translate="label comment" type="select" sortOrder="26" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Frontend subtext style</label>
             <comment><![CDATA[Choose a font style for the subtext.]]></comment>
diff --git a/etc/adminhtml/system/payment_methods/payconiq.xml b/etc/adminhtml/system/payment_methods/payconiq.xml
index d322df434..8843ad4d8 100644
--- a/etc/adminhtml/system/payment_methods/payconiq.xml
+++ b/etc/adminhtml/system/payment_methods/payconiq.xml
@@ -36,6 +36,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_payconiq/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/paypal.xml b/etc/adminhtml/system/payment_methods/paypal.xml
index 2ec44a858..9bec3319e 100644
--- a/etc/adminhtml/system/payment_methods/paypal.xml
+++ b/etc/adminhtml/system/payment_methods/paypal.xml
@@ -36,6 +36,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_paypal/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/payperemail.xml b/etc/adminhtml/system/payment_methods/payperemail.xml
index fc59f99e0..3578f183d 100644
--- a/etc/adminhtml/system/payment_methods/payperemail.xml
+++ b/etc/adminhtml/system/payment_methods/payperemail.xml
@@ -36,6 +36,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_payperemail/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/pospayment.xml b/etc/adminhtml/system/payment_methods/pospayment.xml
index 5affaf9c9..17198e68b 100644
--- a/etc/adminhtml/system/payment_methods/pospayment.xml
+++ b/etc/adminhtml/system/payment_methods/pospayment.xml
@@ -34,6 +34,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_pospayment/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/sepa_direct_debit.xml b/etc/adminhtml/system/payment_methods/sepa_direct_debit.xml
index 99c7f2bb6..da69647c7 100644
--- a/etc/adminhtml/system/payment_methods/sepa_direct_debit.xml
+++ b/etc/adminhtml/system/payment_methods/sepa_direct_debit.xml
@@ -36,6 +36,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_sepadirectdebit/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/transfer.xml b/etc/adminhtml/system/payment_methods/transfer.xml
index 812fd2ab3..363159802 100644
--- a/etc/adminhtml/system/payment_methods/transfer.xml
+++ b/etc/adminhtml/system/payment_methods/transfer.xml
@@ -36,6 +36,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_transfer/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/trustly.xml b/etc/adminhtml/system/payment_methods/trustly.xml
index 668b7dfa0..0c3cbac75 100644
--- a/etc/adminhtml/system/payment_methods/trustly.xml
+++ b/etc/adminhtml/system/payment_methods/trustly.xml
@@ -36,6 +36,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_trustly/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/voucher.xml b/etc/adminhtml/system/payment_methods/voucher.xml
index d30ea4111..2571114d3 100644
--- a/etc/adminhtml/system/payment_methods/voucher.xml
+++ b/etc/adminhtml/system/payment_methods/voucher.xml
@@ -36,6 +36,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_voucher/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/wechatpay.xml b/etc/adminhtml/system/payment_methods/wechatpay.xml
index c3e614ce2..934d45c59 100644
--- a/etc/adminhtml/system/payment_methods/wechatpay.xml
+++ b/etc/adminhtml/system/payment_methods/wechatpay.xml
@@ -36,6 +36,7 @@
             <label>Frontend label</label>
             <comment><![CDATA[Determines the frontend label shown.]]></comment>
             <config_path>payment/buckaroo_magento2_wechatpay/title</config_path>
+            <backend_model>Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete</backend_model>
         </field>
 
         <field id="subtext" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/config.xml b/etc/config.xml
index a1a9697a3..d1de43ba8 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -42,6 +42,7 @@
                 <model>Buckaroo\Magento2\Model\Method\Ideal</model>
                 <order_status>pending</order_status>
                 <title>iDEAL</title>
+                <default>iDEAL</default>
                 <allowspecific>0</allowspecific>
                 <sort_order>10</sort_order>
                 <order_email>1</order_email>