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

fixing some bugs

Browse Source
This commit is contained in:
Sander Roosendaal
2019-07-25 15:49:06 +02:00
parent 9f98bf9b6d
commit 92f5ee76e5
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rowers/templates/braintreedropin.html
View File

@@ -4,6 +4,7 @@
var form = document.querySelector('#payment-form'); var form = document.querySelector('#payment-form');
var hiddenNonceInput = document.querySelector('#nonce'); var hiddenNonceInput = document.querySelector('#nonce');
var paymenterrordiv = document.getElementById("paymenterror"); var paymenterrordiv = document.getElementById("paymenterror");
var paymenterrordiv2 = document.getElementById("paymenterror2");
var client_token = '{{ client_token }}'; var client_token = '{{ client_token }}';
braintree.dropin.create({ braintree.dropin.create({
authorization: client_token, authorization: client_token,
@@ -33,13 +34,15 @@
} }
if (payload.liabilityShifted || payload.type !== 'CreditCard') { if (payload.liabilityShifted || payload.type !== 'CreditCard') {
document.querySelector('#nonce').value = payload.nonce; document.querySelector('#nonce').value = payload.nonce;
hiddenNonceInput.value = payload.nonce; hiddenNonceInput.value = payload.nonce;
paymenterrordiv2.innerHTML = '<p class="successmessage">We are submitting the payment. Do not reload or press submit more than once.</p>';
form.submit(); form.submit();
} else { } else {
// Decide if you will force the user to enter a different // Decide if you will force the user to enter a different
// payment method if liablity was not shifted // payment method if liablity was not shifted
instance.clearSelectedPaymentMethod(); instance.clearSelectedPaymentMethod();
paymenterrordiv.innerHTML = '<p class="message">3D Secure Card Verification Error. Please check your card details.</p>'; paymenterrordiv.innerHTML = '<p class="message">3D Secure Card Verification Error. Please check your card details.</p>';
window.location.reload();
} }
}); });

2
rowers/templates/upgradeconfirm.html
View File

@@ -93,7 +93,7 @@
<div id="bt-dropin"></div> <div id="bt-dropin"></div>
</div> </div>
</section> </section>
<div id="paymenterror2"> </div>
<input type="hidden" id="nonce" name="payment_method_nonce" /> <input type="hidden" id="nonce" name="payment_method_nonce" />
<input type="hidden" id="plan" name="plan" value="{{ plan.id }}"> <input type="hidden" id="plan" name="plan" value="{{ plan.id }}">
<p> <p>

2
rowers/urls.py
View File

@@ -516,7 +516,7 @@ urlpatterns = [
re_path(r'^promembership', TemplateView.as_view(template_name='promembership.html'),name='promembership'), re_path(r'^promembership', TemplateView.as_view(template_name='promembership.html'),name='promembership'),
re_path(r'^checkout/(?P<planid>\d+)/$',views.payment_confirm_view,name='payment_confirm_view'), re_path(r'^checkout/(?P<planid>\d+)/$',views.payment_confirm_view,name='payment_confirm_view'),
re_path(r'^upgradecheckout/(?P<planid>\d+)/$',views.upgrade_confirm_view,name='upgrade_confirm_view'), re_path(r'^upgradecheckout/(?P<planid>\d+)/$',views.upgrade_confirm_view,name='upgrade_confirm_view'),
re_path(r'^downgradecheckout/(?P<planid>\d+)/$',views.downgrade_confirm_view,name='downgrade_confirm_view'), re_path(r'^upgradecheckout/(?P<planid>\d+)/$',views.upgrade_confirm_view,name='upgrade_confirm_view'),
re_path(r'^billing/$',views.billing_view,name='billing'), re_path(r'^billing/$',views.billing_view,name='billing'),
re_path(r'^upgrade/$',views.upgrade_view,name='upgrade'), re_path(r'^upgrade/$',views.upgrade_view,name='upgrade'),
re_path(r'^downgrade/$',views.downgrade_view,name='downgrade'), re_path(r'^downgrade/$',views.downgrade_view,name='downgrade'),

1
rowers/views/paymentviews.py
View File

@@ -390,6 +390,7 @@ def upgrade_checkouts_view(request):
url = reverse('billing_view') url = reverse('billing_view')
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
else: else:
print('noot',form)
messages.error(request,"There was an error in the payment form") messages.error(request,"There was an error in the payment form")
url = reverse(upgrade_view) url = reverse(upgrade_view)
return HttpResponseRedirect(url) return HttpResponseRedirect(url)