Skip to content
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
class="payment-form"
method="POST"
id="payment-form" ${pdict.paymentForm.attributes}>
<div id="cardError" class="card-error alert alert-danger">
<div id="cardError" class="card-error alert alert-danger" role="alert">
<span>${Resource.msg('error.card.information.error', 'creditCard', null)}</span>
</div>
<script type="text/javascript">
Expand All @@ -45,10 +45,10 @@
<!-- Cancel and Save Buttons -->
<div class="row">
<div class="col">
<a href="${URLUtils.url('PaymentInstruments-List')}" class="btn btn-block btn-outline-primary">${Resource.msg('button.cancel','account',null)}</a>
<a href="${URLUtils.url('PaymentInstruments-List')}" class="btn btn-block btn-outline-primary" aria-label="Cancel and return to payment list">${Resource.msg('button.cancel','account',null)}</a>
</div>
<div class="col">
<button type="submit" name="save" class="btn btn-save btn-block btn-primary" value="add-new-payment">
<button type="submit" name="save" class="btn btn-save btn-block btn-primary" value="add-new-payment" aria-label="Save payment method">
${Resource.msg('button.save','account',null)}
</button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div class="row">
<div class="col-12 next-step-button">
<div class="mb-sm-3">
<button class="btn btn-primary btn-block" type="submit" name="place-order" value="place-order">
<button class="btn btn-primary btn-block" type="submit" name="place-order" value="place-order" aria-label="Place order">
${Resource.msg('button.submit.checkout.review', 'adyen', null)}
</button>
<form method="post" id="showConfirmationForm" name="showConfirmationForm" action="${pdict.showConfirmationUrl}">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<div class="modal fade" id="action-modal" role="dialog">
<div class="modal fade" id="action-modal" role="dialog" aria-modal="true" aria-labelledby="action-modal">
<div class="modal-dialog" id="adyenModalDialog">
<div id="action-container">
<h2 id="action-modal-title" class="sr-only">Action Required</h2>
<div class='invisible' id="cancelQrMethodsButton">
<button id='cancelQrMethodsButtonStyling' onclick="location.href='${URLUtils.https('Checkout-Begin')}';">
<button id='cancelQrMethodsButtonStyling' onclick="location.href='${URLUtils.https('Checkout-Begin')}';" aria-label="Cancel QR Payment">
<img src="${URLUtils.staticURL('images/cancel.svg')}" alt="Cancel" />
</button>
</div>
</div>
<div id="amazon-container"></div>
<div id="giftcard-container"></div>
</div>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
<div id="amazonPayAddressDetails">
<div class="addressHeaders">
<label>${Resource.msg('amazonpay.paymentMethod', 'adyen', null)}</label>
<button class="editAddressBtn">${Resource.msg('amazonpay.editButton', 'adyen', null)}</button>
<button class="editAddressBtn" aria-label="Edit payment address">${Resource.msg('amazonpay.editButton', 'adyen', null)}</button>
</div>
<address id="paymentStr"></address>
<div class="addressHeaders">
<label>${Resource.msg('amazonpay.shippingAddress', 'adyen', null)}</label>
<button class="editAddressBtn">${Resource.msg('amazonpay.editButton', 'adyen', null)}</button>
<button class="editAddressBtn" aria-label="Edit shipping address">${Resource.msg('amazonpay.editButton', 'adyen', null)}</button>
</div>
<address id="address"></address>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<!--- Generic Component--->
<div class="tab-pane active adyen-component-content" id="adyen-component-content" role="tabpanel">
<div
class="tab-pane active adyen-component-content"
id="adyen-component-content"
role="tabpanel"
aria-labelledby="tab-adyen-component"
>
<fieldset class="payment-form-fields">
<input type="hidden" class="form-control"
name="${pdict.forms.billingForm.paymentMethod.htmlName}"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
<li class="nav-item" data-method-id="${paymentOption.ID}">
<a class="nav-link adyen-tab active" data-toggle="tab" href="#adyen-component-content" role="tab">
<a
class="nav-link adyen-tab active"
id="tab-adyen-component"
data-toggle="tab"
href="#adyen-component-content"
role="tab"
aria-controls="adyen-component-content"
aria-selected="true"
tabindex="0"
aria-label="Select ${paymentOption.name}"
>
<img class="adyen-option"
src="${URLUtils.staticURL('/images/payment-types.png')}"
height="32"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--- Adyen Point of Sale--->
<div class="tab-pane adyen-pos-content" id="adyen-pos-content" role="tabpanel">
<div class="tab-pane adyen-pos-content" id="adyen-pos-content" role="tabpanel" aria-labelledby="tab-adyen-pos">
<fieldset class="payment-form-fields">
<input type="hidden" class="form-control"
name="${pdict.forms.billingForm.paymentMethod.htmlName}"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
<li class="nav-item" data-method-id="${paymentOption.ID}">
<a class="nav-link adyen-tab" data-toggle="tab" href="#adyen-pos-content" role="tab">
<a
class="nav-link adyen-tab"
id="tab-adyen-pos"
data-toggle="tab"
href="#adyen-pos-content"
role="tab"
aria-controls="adyen-pos-content"
aria-selected="false"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"aria-selected" and "tabindex" denotes the current state of the tab and should be updated based on user interaction. The initial value could be hard coded but when user selects another tab then the value for "aria-selected" and "tabindex" needs to be updated accordingly for all tabs to match the current state. Please read more about usage of aria-selected in this blog. https://www.a11y-collective.com/blog/aria-selected/

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

proposed a new change below

tabindex="-1"
aria-label="Select ${paymentOption.name}"
>
<img class="adyen-option"
src="${URLUtils.staticURL('/images/pos.png')}"
height="32"
Expand Down
Loading