diff --git a/Helper/Data.php b/Helper/Data.php index acc7ae5..4da904c 100644 --- a/Helper/Data.php +++ b/Helper/Data.php @@ -38,7 +38,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper { - protected $_pluginVersion = '1.0.9'; + protected $_pluginVersion = '1.0.10'; protected $_pluginName = 'Wirecard/CheckoutSeamless'; /** diff --git a/Model/ConfigProvider.php b/Model/ConfigProvider.php index 6efd1ce..8f232e2 100644 --- a/Model/ConfigProvider.php +++ b/Model/ConfigProvider.php @@ -62,7 +62,6 @@ class ConfigProvider implements ConfigProviderInterface Payment\Trustly::CODE, Payment\Paybox::CODE, Payment\Paysafecard::CODE, - Payment\Quick::CODE, Payment\Paypal::CODE, Payment\Epaybg::CODE, Payment\Sepa::CODE, diff --git a/Model/Payment/Quick.php b/Model/Payment/Quick.php deleted file mode 100644 index 4e336d4..0000000 --- a/Model/Payment/Quick.php +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - Magento\Config\Model\Config\Source\Yesno - - - - - - - Magento\Shipping\Model\Config\Source\Allmethods - - - - Magento\Payment\Model\Config\Source\Allspecificcountries - - - - Magento\Directory\Model\Config\Source\Country - 1 - - - - - - - validate-number - - - - - - - - - diff --git a/etc/config.xml b/etc/config.xml index 11aae39..ef22763 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -256,14 +256,6 @@ 310 - - 0 - Wirecard Checkout Seamless @Quick - You will be redirected to Wirecard Checkout Seamless when you place an order. - Wirecard\CheckoutSeamless\Model\Payment\Quick - 320 - - 0 Wirecard Checkout Seamless Skrill Digital Wallet diff --git a/i18n/de_AT.csv b/i18n/de_AT.csv index 498250c..f50e8e1 100644 --- a/i18n/de_AT.csv +++ b/i18n/de_AT.csv @@ -55,7 +55,6 @@ "Version: %product","Version: %product" "Void not possible anymore for this payment, please try cancel instead!","Das Aufheben der Authorisierung ist nicht mehr möglich!" "Wirecard Checkout Seamless Fund Transfer","Wirecard Checkout Seamless Auszahlungr" -"Wirecard Checkout Seamless @Quick","Wirecard Checkout Seamless @Quick" "Wirecard Checkout Seamless Bancontact","Wirecard Checkout Seamless Bancontact" "Wirecard Checkout Seamless Credit Card - Mail Order / Telephone Order","Wirecard Checkout Page Kreditkarte - Post / Telefonbestellung" "Wirecard Checkout Seamless Credit Card","Wirecard Checkout Seamless Kreditkarte" diff --git a/i18n/en_US.csv b/i18n/en_US.csv index 1691097..4ffd845 100644 --- a/i18n/en_US.csv +++ b/i18n/en_US.csv @@ -54,7 +54,6 @@ "Transaction identifier","Transaction identifier" "Version: %product","Version: %product" "Void not possible anymore for this payment, please try cancel instead!","Void not possible anymore for this payment, please try cancel instead!" -"Wirecard Checkout Seamless @Quick","Wirecard Checkout Seamless @Quick" "Wirecard Checkout Seamless Bancontact","Wirecard Checkout Seamless Bancontact" "Wirecard Checkout Seamless Credit Card - Mail Order / Telephone Order","Wirecard Checkout Seamless Credit Card - Mail Order / Telephone Order" "Wirecard Checkout Seamless Credit Card","Wirecard Checkout Seamless Credit Card" diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml index 2677692..4a9f376 100644 --- a/view/frontend/layout/checkout_index_index.xml +++ b/view/frontend/layout/checkout_index_index.xml @@ -105,9 +105,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 c786d48..96930fc 100644 --- a/view/frontend/web/js/view/payment/method-renderer.js +++ b/view/frontend/web/js/view/payment/method-renderer.js @@ -108,10 +108,6 @@ define( type: 'wirecard_checkoutseamless_paysafecard', component: 'Wirecard_CheckoutSeamless/js/view/payment/method-renderer/standard' }, - { - type: 'wirecard_checkoutseamless_quick', - component: 'Wirecard_CheckoutSeamless/js/view/payment/method-renderer/standard' - }, { type: 'wirecard_checkoutseamless_paypal', component: 'Wirecard_CheckoutSeamless/js/view/payment/method-renderer/standard' diff --git a/view/frontend/web/js/view/payment/method-renderer/ccard.js b/view/frontend/web/js/view/payment/method-renderer/ccard.js index 4daaeb0..4e1114f 100644 --- a/view/frontend/web/js/view/payment/method-renderer/ccard.js +++ b/view/frontend/web/js/view/payment/method-renderer/ccard.js @@ -173,7 +173,7 @@ define( return $.extend(true, parent, {'additional_data': additionalData}); }, placeWirecardOrder: function () { - if (this.validate()) { + if (this.validate() && additionalValidators.validate()) { var paymentMethod = this.getPaymentMethod(), ccData = {}, failure = function (errors, messageContainer) { diff --git a/view/frontend/web/js/view/payment/method-renderer/eps.js b/view/frontend/web/js/view/payment/method-renderer/eps.js index 43143aa..31719aa 100644 --- a/view/frontend/web/js/view/payment/method-renderer/eps.js +++ b/view/frontend/web/js/view/payment/method-renderer/eps.js @@ -61,9 +61,16 @@ define( var frm = $('#' + this.getCode() + '-form'); return frm.validation() && frm.validation('isValid'); }, - getFinancialInstitutions: function () { return window.checkoutConfig.payment[this.getCode()].financialinstitutions; + }, + placeWirecardOrder: function() { + if (this.validate() && additionalValidators.validate()) { + this.selectPaymentMethod(); + + setPaymentMethodAction(this.messageContainer, this.getDisplayMode()); + } + return false; } }); } diff --git a/view/frontend/web/js/view/payment/method-renderer/ideal.js b/view/frontend/web/js/view/payment/method-renderer/ideal.js index 819d5d8..138e06c 100644 --- a/view/frontend/web/js/view/payment/method-renderer/ideal.js +++ b/view/frontend/web/js/view/payment/method-renderer/ideal.js @@ -34,9 +34,10 @@ define( 'Wirecard_CheckoutSeamless/js/view/payment/method-renderer/standard', 'Wirecard_CheckoutSeamless/js/action/set-payment-method', 'mage/url', - 'jquery' + 'jquery', + 'Magento_Checkout/js/model/payment/additional-validators' ], - function (Component, setPaymentMethodAction, url, $) { + function (Component, setPaymentMethodAction, url, $, additionalValidators) { return Component.extend({ defaults: { template: 'Wirecard_CheckoutSeamless/payment/method-ideal' @@ -61,6 +62,15 @@ define( getFinancialInstitutions: function () { return window.checkoutConfig.payment[this.getCode()].financialinstitutions; + }, + + placeWirecardOrder: function() { + if (this.validate() && additionalValidators.validate()) { + this.selectPaymentMethod(); + + setPaymentMethodAction(this.messageContainer, this.getDisplayMode()); + } + return false; } }); } diff --git a/view/frontend/web/js/view/payment/method-renderer/invoiceinstallment.js b/view/frontend/web/js/view/payment/method-renderer/invoiceinstallment.js index 1777bcb..4eb70d5 100644 --- a/view/frontend/web/js/view/payment/method-renderer/invoiceinstallment.js +++ b/view/frontend/web/js/view/payment/method-renderer/invoiceinstallment.js @@ -36,9 +36,10 @@ define( 'Wirecard_CheckoutSeamless/js/model/min-age-validator', 'mage/url', 'jquery', - 'mage/translate' + 'mage/translate', + 'Magento_Checkout/js/model/payment/additional-validators' ], - function (Component, setPaymentMethodAction, minAgeValidator, url, $, $t) { + function (Component, setPaymentMethodAction, minAgeValidator, url, $, $t, additionalValidators) { return Component.extend({ customerData: {}, @@ -90,8 +91,16 @@ define( getConsentText: function () { return window.checkoutConfig.payment[this.getCode()].consenttxt; - } + }, + + placeWirecardOrder: function() { + if (this.validate() && additionalValidators.validate()) { + this.selectPaymentMethod(); + setPaymentMethodAction(this.messageContainer, this.getDisplayMode()); + } + return false; + } }); } ); diff --git a/view/frontend/web/js/view/payment/method-renderer/trustpay.js b/view/frontend/web/js/view/payment/method-renderer/trustpay.js index 219d6d9..5e5734a 100644 --- a/view/frontend/web/js/view/payment/method-renderer/trustpay.js +++ b/view/frontend/web/js/view/payment/method-renderer/trustpay.js @@ -35,8 +35,9 @@ define( 'Wirecard_CheckoutSeamless/js/action/set-payment-method', 'mage/url', 'jquery', + 'Magento_Checkout/js/model/payment/additional-validators' ], - function (Component, setPaymentMethodAction, url, $) { + function (Component, setPaymentMethodAction, url, $, additionalValidators) { return Component.extend({ defaults: { template: 'Wirecard_CheckoutSeamless/payment/method-trustpay' @@ -65,6 +66,15 @@ define( getFinancialInstitutions: function () { return window.checkoutConfig.payment[this.getCode()].financialinstitutions; + }, + + placeWirecardOrder: function() { + if (this.validate() && additionalValidators.validate()) { + this.selectPaymentMethod(); + + setPaymentMethodAction(this.messageContainer, this.getDisplayMode()); + } + return false; } }); }