diff --git a/Model/Config.php b/Model/Config.php index 05509e7f..43a9a811 100644 --- a/Model/Config.php +++ b/Model/Config.php @@ -41,7 +41,9 @@ public function isTestMode() { return $this->store->getConfig('payment/paynl/testmode') == 1; } - + public function isSendDiscountTax(){ + return $this->store->getConfig('payment/paynl/discount_tax') == 1; + } public function isNeverCancel() { return $this->store->getConfig('payment/paynl/never_cancel') == 1; diff --git a/Model/Config/Source/Available/Eps.php b/Model/Config/Source/Available/Eps.php new file mode 100644 index 00000000..1241eb5d --- /dev/null +++ b/Model/Config/Source/Available/Eps.php @@ -0,0 +1,12 @@ +getBaseDiscountTaxCompensationAmount() * -1; } + if($this->paynlConfig->isSendDiscountTax() == 0){ + $discountTax = 0; + } + $discountDescription = __('Discount'); if ($discount != 0) { diff --git a/etc/adminhtml/paymentmethods.xml b/etc/adminhtml/paymentmethods.xml index 7b40b20d..8ac27398 100644 --- a/etc/adminhtml/paymentmethods.xml +++ b/etc/adminhtml/paymentmethods.xml @@ -16,6 +16,7 @@ + diff --git a/etc/adminhtml/paymentmethods/capayable_gespreid.xml b/etc/adminhtml/paymentmethods/capayable_gespreid.xml index 14b433c4..6f761b3a 100644 --- a/etc/adminhtml/paymentmethods/capayable_gespreid.xml +++ b/etc/adminhtml/paymentmethods/capayable_gespreid.xml @@ -6,8 +6,8 @@ --> - - + + diff --git a/etc/adminhtml/paymentmethods/eps.xml b/etc/adminhtml/paymentmethods/eps.xml new file mode 100644 index 00000000..10186597 --- /dev/null +++ b/etc/adminhtml/paymentmethods/eps.xml @@ -0,0 +1,108 @@ + + + + + + + + Paynl\Payment\Model\Config\Source\Available\Eps + payment/paynl_payment_eps/active + + + + payment/paynl_payment_eps/title + + 1 + + + + + Paynl\Payment\Model\Config\Source\Order\Status\PendingPayment + + 1 + + payment/paynl_payment_eps/order_status + + + + Magento\Payment\Model\Config\Source\Allspecificcountries + payment/paynl_payment_eps/allowspecific + + 1 + + + + + Magento\Directory\Model\Config\Source\Country + 1 + payment/paynl_payment_eps/specificcountry + + 1 + 1 + + + + + + 1 + + payment/paynl_payment_eps/instructions + + + + payment/paynl_payment_eps/min_order_total + + 1 + + + + + payment/paynl_payment_eps/max_order_total + + 1 + + + + + validate-number + payment/paynl_payment_eps/sort_order + + 1 + + + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_eps/send_new_order_email + + 1 + + + + + + + The id of the payment method, only change this if you are told to do so + payment/paynl_payment_eps/payment_option_id + + + + + \ No newline at end of file diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index 39bf370a..96b5d863 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -60,6 +60,12 @@ + + + + Magento\Config\Model\Config\Source\Yesno + Paynl\Payment\Block\Adminhtml\System\Config\Fieldset\Expanded diff --git a/etc/config.xml b/etc/config.xml index 9aee4e66..e1efee48 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -8,6 +8,10 @@ xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd"> + + Paynl\Payment\Model\Paymentmethod\Paylink + 1 + 1 Pay.nl betaallink @@ -66,7 +70,7 @@ 0 - Capayable Gespreid Betalen + In3 gespreid betalen 1813 pending_payment @@ -130,6 +134,17 @@ paynl_payment after_payment + + 0 + EPS Überweisung + 2062 + pending_payment + + order + Paynl\Payment\Model\Paymentmethod\Eps + paynl_payment + after_payment + 0 Fashioncheque diff --git a/etc/payment.xml b/etc/payment.xml index 23bc5b0f..448d45dc 100644 --- a/etc/payment.xml +++ b/etc/payment.xml @@ -36,6 +36,12 @@ 0 + + 0 + + + 0 + 0 diff --git a/i18n/nl_NL.csv b/i18n/nl_NL.csv index 80b074ee..46f9857b 100644 --- a/i18n/nl_NL.csv +++ b/i18n/nl_NL.csv @@ -58,4 +58,6 @@ "The AT-code of your token, you can find your tokens here", "De AT-code die bij het token hoort, je kunt je tokens hier vinden" "Your API-token, you can find your tokens here", "Jouw API-token, je kunt je tokens hier vinden" "The SL-code of your service, you can find your services here", "De SL-code die bij je dienst hoort, je kunt je diensten hier vinden", -"URL of the payment option icons. Default URL: https://www.pay.nl/images/payment_profiles/50x32/#paymentOptionId#.png","De URL van de payment option icoontjes. Standaard URL: https://www.pay.nl/images/payment_profiles/50x32/#paymentOptionId#.png" \ No newline at end of file +"URL of the payment option icons. Default URL: https://www.pay.nl/images/payment_profiles/50x32/#paymentOptionId#.png","De URL van de payment option icoontjes. Standaard URL: https://www.pay.nl/images/payment_profiles/50x32/#paymentOptionId#.png" +"Send discount tax","Korting btw versturen" +"Set this to NO if you have a mix of low and high vatrate products. Some pay later methods have issues when the discount has a tax amount other than the default vat categories","Zet dit op NEE als je hoog en laag btw producten verkoopt. Achteraf betaaloplossingen kunnen niet omgaan met een kortingsregel van samengestelde btw" \ No newline at end of file diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml index eef13ef5..ddd49ac9 100644 --- a/view/frontend/layout/checkout_index_index.xml +++ b/view/frontend/layout/checkout_index_index.xml @@ -50,6 +50,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 d596f6e3..a41a5be8 100644 --- a/view/frontend/web/js/view/payment/method-renderer.js +++ b/view/frontend/web/js/view/payment/method-renderer.js @@ -23,6 +23,7 @@ define( {type: 'paynl_payment_cashly', component: defaultComponent}, {type: 'paynl_payment_clickandbuy', component: defaultComponent}, {type: 'paynl_payment_dankort', component: defaultComponent}, + {type: 'paynl_payment_eps', component: defaultComponent}, {type: 'paynl_payment_fashioncheque', component: defaultComponent}, {type: 'paynl_payment_fashiongiftcard', component: defaultComponent}, {type: 'paynl_payment_focum', component: defaultComponent},