From 0250542c59e13a6635e02185e053133244950ffe Mon Sep 17 00:00:00 2001 From: Anne Date: Mon, 11 Nov 2024 15:48:15 +0100 Subject: [PATCH] Add Visa and Mastercard --- Model/Config.php | 2 + Model/Config/Source/Available/Mastercard.php | 8 + Model/Config/Source/Available/Visa.php | 8 + Model/ConfigProvider.php | 2 + Model/Paymentmethod/Mastercard.php | 16 ++ Model/Paymentmethod/Visa.php | 16 ++ etc/adminhtml/paymentmethods.xml | 2 + etc/adminhtml/paymentmethods/mastercard.xml | 153 ++++++++++++++++++ etc/adminhtml/paymentmethods/visa.xml | 153 ++++++++++++++++++ etc/config.xml | 24 +++ etc/payment.xml | 6 + view/frontend/layout/checkout_index_index.xml | 6 + .../web/js/view/payment/method-renderer.js | 2 + 13 files changed, 398 insertions(+) create mode 100644 Model/Config/Source/Available/Mastercard.php create mode 100644 Model/Config/Source/Available/Visa.php create mode 100644 Model/Paymentmethod/Mastercard.php create mode 100644 Model/Paymentmethod/Visa.php create mode 100644 etc/adminhtml/paymentmethods/mastercard.xml create mode 100644 etc/adminhtml/paymentmethods/visa.xml diff --git a/Model/Config.php b/Model/Config.php index 3589efe8..b11dddc8 100644 --- a/Model/Config.php +++ b/Model/Config.php @@ -105,6 +105,7 @@ class Config "paynl_payment_klarnakp" => "15", "paynl_payment_kunstencultuurkaart" => "315", "paynl_payment_maestro" => "33", + "paynl_payment_mastercard" => "8", "paynl_payment_mistercash" => "2", "paynl_payment_mobilepay" => "324", "paynl_payment_monizze" => "183", @@ -132,6 +133,7 @@ class Config "paynl_payment_stadspasamsterdam" => "336", "paynl_payment_telefonischbetalen" => "173", "paynl_payment_trustly" => "213", + "paynl_payment_visa" => "228", "paynl_payment_visamastercard" => "7", "paynl_payment_vvvgiftcard" => "25", "paynl_payment_webshopgiftcard" => "26", diff --git a/Model/Config/Source/Available/Mastercard.php b/Model/Config/Source/Available/Mastercard.php new file mode 100644 index 00000000..76eb6077 --- /dev/null +++ b/Model/Config/Source/Available/Mastercard.php @@ -0,0 +1,8 @@ + + @@ -75,6 +76,7 @@ + diff --git a/etc/adminhtml/paymentmethods/mastercard.xml b/etc/adminhtml/paymentmethods/mastercard.xml new file mode 100644 index 00000000..18abbc30 --- /dev/null +++ b/etc/adminhtml/paymentmethods/mastercard.xml @@ -0,0 +1,153 @@ + + + + + + + Paynl\Payment\Model\Config\Source\Available\Mastercard + payment/paynl_payment_mastercard/active + + + + payment/paynl_payment_mastercard/title + + 1 + + + + + Paynl\Payment\Model\Config\Source\Order\Status\PendingPayment + + 1 + + payment/paynl_payment_mastercard/order_status + + + + Paynl\Payment\Model\Config\Source\Order\Status\Processing + + 1 + + payment/paynl_payment_mastercard/order_status_authorized + + + + Paynl\Payment\Model\Config\Source\Order\Status\Processing + + 1 + + payment/paynl_payment_mastercard/order_status_processing + + + + Magento\Payment\Model\Config\Source\Allspecificcountries + payment/paynl_payment_mastercard/allowspecific + + 1 + + + + + Magento\Directory\Model\Config\Source\Country + 1 + payment/paynl_payment_mastercard/specificcountry + + 1 + 1 + + + + + + 1 + + payment/paynl_payment_mastercard/instructions + + + + payment/paynl_payment_mastercard/min_order_total + + 1 + + + + + payment/paynl_payment_mastercard/max_order_total + + 1 + + + + + validate-number + payment/paynl_payment_mastercard/sort_order + + 1 + + + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_mastercard/send_new_order_email + + 1 + + + + + Magento\Shipping\Model\Config\Source\Allmethods + 1 + + 1 + + payment/paynl_payment_mastercard/disallowedshipping + + + + + Paynl\Payment\Model\Config\Source\ShowCompanyOptions + + 1 + + payment/paynl_payment_mastercard/showforcompany + By default payment methods are available in the checkout for all customer types. +Private, B2C: Only show this payment method when the customer didn't enter a company name. +Business, BB2: Only show this payment method when the customer entered a company name. + + + + + Paynl\Payment\Model\Config\Source\UserGroups + + 1 + + payment/paynl_payment_mastercard/showforgroup + + + + + + + Only change this if you are told to do so by Pay. Support + payment/paynl_payment_mastercard/payment_option_id + + + + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/visa.xml b/etc/adminhtml/paymentmethods/visa.xml new file mode 100644 index 00000000..45c4b6c6 --- /dev/null +++ b/etc/adminhtml/paymentmethods/visa.xml @@ -0,0 +1,153 @@ + + + + + + + Paynl\Payment\Model\Config\Source\Available\Visa + payment/paynl_payment_visa/active + + + + payment/paynl_payment_visa/title + + 1 + + + + + Paynl\Payment\Model\Config\Source\Order\Status\PendingPayment + + 1 + + payment/paynl_payment_visa/order_status + + + + Paynl\Payment\Model\Config\Source\Order\Status\Processing + + 1 + + payment/paynl_payment_visa/order_status_authorized + + + + Paynl\Payment\Model\Config\Source\Order\Status\Processing + + 1 + + payment/paynl_payment_visa/order_status_processing + + + + Magento\Payment\Model\Config\Source\Allspecificcountries + payment/paynl_payment_visa/allowspecific + + 1 + + + + + Magento\Directory\Model\Config\Source\Country + 1 + payment/paynl_payment_visa/specificcountry + + 1 + 1 + + + + + + 1 + + payment/paynl_payment_visa/instructions + + + + payment/paynl_payment_visa/min_order_total + + 1 + + + + + payment/paynl_payment_visa/max_order_total + + 1 + + + + + validate-number + payment/paynl_payment_visa/sort_order + + 1 + + + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_visa/send_new_order_email + + 1 + + + + + Magento\Shipping\Model\Config\Source\Allmethods + 1 + + 1 + + payment/paynl_payment_visa/disallowedshipping + + + + + Paynl\Payment\Model\Config\Source\ShowCompanyOptions + + 1 + + payment/paynl_payment_visa/showforcompany + By default payment methods are available in the checkout for all customer types. +Private, B2C: Only show this payment method when the customer didn't enter a company name. +Business, BB2: Only show this payment method when the customer entered a company name. + + + + + Paynl\Payment\Model\Config\Source\UserGroups + + 1 + + payment/paynl_payment_visa/showforgroup + + + + + + + Only change this if you are told to do so by Pay. Support + payment/paynl_payment_visa/payment_option_id + + + + + \ No newline at end of file diff --git a/etc/config.xml b/etc/config.xml index 64f2ad0a..ef119ff5 100755 --- a/etc/config.xml +++ b/etc/config.xml @@ -593,6 +593,18 @@ To finish your order, click the link below paynl_payment after_payment + + 0 + Mastercard + 3138 + pending_payment + processing + processing + order + Paynl\Payment\Model\Paymentmethod\Mastercard + paynl_payment + after_payment + 0 Bancontact @@ -921,6 +933,18 @@ To finish your order, click the link below paynl_payment after_payment + + 0 + Visa + 3141 + pending_payment + processing + processing + order + Paynl\Payment\Model\Paymentmethod\Visa + paynl_payment + after_payment + 0 Visa / Mastercard diff --git a/etc/payment.xml b/etc/payment.xml index c3e08838..935053b2 100644 --- a/etc/payment.xml +++ b/etc/payment.xml @@ -135,6 +135,9 @@ 0 + + 0 + 0 @@ -213,6 +216,9 @@ 0 + + 0 + 0 diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml index 73b8063c..ec50c6f9 100755 --- a/view/frontend/layout/checkout_index_index.xml +++ b/view/frontend/layout/checkout_index_index.xml @@ -159,6 +159,9 @@ true + + true + true @@ -237,6 +240,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 072d2fdb..754abcae 100755 --- a/view/frontend/web/js/view/payment/method-renderer.js +++ b/view/frontend/web/js/view/payment/method-renderer.js @@ -59,6 +59,7 @@ define( {type: 'paynl_payment_klarnakp', component: defaultComponent}, {type: 'paynl_payment_kunstencultuurkaart', component: defaultComponent}, {type: 'paynl_payment_maestro', component: defaultComponent}, + {type: 'paynl_payment_mastercard', component: defaultComponent}, {type: 'paynl_payment_mistercash', component: defaultComponent}, {type: 'paynl_payment_mobilepay', component: defaultComponent}, {type: 'paynl_payment_monizze', component: defaultComponent}, @@ -85,6 +86,7 @@ define( {type: 'paynl_payment_stadspasamsterdam', component: defaultComponent}, {type: 'paynl_payment_telefonischbetalen', component: defaultComponent}, {type: 'paynl_payment_trustly', component: defaultComponent}, + {type: 'paynl_payment_visa', component: defaultComponent}, {type: 'paynl_payment_visamastercard', component: defaultComponent}, {type: 'paynl_payment_vvvgiftcard', component: defaultComponent}, {type: 'paynl_payment_webshopgiftcard', component: defaultComponent},