jenkins-bot has submitted this change and it was merged.
Change subject: Change Amazon's form button from Continue to Donate
......................................................................
Change Amazon's form button from Continue to Donate
Since pressing the button immediately charges the card.
Bug: T113624
Change-Id: Ia3dd82e1daa1481f5622b38f578aef52b6c4bd4e
---
M amazon_gateway/amazon.js
M gateway_forms/mustache/forms.css
M gateway_forms/mustache/payment_method.html.mustache
3 files changed, 6 insertions(+), 7 deletions(-)
Approvals:
Cdentinger: Looks good to me, approved
jenkins-bot: Verified
diff --git a/amazon_gateway/amazon.js b/amazon_gateway/amazon.js
index d8e27d9..429bdb4 100644
--- a/amazon_gateway/amazon.js
+++ b/amazon_gateway/amazon.js
@@ -129,14 +129,12 @@
return;
}
orderReferenceId =
orderReference.getAmazonOrderReferenceId();
- $( '#paymentContinue' ).show();
- // FIXME: Unbind click handler from forms.js
- $( '#paymentContinueBtn' ).off( 'click' );
- $( '#paymentContinueBtn' ).click( submitPayment
);
+ $( '#paymentSubmit' ).show();
+ $( '#paymentSubmitBtn' ).click( submitPayment );
},
onPaymentSelect: function() {
// In case we hid the button because of an
invalid payment error
- $( '#paymentContinue' ).show();
+ $( '#paymentSubmit' ).show();
},
design: {
designMode: 'responsive'
@@ -171,7 +169,7 @@
if ( refreshWallet ) {
// Redisplay the widget to show an error and let the
donor pick a different card
- $( '#paymentContinue' ).hide();
+ $( '#paymentSubmit' ).hide();
createWalletWidget();
}
}
diff --git a/gateway_forms/mustache/forms.css b/gateway_forms/mustache/forms.css
index 2dce3d1..2aa4046 100644
--- a/gateway_forms/mustache/forms.css
+++ b/gateway_forms/mustache/forms.css
@@ -330,7 +330,7 @@
height: auto !important;
}
-#paymentContinue {
+#paymentContinue, #paymentSubmit {
margin-top: 1em !important;
clear: both;
display: none;
diff --git a/gateway_forms/mustache/payment_method.html.mustache
b/gateway_forms/mustache/payment_method.html.mustache
index 3fed354..ae7a19c 100644
--- a/gateway_forms/mustache/payment_method.html.mustache
+++ b/gateway_forms/mustache/payment_method.html.mustache
@@ -12,6 +12,7 @@
</dd>
</dl>
<div
id="paymentContinue" > <input class="btn enabled" id="paymentContinueBtn"
type="button" value="{{ l10n "donate_interface-continue" }}" /></div>
+ <div
id="paymentSubmit" > <input class="btn enabled" id="paymentSubmitBtn"
type="button" value="{{ l10n "donate_interface-submit-button" }}" /></div>
</td>
</tr>
{{# is_cc }}
--
To view, visit https://gerrit.wikimedia.org/r/240755
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3dd82e1daa1481f5622b38f578aef52b6c4bd4e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg <[email protected]>
Gerrit-Reviewer: AndyRussG <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Cdentinger <[email protected]>
Gerrit-Reviewer: Ssmith <[email protected]>
Gerrit-Reviewer: XenoRyet <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
