Skip to content

A
Adyen Magento2

We will be off from 27/1 (Monday) to 31/1 (Friday) (GMT +7) for our Tet Holiday (Lunar New Year) in our country

Commit 02f25d5a authored by Bas Maassen's avatar Bas Maassen Committed by GitHub
Browse files
Options

PW-338 Validation Additional fields (#233) 

* PW-338 Validation Additional fields
parent fc27e41c
Show whitespace changes
Inline Side-by-side
Showing with 33 additions and 27 deletions
Block/Redirect/Redirect.php
View file @ 02f25d5a
...@@ -301,9 +301,6 @@ class Redirect extends \Magento\Payment\Block\Form ...@@ -301,9 +301,6 @@ class Redirect extends \Magento\Payment\Block\Form
// don't allow editable shipping/delivery address // don't allow editable shipping/delivery address
$formFields['billingAddressType'] = "1"; $formFields['billingAddressType'] = "1";
$formFields['deliveryAddressType'] = "1"; $formFields['deliveryAddressType'] = "1";
// make setting to make this optional
$formFields['shopperType'] = "1";
} }
if ($this->_order->getPayment()->getAdditionalInformation("df_value") != "") { if ($this->_order->getPayment()->getAdditionalInformation("df_value") != "") {
......
view/frontend/web/js/view/payment/method-renderer/adyen-hpp-method.js
View file @ 02f25d5a
...@@ -148,7 +148,7 @@ define( ...@@ -148,7 +148,7 @@ define(
return self.item.method; return self.item.method;
}; };
result.validate = function () { result.validate = function () {
return self.validate(); return self.validate(value.brandCode);
}; };
result.isPaymentMethodOpenInvoiceMethod = function () { result.isPaymentMethodOpenInvoiceMethod = function () {
return value.isPaymentMethodOpenInvoiceMethod; return value.isPaymentMethodOpenInvoiceMethod;
...@@ -234,7 +234,8 @@ define( ...@@ -234,7 +234,8 @@ define(
if (brandCode() == "ideal") { if (brandCode() == "ideal") {
additionalData.issuer_id = this.issuerId(); additionalData.issuer_id = this.issuerId();
} else if (self.isPaymentMethodOpenInvoiceMethod()) { }
else if (self.isPaymentMethodOpenInvoiceMethod()) {
additionalData.gender = this.gender(); additionalData.gender = this.gender();
additionalData.dob = this.dob(); additionalData.dob = this.dob();
additionalData.telephone = this.telephone(); additionalData.telephone = this.telephone();
...@@ -292,7 +293,14 @@ define( ...@@ -292,7 +293,14 @@ define(
isIconEnabled: function () { isIconEnabled: function () {
return window.checkoutConfig.payment.adyen.showLogo; return window.checkoutConfig.payment.adyen.showLogo;
}, },
validate: function () { validate: function (brandCode) {
var form = '#payment_form_' + this.getCode() + '_' + brandCode;
var validate = $(form).validation() && $(form).validation('isValid');
if(!validate) {
return false;
}
return true; return true;
}, },
getRatePayDeviceIdentToken: function () { getRatePayDeviceIdentToken: function () {
......
view/frontend/web/template/payment/hpp-form.html
View file @ 02f25d5a
...@@ -52,8 +52,8 @@ ...@@ -52,8 +52,8 @@
<!--/ko--> <!--/ko-->
</div> </div>
<fieldset class="fieldset" data-bind='attr: {id: "payment_form_" + $parent.getCode() + "_" + value}'> <form class="form" data-role="adyen-hpp-form" action="#" method="post" data-bind="mageInit: { 'validation':[]}, attr: {id: 'payment_form_' + $parent.getCode() + '_' + value}">
<fieldset class="fieldset" data-bind='attr: {id: "payment_fieldset_" + $parent.getCode() + "_" + value}'>
<!-- ko if: value == 'ideal' --> <!-- ko if: value == 'ideal' -->
<label data-bind="attr: {'for': 'issuerId'}" class="label"> <label data-bind="attr: {'for': 'issuerId'}" class="label">
<span><!-- ko text: $t('Select Your Bank') --><!-- /ko --></span> <span><!-- ko text: $t('Select Your Bank') --><!-- /ko --></span>
...@@ -68,17 +68,16 @@ ...@@ -68,17 +68,16 @@
</select> </select>
<!--/ko--> <!--/ko-->
<!-- ko if: isPaymentMethodOpenInvoiceMethod() --> <!-- ko if: isPaymentMethodOpenInvoiceMethod() -->
<!-- ko if: showGender() --> <!-- ko if: showGender() -->
<div class="field gender type required"> <div class="field gender type required">
<label data-bind="attr: {for: getCode() + '_gender_type'}" class="label"> <label data-bind="attr: {for: getCode() + '_gender_type_' + value}" class="label">
<span><!-- ko text: $t('Gender')--><!-- /ko --></span> <span><!-- ko text: $t('Gender')--><!-- /ko --></span>
</label> </label>
<div class="control"> <div class="control">
<select class="select select-gender-type" <select class="select select-gender-type"
name="payment[gender]" name="payment[gender]"
data-bind="attr: {id: getCode() + '_gender_type', 'data-container': getCode() + '-gender-type', 'data-validate': JSON.stringify({required:true})}, data-bind="attr: {id: getCode() + '_gender_type_' + value, 'data-container': getCode() + '-gender-type'},
options: $parent.getGenderTypes(), options: $parent.getGenderTypes(),
optionsValue: 'key', optionsValue: 'key',
optionsText: 'value', optionsText: 'value',
...@@ -92,20 +91,20 @@ ...@@ -92,20 +91,20 @@
<!-- ko if: showDob() --> <!-- ko if: showDob() -->
<div class="field dob type required"> <div class="field dob type required">
<label data-bind="attr: {for: getCode() + '_dob'}" class="label"> <label data-bind="attr: {for: getCode() + '_dob_' + value}" class="label">
<span><!-- ko text: $t('Date of Birth')--><!-- /ko --></span> <span><!-- ko text: $t('Date of Birth')--><!-- /ko --></span>
</label> </label>
<div class="control"> <div class="control">
<input type="text" class="input-text" <input type="text" class="input-text"
name="payment[dob]" name="payment[dob]"
data-bind=" data-bind=" datepicker: { storage: datepickerValue, options: { showOn: 'both', changeYear: true, yearRange: '-99:-1', defaultDate: '-20y' } },
datepicker: { storage: datepickerValue, options: { showOn: 'both', changeYear: true, yearRange: '-99:-1', defaultDate: '-20y' } },
attr: { attr: {
id: getCode() + '_dob_' + value,
title: $t('Date of Birth'), title: $t('Date of Birth'),
'data-container': getCode() + '-dob', 'data-container': getCode() + '-dob'
'data-validate': JSON.stringify({'required':true })
}, },
value: dob" value: dob"
data-validate="{required:true}"
/> />
</div> </div>
</div> </div>
...@@ -113,7 +112,7 @@ ...@@ -113,7 +112,7 @@
<!-- ko if: showTelephone() --> <!-- ko if: showTelephone() -->
<div class="field telephone type required"> <div class="field telephone type required">
<label data-bind="attr: {for: getCode() + '_telephone'}" class="label"> <label data-bind="attr: {for: getCode() + '_telephone_' + value}" class="label">
<span><!-- ko text: $t('Telephone')--><!-- /ko --></span> <span><!-- ko text: $t('Telephone')--><!-- /ko --></span>
</label> </label>
<div class="control"> <div class="control">
...@@ -121,10 +120,10 @@ ...@@ -121,10 +120,10 @@
name="payment[telephone]" name="payment[telephone]"
data-bind=" data-bind="
attr: { attr: {
id: getCode() + '_telephone', id: getCode() + '_telephone_' + value,
title: $t('Telephone'), title: $t('Telephone'),
'data-container': getCode() + '-telephone', 'data-container': getCode() + '-telephone_' + value,
'data-validate': JSON.stringify({'required-number':true }) 'data-validate': JSON.stringify({'required-number':true})
}, },
value: telephone" value: telephone"
data-validate="{required:true}" data-validate="{required:true}"
...@@ -135,7 +134,7 @@ ...@@ -135,7 +134,7 @@
<!-- ko if: showSsn() --> <!-- ko if: showSsn() -->
<div class="field ssn type required"> <div class="field ssn type required">
<label data-bind="attr: {for: getCode() + '_ssn'}" class="label"> <label data-bind="attr: {for: getCode() + '_ssn_' + value}" class="label">
<span><!-- ko text: $t('Personal number (last digits)')--><!-- /ko --></span> <span><!-- ko text: $t('Personal number (last digits)')--><!-- /ko --></span>
</label> </label>
<div class="control"> <div class="control">
...@@ -143,10 +142,10 @@ ...@@ -143,10 +142,10 @@
name="payment[ssn]" name="payment[ssn]"
data-bind=" data-bind="
attr: { attr: {
id: getCode() + '_ssn', id: getCode() + '_ssn_' + value,
title: $t('Social Security Number'), title: $t('Social Security Number'),
'data-container': getCode() + '-ssn', 'data-container': getCode() + '-ssn',
'data-validate': JSON.stringify({'required-number':true }), 'data-validate': JSON.stringify({'required-number':true}),
maxlength : getSsnLength() maxlength : getSsnLength()
}, },
value: ssn" value: ssn"
...@@ -158,6 +157,8 @@ ...@@ -158,6 +157,8 @@
<!--/ko--> <!--/ko-->
</fieldset> </fieldset>
</form>
<div class="checkout-agreements-block"> <div class="checkout-agreements-block">
<!-- ko foreach: $parents[1].getRegion('before-place-order') --> <!-- ko foreach: $parents[1].getRegion('before-place-order') -->
<!-- ko template: getTemplate() --><!-- /ko --> <!-- ko template: getTemplate() --><!-- /ko -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment