EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merging changes

pull/1/head
Andromeda Yelton 2012-10-02 13:36:30 -04:00
parent 0ec9789e56
commit 1cb2461daa
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
frontend/templates/fund_the_pledge.html
View File

@ -18,9 +18,6 @@
var $j = jQuery.noConflict(); var $j = jQuery.noConflict();
<script>
var $j = jQuery.noConflict();
$j(document).ready(function() { $j(document).ready(function() {
$j("#pledge_option").click(function() { $j("#pledge_option").click(function() {
$j("#authorize").show(); $j("#authorize").show();
@ -60,6 +57,7 @@ $j(document).ready(function() {
}); });
</script> </script>
<script>
function stripeResponseHandler(status, response) { function stripeResponseHandler(status, response) {
if (response.error) { if (response.error) {
// re-enable the submit button // re-enable the submit button
@ -181,16 +179,6 @@ kept around for reference as the page is overhauled
</p> </p>
{% if request.user.credit.available %}<p>Although you have ${{request.user.credit.available}} in donation credits, you can't support a campaign with a mixture of credit card pledges and donations.{% endif %} {% if request.user.credit.available %}<p>Although you have ${{request.user.credit.available}} in donation credits, you can't support a campaign with a mixture of credit card pledges and donations.{% endif %}
<div id="cc_pledge"> <div id="cc_pledge">
<<<<<<< HEAD
<span class="payment-errors"></span>
<form action="" method="post" id="payment-form">
{% csrf_token %}
{{ form.non_field_errors }}
{{ form.as_p }}
<payment key="{{STRIPE_PK}}"></payment>
<input name="cc_submit" type="submit" value="Complete pledge" id="cc_submit" />
</form>
=======
<span class="payment-errors"></span> <span class="payment-errors"></span>
<form action="" method="POST" id="payment-form"> <form action="" method="POST" id="payment-form">
{% csrf_token %} {% csrf_token %}
@ -210,9 +198,8 @@ kept around for reference as the page is overhauled
<span> / </span> <span> / </span>
<input id="card_ExpiryYear" type="text" size="4" class="card-expiry-year"/> <input id="card_ExpiryYear" type="text" size="4" class="card-expiry-year"/>
</div> </div>
<input id="cc_submit" type="submit" class="submit-button" value="Verify Credit Card" /> <input id="cc_submit" type="submit" class="submit-button" value="Complete Pledge" />
</form> </form>
>>>>>>> 166afece6276ebe0307f93fcd199f872797735da
</div> </div>
</div> </div>