From bbc56193c4343d5cd45c26f8d00f035aa92e514e Mon Sep 17 00:00:00 2001 From: bryantvdberg Date: Mon, 15 Mar 2021 15:33:05 +0100 Subject: [PATCH 1/9] Add payment method Good4fun and SofortHighRisk --- Model/ConfigProvider.php | 2 ++ README.md | 5 ++-- etc/adminhtml/paymentmethods.xml | 2 ++ etc/config.xml | 25 +++++++++++++++++++ etc/payment.xml | 6 +++++ view/frontend/layout/checkout_index_index.xml | 6 +++++ .../web/js/view/payment/method-renderer.js | 2 ++ 7 files changed, 46 insertions(+), 2 deletions(-) diff --git a/Model/ConfigProvider.php b/Model/ConfigProvider.php index 170a860e..c970d532 100644 --- a/Model/ConfigProvider.php +++ b/Model/ConfigProvider.php @@ -38,6 +38,7 @@ class ConfigProvider implements ConfigProviderInterface 'paynl_payment_gezondheidsbon', 'paynl_payment_giropay', 'paynl_payment_givacard', + 'paynl_payment_good4fun', 'paynl_payment_huisentuincadeau', 'paynl_payment_ideal', 'paynl_payment_instore', @@ -54,6 +55,7 @@ class ConfigProvider implements ConfigProviderInterface 'paynl_payment_podiumcadeaukaart', 'paynl_payment_postepay', 'paynl_payment_przelewy24', + 'paynl_payment_soforthighrisk', 'paynl_payment_sofortbanking', 'paynl_payment_spraypay', 'paynl_payment_telefonischbetalen', diff --git a/README.md b/README.md index 151a84af..c82b7ea1 100644 --- a/README.md +++ b/README.md @@ -26,9 +26,10 @@ MyBank | Carte Bancaire | Podium Cadeaukaart | Capayable Achteraf Betalen | Cash SOFORT | PostePay | Gezondheidsbon | in3 keer betalen, 0% rente | Pay Fixed Price (phone) | Maestro | Dankort | Fashion Giftcard | Klarna | Instore Payments (POS) | Bank Transfer | Cartasi | GivaCard | SprayPay | Przelewy24 | -| Tikkie | De Cadeaukaart | YourGift | Creditclick | Apple Pay | +Sofort High Risk | Tikkie | De Cadeaukaart | YourGift | Creditclick | Apple Pay | | Multibanco | | Paysafecard | | Payconiq -| | | Huis en Tuin Cadeau +| | | Huis en Tuin Cadeau +| | | Good 4 Fun # Requirements diff --git a/etc/adminhtml/paymentmethods.xml b/etc/adminhtml/paymentmethods.xml index 7bfc0b1a..8858dc5f 100644 --- a/etc/adminhtml/paymentmethods.xml +++ b/etc/adminhtml/paymentmethods.xml @@ -27,6 +27,7 @@ + @@ -44,6 +45,7 @@ + diff --git a/etc/config.xml b/etc/config.xml index 1ec94392..34c8144a 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -287,6 +287,18 @@ In order to pay for your order click the link below paynl_payment after_payment + + 0 + Good 4 Fun + 2628 + pending_payment + processing + processing + order + Paynl\Payment\Model\Paymentmethod\Good4fun + paynl_payment + after_payment + 0 Huis en Tuin Cadeau @@ -494,6 +506,19 @@ In order to pay for your order click the link below paynl_payment before_payment + + 0 + Sofort High Risk + 595 + pending_payment + processing + processing + 1 + order + Paynl\Payment\Model\Paymentmethod\Soforthighrisk + paynl_payment + before_payment + 0 SprayPay diff --git a/etc/payment.xml b/etc/payment.xml index 6638e6ca..508497ae 100644 --- a/etc/payment.xml +++ b/etc/payment.xml @@ -63,6 +63,9 @@ 0 + + 0 + 0 @@ -117,6 +120,9 @@ 0 + + 0 + 0 diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml index 7263b62d..7e91a24c 100644 --- a/view/frontend/layout/checkout_index_index.xml +++ b/view/frontend/layout/checkout_index_index.xml @@ -83,6 +83,9 @@ true + + true + true @@ -134,6 +137,9 @@ true + + true + true diff --git a/view/frontend/web/js/view/payment/method-renderer.js b/view/frontend/web/js/view/payment/method-renderer.js index fcb6a74c..9144b569 100644 --- a/view/frontend/web/js/view/payment/method-renderer.js +++ b/view/frontend/web/js/view/payment/method-renderer.js @@ -32,6 +32,7 @@ define( {type: 'paynl_payment_gezondheidsbon', component: defaultComponent}, {type: 'paynl_payment_giropay', component: defaultComponent}, {type: 'paynl_payment_givacard', component: defaultComponent}, + {type: 'paynl_payment_good4fun', component: defaultComponent}, {type: 'paynl_payment_huisentuincadeau', component: defaultComponent}, {type: 'paynl_payment_ideal', component: defaultComponent}, {type: 'paynl_payment_instore', component: defaultComponent}, @@ -49,6 +50,7 @@ define( {type: 'paynl_payment_postepay', component: defaultComponent}, {type: 'paynl_payment_przelewy24', component: defaultComponent}, {type: 'paynl_payment_sofortbanking', component: defaultComponent}, + {type: 'paynl_payment_soforthighrisk', component: defaultComponent}, {type: 'paynl_payment_spraypay', component: defaultComponent}, {type: 'paynl_payment_telefonischbetalen', component: defaultComponent}, {type: 'paynl_payment_tikkie', component: defaultComponent}, From 5cb8b718271b4bbb5c1dc4a906a7e339e1951132 Mon Sep 17 00:00:00 2001 From: bryantvdberg Date: Wed, 17 Mar 2021 10:37:33 +0100 Subject: [PATCH 2/9] Add files --- Model/Config/Source/Available/Good4fun.php | 12 ++ .../Source/Available/Soforthighrisk.php | 12 ++ Model/Paymentmethod/Good4fun.php | 20 +++ Model/Paymentmethod/Soforthighrisk.php | 20 +++ etc/adminhtml/paymentmethods/good4fun.xml | 152 ++++++++++++++++++ .../paymentmethods/soforthighrisk.xml | 152 ++++++++++++++++++ 6 files changed, 368 insertions(+) create mode 100644 Model/Config/Source/Available/Good4fun.php create mode 100644 Model/Config/Source/Available/Soforthighrisk.php create mode 100644 Model/Paymentmethod/Good4fun.php create mode 100644 Model/Paymentmethod/Soforthighrisk.php create mode 100644 etc/adminhtml/paymentmethods/good4fun.xml create mode 100644 etc/adminhtml/paymentmethods/soforthighrisk.xml diff --git a/Model/Config/Source/Available/Good4fun.php b/Model/Config/Source/Available/Good4fun.php new file mode 100644 index 00000000..26d79455 --- /dev/null +++ b/Model/Config/Source/Available/Good4fun.php @@ -0,0 +1,12 @@ + + + + + + + Paynl\Payment\Model\Config\Source\Available\Good4fun + payment/paynl_payment_good4fun/active + + + + payment/paynl_payment_good4fun/title + + 1 + + + + + Paynl\Payment\Model\Config\Source\Order\Status\PendingPayment + + 1 + + payment/paynl_payment_good4fun/order_status + + + + Paynl\Payment\Model\Config\Source\Order\Status\Processing + + 1 + + payment/paynl_payment_good4fun/order_status_authorized + + + + Paynl\Payment\Model\Config\Source\Order\Status\Processing + + 1 + + payment/paynl_payment_good4fun/order_status_processing + + + + Magento\Config\Model\Config\Source\Yesno + payment/paynl_payment_good4fun/holded + + 1 + + + + + + Magento\Payment\Model\Config\Source\Allspecificcountries + payment/paynl_payment_good4fun/allowspecific + + 1 + + + + + Magento\Directory\Model\Config\Source\Country + 1 + payment/paynl_payment_good4fun/specificcountry + + 1 + 1 + + + + + + 1 + + payment/paynl_payment_good4fun/instructions + + + + payment/paynl_payment_good4fun/min_order_total + + 1 + + + + + payment/paynl_payment_good4fun/max_order_total + + 1 + + + + + validate-number + payment/paynl_payment_good4fun/sort_order + + 1 + + + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_good4fun/send_new_order_email + + 1 + + + + + Magento\Shipping\Model\Config\Source\Allmethods + 1 + + 1 + + payment/paynl_payment_good4fun/disallowedshipping + + + + + Paynl\Payment\Model\Config\Source\showCompanyOptions + + 1 + + payment/paynl_payment_good4fun/showforcompany + + + + + + + The id of the payment method, only change this if you are told to do so + payment/paynl_payment_good4fun/payment_option_id + + + + + diff --git a/etc/adminhtml/paymentmethods/soforthighrisk.xml b/etc/adminhtml/paymentmethods/soforthighrisk.xml new file mode 100644 index 00000000..884ece98 --- /dev/null +++ b/etc/adminhtml/paymentmethods/soforthighrisk.xml @@ -0,0 +1,152 @@ + + + + + + + Paynl\Payment\Model\Config\Source\Available\Soforthighrisk + payment/paynl_payment_soforthighrisk/active + + + + payment/paynl_payment_soforthighrisk/title + + 1 + + + + + Paynl\Payment\Model\Config\Source\Order\Status\PendingPayment + + 1 + + payment/paynl_payment_soforthighrisk/order_status + + + + Paynl\Payment\Model\Config\Source\Order\Status\Processing + + 1 + + payment/paynl_payment_soforthighrisk/order_status_authorized + + + + Paynl\Payment\Model\Config\Source\Order\Status\Processing + + 1 + + payment/paynl_payment_soforthighrisk/order_status_processing + + + + Magento\Config\Model\Config\Source\Yesno + payment/paynl_payment_soforthighrisk/holded + + 1 + + + + + + Magento\Payment\Model\Config\Source\Allspecificcountries + payment/paynl_payment_soforthighrisk/allowspecific + + 1 + + + + + Magento\Directory\Model\Config\Source\Country + 1 + payment/paynl_payment_soforthighrisk/specificcountry + + 1 + 1 + + + + + + 1 + + payment/paynl_payment_soforthighrisk/instructions + + + + payment/paynl_payment_soforthighrisk/min_order_total + + 1 + + + + + payment/paynl_payment_soforthighrisk/max_order_total + + 1 + + + + + validate-number + payment/paynl_payment_soforthighrisk/sort_order + + 1 + + + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_soforthighrisk/send_new_order_email + + 1 + + + + + Magento\Shipping\Model\Config\Source\Allmethods + 1 + + 1 + + payment/paynl_payment_soforthighrisk/disallowedshipping + + + + + Paynl\Payment\Model\Config\Source\showCompanyOptions + + 1 + + payment/paynl_payment_soforthighrisk/showforcompany + + + + + + + The id of the payment method, only change this if you are told to do so + payment/paynl_payment_soforthighrisk/payment_option_id + + + + + From 2c2b39dbde228be348e1a3008a8f9a79b6a4ac33 Mon Sep 17 00:00:00 2001 From: bryantvdberg Date: Wed, 17 Mar 2021 12:09:18 +0100 Subject: [PATCH 3/9] change "good 4 fun" to "good4fun" --- README.md | 2 +- etc/adminhtml/paymentmethods/good4fun.xml | 2 +- etc/config.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c82b7ea1..3ea59423 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Bank Transfer | Cartasi | GivaCard | SprayPay | Przelewy24 | Sofort High Risk | Tikkie | De Cadeaukaart | YourGift | Creditclick | Apple Pay | | Multibanco | | Paysafecard | | Payconiq | | | Huis en Tuin Cadeau -| | | Good 4 Fun +| | | Good4Fun # Requirements diff --git a/etc/adminhtml/paymentmethods/good4fun.xml b/etc/adminhtml/paymentmethods/good4fun.xml index 8cc8def9..ee071c50 100644 --- a/etc/adminhtml/paymentmethods/good4fun.xml +++ b/etc/adminhtml/paymentmethods/good4fun.xml @@ -2,7 +2,7 @@ - + diff --git a/etc/config.xml b/etc/config.xml index 34c8144a..9c04bcef 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -289,7 +289,7 @@ In order to pay for your order click the link below 0 - Good 4 Fun + Good4Fun 2628 pending_payment processing From 6385d1ac36d8bc4a70fafdcae66e37e775b1ca6f Mon Sep 17 00:00:00 2001 From: "k.verschoor@pay.nl" Date: Wed, 24 Mar 2021 11:54:29 +0100 Subject: [PATCH 4/9] Remove sofort highrisk from PR --- .../Config/Source/Available/Sofortbanking.php | 12 -- Model/ConfigProvider.php | 1 - Model/Paymentmethod/Soforthighrisk.php | 20 --- README.md | 2 +- etc/adminhtml/paymentmethods.xml | 1 - .../paymentmethods/soforthighrisk.xml | 152 ------------------ etc/config.xml | 15 +- etc/payment.xml | 3 - view/frontend/layout/checkout_index_index.xml | 3 - .../web/js/view/payment/method-renderer.js | 1 - 10 files changed, 2 insertions(+), 208 deletions(-) delete mode 100644 Model/Config/Source/Available/Sofortbanking.php delete mode 100644 Model/Paymentmethod/Soforthighrisk.php delete mode 100644 etc/adminhtml/paymentmethods/soforthighrisk.xml diff --git a/Model/Config/Source/Available/Sofortbanking.php b/Model/Config/Source/Available/Sofortbanking.php deleted file mode 100644 index e1d5ba69..00000000 --- a/Model/Config/Source/Available/Sofortbanking.php +++ /dev/null @@ -1,12 +0,0 @@ - - diff --git a/etc/adminhtml/paymentmethods/soforthighrisk.xml b/etc/adminhtml/paymentmethods/soforthighrisk.xml deleted file mode 100644 index 884ece98..00000000 --- a/etc/adminhtml/paymentmethods/soforthighrisk.xml +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - Paynl\Payment\Model\Config\Source\Available\Soforthighrisk - payment/paynl_payment_soforthighrisk/active - - - - payment/paynl_payment_soforthighrisk/title - - 1 - - - - - Paynl\Payment\Model\Config\Source\Order\Status\PendingPayment - - 1 - - payment/paynl_payment_soforthighrisk/order_status - - - - Paynl\Payment\Model\Config\Source\Order\Status\Processing - - 1 - - payment/paynl_payment_soforthighrisk/order_status_authorized - - - - Paynl\Payment\Model\Config\Source\Order\Status\Processing - - 1 - - payment/paynl_payment_soforthighrisk/order_status_processing - - - - Magento\Config\Model\Config\Source\Yesno - payment/paynl_payment_soforthighrisk/holded - - 1 - - - - - - Magento\Payment\Model\Config\Source\Allspecificcountries - payment/paynl_payment_soforthighrisk/allowspecific - - 1 - - - - - Magento\Directory\Model\Config\Source\Country - 1 - payment/paynl_payment_soforthighrisk/specificcountry - - 1 - 1 - - - - - - 1 - - payment/paynl_payment_soforthighrisk/instructions - - - - payment/paynl_payment_soforthighrisk/min_order_total - - 1 - - - - - payment/paynl_payment_soforthighrisk/max_order_total - - 1 - - - - - validate-number - payment/paynl_payment_soforthighrisk/sort_order - - 1 - - - - - Paynl\Payment\Model\Config\Source\SendNewOrderEmail - payment/paynl_payment_soforthighrisk/send_new_order_email - - 1 - - - - - Magento\Shipping\Model\Config\Source\Allmethods - 1 - - 1 - - payment/paynl_payment_soforthighrisk/disallowedshipping - - - - - Paynl\Payment\Model\Config\Source\showCompanyOptions - - 1 - - payment/paynl_payment_soforthighrisk/showforcompany - - - - - - - The id of the payment method, only change this if you are told to do so - payment/paynl_payment_soforthighrisk/payment_option_id - - - - - diff --git a/etc/config.xml b/etc/config.xml index 9c04bcef..09e8eb66 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -505,20 +505,7 @@ In order to pay for your order click the link below Paynl\Payment\Model\Paymentmethod\Sofortbanking paynl_payment before_payment - - - 0 - Sofort High Risk - 595 - pending_payment - processing - processing - 1 - order - Paynl\Payment\Model\Paymentmethod\Soforthighrisk - paynl_payment - before_payment - + 0 SprayPay diff --git a/etc/payment.xml b/etc/payment.xml index 508497ae..8fe85071 100644 --- a/etc/payment.xml +++ b/etc/payment.xml @@ -120,9 +120,6 @@ 0 - - 0 - 0 diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml index 7e91a24c..ac1728da 100644 --- a/view/frontend/layout/checkout_index_index.xml +++ b/view/frontend/layout/checkout_index_index.xml @@ -137,9 +137,6 @@ true - - true - true diff --git a/view/frontend/web/js/view/payment/method-renderer.js b/view/frontend/web/js/view/payment/method-renderer.js index 9144b569..2fc9d4ef 100644 --- a/view/frontend/web/js/view/payment/method-renderer.js +++ b/view/frontend/web/js/view/payment/method-renderer.js @@ -50,7 +50,6 @@ define( {type: 'paynl_payment_postepay', component: defaultComponent}, {type: 'paynl_payment_przelewy24', component: defaultComponent}, {type: 'paynl_payment_sofortbanking', component: defaultComponent}, - {type: 'paynl_payment_soforthighrisk', component: defaultComponent}, {type: 'paynl_payment_spraypay', component: defaultComponent}, {type: 'paynl_payment_telefonischbetalen', component: defaultComponent}, {type: 'paynl_payment_tikkie', component: defaultComponent}, From 6bee1466ddb7309c896e2c9a502078efc8099c3e Mon Sep 17 00:00:00 2001 From: "k.verschoor@pay.nl" Date: Wed, 24 Mar 2021 11:59:17 +0100 Subject: [PATCH 5/9] Add back sofort and remove highrisk --- .../{Soforthighrisk.php => Sofortbanking.php} | 6 +- .../SofortbankingDigitalServices.php | 12 ++ .../paymentmethods/soforthighrisk.xml | 152 ++++++++++++++++++ 3 files changed, 167 insertions(+), 3 deletions(-) rename Model/Config/Source/Available/{Soforthighrisk.php => Sofortbanking.php} (75%) create mode 100644 Model/Config/Source/Available/SofortbankingDigitalServices.php create mode 100644 etc/adminhtml/paymentmethods/soforthighrisk.xml diff --git a/Model/Config/Source/Available/Soforthighrisk.php b/Model/Config/Source/Available/Sofortbanking.php similarity index 75% rename from Model/Config/Source/Available/Soforthighrisk.php rename to Model/Config/Source/Available/Sofortbanking.php index b53833ab..e1d5ba69 100644 --- a/Model/Config/Source/Available/Soforthighrisk.php +++ b/Model/Config/Source/Available/Sofortbanking.php @@ -6,7 +6,7 @@ namespace Paynl\Payment\Model\Config\Source\Available; -class Soforthighrisk extends Available +class Sofortbanking extends Available { - protected $_class = \Paynl\Payment\Model\Paymentmethod\Soforthighrisk::class; -} + protected $_class = \Paynl\Payment\Model\Paymentmethod\Sofortbanking::class; +} \ No newline at end of file diff --git a/Model/Config/Source/Available/SofortbankingDigitalServices.php b/Model/Config/Source/Available/SofortbankingDigitalServices.php new file mode 100644 index 00000000..b522c4da --- /dev/null +++ b/Model/Config/Source/Available/SofortbankingDigitalServices.php @@ -0,0 +1,12 @@ + + + + + + + Paynl\Payment\Model\Config\Source\Available\Soforthighrisk + payment/paynl_payment_soforthighrisk/active + + + + payment/paynl_payment_soforthighrisk/title + + 1 + + + + + Paynl\Payment\Model\Config\Source\Order\Status\PendingPayment + + 1 + + payment/paynl_payment_soforthighrisk/order_status + + + + Paynl\Payment\Model\Config\Source\Order\Status\Processing + + 1 + + payment/paynl_payment_soforthighrisk/order_status_authorized + + + + Paynl\Payment\Model\Config\Source\Order\Status\Processing + + 1 + + payment/paynl_payment_soforthighrisk/order_status_processing + + + + Magento\Config\Model\Config\Source\Yesno + payment/paynl_payment_soforthighrisk/holded + + 1 + + + + + + Magento\Payment\Model\Config\Source\Allspecificcountries + payment/paynl_payment_soforthighrisk/allowspecific + + 1 + + + + + Magento\Directory\Model\Config\Source\Country + 1 + payment/paynl_payment_soforthighrisk/specificcountry + + 1 + 1 + + + + + + 1 + + payment/paynl_payment_soforthighrisk/instructions + + + + payment/paynl_payment_soforthighrisk/min_order_total + + 1 + + + + + payment/paynl_payment_soforthighrisk/max_order_total + + 1 + + + + + validate-number + payment/paynl_payment_soforthighrisk/sort_order + + 1 + + + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_soforthighrisk/send_new_order_email + + 1 + + + + + Magento\Shipping\Model\Config\Source\Allmethods + 1 + + 1 + + payment/paynl_payment_soforthighrisk/disallowedshipping + + + + + Paynl\Payment\Model\Config\Source\showCompanyOptions + + 1 + + payment/paynl_payment_soforthighrisk/showforcompany + + + + + + + The id of the payment method, only change this if you are told to do so + payment/paynl_payment_soforthighrisk/payment_option_id + + + + + From 0f2b7dd0e5306eef8a18ca9e0cd723e20f7f1aa8 Mon Sep 17 00:00:00 2001 From: "k.verschoor@pay.nl" Date: Wed, 24 Mar 2021 12:01:13 +0100 Subject: [PATCH 6/9] remove --- .../Available/SofortbankingDigitalServices.php | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 Model/Config/Source/Available/SofortbankingDigitalServices.php diff --git a/Model/Config/Source/Available/SofortbankingDigitalServices.php b/Model/Config/Source/Available/SofortbankingDigitalServices.php deleted file mode 100644 index b522c4da..00000000 --- a/Model/Config/Source/Available/SofortbankingDigitalServices.php +++ /dev/null @@ -1,12 +0,0 @@ - Date: Wed, 24 Mar 2021 12:07:21 +0100 Subject: [PATCH 7/9] Remove 2 --- .../paymentmethods/soforthighrisk.xml | 152 ------------------ 1 file changed, 152 deletions(-) delete mode 100644 etc/adminhtml/paymentmethods/soforthighrisk.xml diff --git a/etc/adminhtml/paymentmethods/soforthighrisk.xml b/etc/adminhtml/paymentmethods/soforthighrisk.xml deleted file mode 100644 index 884ece98..00000000 --- a/etc/adminhtml/paymentmethods/soforthighrisk.xml +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - Paynl\Payment\Model\Config\Source\Available\Soforthighrisk - payment/paynl_payment_soforthighrisk/active - - - - payment/paynl_payment_soforthighrisk/title - - 1 - - - - - Paynl\Payment\Model\Config\Source\Order\Status\PendingPayment - - 1 - - payment/paynl_payment_soforthighrisk/order_status - - - - Paynl\Payment\Model\Config\Source\Order\Status\Processing - - 1 - - payment/paynl_payment_soforthighrisk/order_status_authorized - - - - Paynl\Payment\Model\Config\Source\Order\Status\Processing - - 1 - - payment/paynl_payment_soforthighrisk/order_status_processing - - - - Magento\Config\Model\Config\Source\Yesno - payment/paynl_payment_soforthighrisk/holded - - 1 - - - - - - Magento\Payment\Model\Config\Source\Allspecificcountries - payment/paynl_payment_soforthighrisk/allowspecific - - 1 - - - - - Magento\Directory\Model\Config\Source\Country - 1 - payment/paynl_payment_soforthighrisk/specificcountry - - 1 - 1 - - - - - - 1 - - payment/paynl_payment_soforthighrisk/instructions - - - - payment/paynl_payment_soforthighrisk/min_order_total - - 1 - - - - - payment/paynl_payment_soforthighrisk/max_order_total - - 1 - - - - - validate-number - payment/paynl_payment_soforthighrisk/sort_order - - 1 - - - - - Paynl\Payment\Model\Config\Source\SendNewOrderEmail - payment/paynl_payment_soforthighrisk/send_new_order_email - - 1 - - - - - Magento\Shipping\Model\Config\Source\Allmethods - 1 - - 1 - - payment/paynl_payment_soforthighrisk/disallowedshipping - - - - - Paynl\Payment\Model\Config\Source\showCompanyOptions - - 1 - - payment/paynl_payment_soforthighrisk/showforcompany - - - - - - - The id of the payment method, only change this if you are told to do so - payment/paynl_payment_soforthighrisk/payment_option_id - - - - - From 4439301ddbcef449f88a35cb41b29ed8c4c607bf Mon Sep 17 00:00:00 2001 From: "k.verschoor@pay.nl" Date: Wed, 24 Mar 2021 13:29:51 +0100 Subject: [PATCH 8/9] Merge conflict solved --- etc/config.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/etc/config.xml b/etc/config.xml index be9b19d2..9abd31e1 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -506,9 +506,6 @@ In order to pay for your order click the link below Paynl\Payment\Model\Paymentmethod\Sofortbanking paynl_payment before_payment -<<<<<<< HEAD - -======= 0 @@ -536,7 +533,6 @@ In order to pay for your order click the link below paynl_payment before_payment ->>>>>>> master 0 SprayPay From e1559c1864603fa72d3fe58653a6b757c3854ea5 Mon Sep 17 00:00:00 2001 From: "k.verschoor@pay.nl" Date: Wed, 24 Mar 2021 14:32:44 +0100 Subject: [PATCH 9/9] Fix good4fun's order --- etc/adminhtml/paymentmethods/good4fun.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/adminhtml/paymentmethods/good4fun.xml b/etc/adminhtml/paymentmethods/good4fun.xml index ee071c50..66718097 100644 --- a/etc/adminhtml/paymentmethods/good4fun.xml +++ b/etc/adminhtml/paymentmethods/good4fun.xml @@ -1,7 +1,7 @@ - +