Skip to content

Commit 14b9b98

Browse files
MAGETWO-69379: use payment method name to make checkbox of agreements more unique #6207 #9717
2 parents 1432268 + a8e663a commit 14b9b98

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

app/code/Magento/CheckoutAgreements/view/frontend/web/js/view/checkout-agreements.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,26 @@ define([
4545
agreementsModal.showModal();
4646
},
4747

48+
/**
49+
* build a unique id for the term checkbox
50+
*
51+
* @param {Object} context - the ko context
52+
* @param {Number} agreementId
53+
*/
54+
getCheckboxId: function (context, agreementId) {
55+
var paymentMethodName = '',
56+
paymentMethodRenderer = context.$parents[1];
57+
58+
// corresponding payment method fetched from parent context
59+
if (paymentMethodRenderer) {
60+
// item looks like this: {title: "Check / Money order", method: "checkmo"}
61+
paymentMethodName = paymentMethodRenderer.item ?
62+
paymentMethodRenderer.item.method : '';
63+
}
64+
65+
return 'agreement_' + paymentMethodName + '_' + agreementId;
66+
},
67+
4868
/**
4969
* Init modal window for rendered element
5070
*

app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
<div class="checkout-agreement required">
1212
<input type="checkbox" class="required-entry"
1313
data-bind="attr: {
14-
'id': 'agreement_' + agreementId,
14+
'id': $parent.getCheckboxId($parentContext, agreementId),
1515
'name': 'agreement[' + agreementId + ']',
1616
'value': agreementId
1717
}"/>
18-
<label data-bind="attr: {'for': 'agreement_' + agreementId}">
18+
<label data-bind="attr: {'for': $parent.getCheckboxId($parentContext, agreementId)}">
1919
<button type="button"
2020
class="action action-show"
2121
data-bind="click: function(data, event) { return $parent.showContent(data, event) }"

0 commit comments

Comments
 (0)