sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'feature/braintree2' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2018-12-24 14:15:34 +01:00
parent 9dcf4d8d26 a198ebbeaa
commit e434582e85
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/tasks.py
View File

@@ -833,7 +833,7 @@ def handle_send_email_subscription_update(
res = send_template_email(from_email,['info@rowsandall.com'], res = send_template_email(from_email,['info@rowsandall.com'],
'Subscription Update Notification', 'Subscription Update Notification',
template_name, notification_template_name,
d, **kwargs) d, **kwargs)
return 1 return 1

9
rowers/templates/braintreedropin.html
View File

@@ -23,3 +23,12 @@
}); });
}); });
</script> </script>
<script type='text/javascript'
src='https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js'>
</script>
<script>
$('#payment-form').submit(function() {
$(this).find("button[type='submit']").prop('disabled',true);
console.log("disabled");
}
</script>

7
rowers/templates/upgradeconfirm.html
View File

@@ -91,7 +91,12 @@
cycle, you will be charged for a prorated amount. For example, when cycle, you will be charged for a prorated amount. For example, when
you upgrade from a 15&euro; plan to a 65&euro; plan (a difference of you upgrade from a 15&euro; plan to a 65&euro; plan (a difference of
50&euro;) in the 6th month of the 12 month billing cycle, you 50&euro;) in the 6th month of the 12 month billing cycle, you
will be charged 35&euro;. will be charged 25&euro;.
</p>
<p>
After you hit the Upgrade button, the transaction will be launched.
Please wait until the transaction completes. Do not click the
button twice. Do not close your browser window.
</p> </p>
</li> </li>
</ul> </ul>