Merge branch 'master' into 'master'

Removed Giropay.

See merge request plugins/magento2!121

Model/Config/Master.php

@@ -174,7 +174,6 @@ private function updatePaymentMethods()
             'przelewy24' => 'Przelewy24',
             'safeklick' => 'Safeklick',
             'banktransfer' => 'Bank transfer',
-            'giropay' => 'Giropay',
             'giftcard' => 'Gift Card',
             'capayable' => 'Capayable',
             'bitcoin' => 'Bitcoin',

composer.json

@@ -2,7 +2,7 @@
 	"name": "cardgate/magento2",
 	"description": "CardGate Module for Magento 2",
 	"homepage": "https://www.cardgate.com",
-	"version": "2.0.54",
+	"version": "2.0.55",
 	"keywords": [ "cardgate", "ideal", "bancontact", "creditcard", "magento" ],
 	"require": {
 		"php": ">=7.2",

etc/adminhtml/system.xml

@@ -604,51 +604,6 @@
 					<frontend_class>validate-number</frontend_class>
 				</field>
 			</group>
-			<group id="cardgate_giropay" translate="label" type="text" sortOrder="140" showInDefault="1" showInWebsite="1" showInStore="1">
-				<label>CardGate giropay</label>
-				<frontend_model>Cardgate\Payment\Block\Adminhtml\Config\GroupPaymentMethod</frontend_model>
-				<field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-					<label>Enabled</label>
-					<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-				</field>
-				<field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-					<label>Title</label>
-					<comment>Shown on the payment page.</comment>
-				</field>
-				<field id="allowspecific" translate="label" type="allowspecific" sortOrder="130" showInDefault="9" showInWebsite="1"
-					   showInStore="0">
-					<label>Payment from Applicable Countries</label>
-					<source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
-				</field>
-				<field id="specificcountry" translate="label" type="multiselect" sortOrder="140" showInDefault="1" showInWebsite="1"
-					   showInStore="0">
-					<label>Payment from Specific Countries</label>
-					<source_model>Magento\Directory\Model\Config\Source\Country</source_model>
-				</field>
-				<field id="instructions" translate="label" type="textarea" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="1">
-					<label>Instructions</label>
-				</field>
-				<field id="paymentfee_fixed" translate="label" type="text" sortOrder="160" showInDefault="1" showInWebsite="1" showInStore="1">
-					<label>Payment fee Fixed</label>
-					<frontend_class>validate-number</frontend_class>
-					<comment><![CDATA[Fixed Payment fee amount. Can be used in conjunction with Payment fee Percentage.]]></comment>
-				</field>
-				<field id="paymentfee_percentage" translate="label" type="text" sortOrder="170" showInDefault="1" showInWebsite="1"
-					   showInStore="1">
-					<label>Payment fee Percentage</label>
-					<frontend_class>validate-number</frontend_class>
-					<comment><![CDATA[Payment fee percentage. Can be used in conjunction with Payment fee Fixed. Note: Fixed amount will be applied after percentage.]]></comment>
-				</field>
-				<field id="specific_customer_groups" translate="label" type="multiselect" sortOrder="180" showInDefault="1" showInWebsite="1"
-					   showInStore="0">
-					<label>Payment method for specific customer groups</label>
-					<source_model>Cardgate\Payment\Model\Config\Source\Group</source_model>
-				</field>
-				<field id="sort_order" translate="label" type="text" sortOrder="190" showInDefault="1" showInWebsite="1" showInStore="0">
-					<label>Sort Order</label>
-					<frontend_class>validate-number</frontend_class>
-				</field>
-			</group>
 			<group id="cardgate_ideal" translate="label" type="text" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="1">
 				<label>CardGate ideal</label>
 				<frontend_model>Cardgate\Payment\Block\Adminhtml\Config\GroupPaymentMethod</frontend_model>

etc/module.xml

@@ -5,7 +5,7 @@
 	See LICENSE for license details.
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-	<module name="Cardgate_Payment" setup_version="2.0.54">
+	<module name="Cardgate_Payment" setup_version="2.0.55">
 		<sequence>
 			<module name="Magento_Quote" />
 			<module name="Magento_Sales" />