diff --git a/rowers/templates/braintreedropin.html b/rowers/templates/braintreedropin.html index 2d822b9a..30942f31 100644 --- a/rowers/templates/braintreedropin.html +++ b/rowers/templates/braintreedropin.html @@ -4,6 +4,7 @@ var form = document.querySelector('#payment-form'); var hiddenNonceInput = document.querySelector('#nonce'); var paymenterrordiv = document.getElementById("paymenterror"); + var paymenterrordiv2 = document.getElementById("paymenterror2"); var client_token = '{{ client_token }}'; braintree.dropin.create({ authorization: client_token, @@ -33,13 +34,15 @@ } if (payload.liabilityShifted || payload.type !== 'CreditCard') { document.querySelector('#nonce').value = payload.nonce; - hiddenNonceInput.value = payload.nonce; + hiddenNonceInput.value = payload.nonce; + paymenterrordiv2.innerHTML = '

We are submitting the payment. Do not reload or press submit more than once.

'; form.submit(); } else { // Decide if you will force the user to enter a different // payment method if liablity was not shifted instance.clearSelectedPaymentMethod(); paymenterrordiv.innerHTML = '

3D Secure Card Verification Error. Please check your card details.

'; + window.location.reload(); } }); diff --git a/rowers/templates/upgradeconfirm.html b/rowers/templates/upgradeconfirm.html index 669c6b52..ae2cf183 100644 --- a/rowers/templates/upgradeconfirm.html +++ b/rowers/templates/upgradeconfirm.html @@ -93,7 +93,7 @@
- +

diff --git a/rowers/urls.py b/rowers/urls.py index f1c17902..caa3f668 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -516,7 +516,7 @@ urlpatterns = [ re_path(r'^promembership', TemplateView.as_view(template_name='promembership.html'),name='promembership'), re_path(r'^checkout/(?P\d+)/$',views.payment_confirm_view,name='payment_confirm_view'), re_path(r'^upgradecheckout/(?P\d+)/$',views.upgrade_confirm_view,name='upgrade_confirm_view'), - re_path(r'^downgradecheckout/(?P\d+)/$',views.downgrade_confirm_view,name='downgrade_confirm_view'), + re_path(r'^upgradecheckout/(?P\d+)/$',views.upgrade_confirm_view,name='upgrade_confirm_view'), re_path(r'^billing/$',views.billing_view,name='billing'), re_path(r'^upgrade/$',views.upgrade_view,name='upgrade'), re_path(r'^downgrade/$',views.downgrade_view,name='downgrade'), diff --git a/rowers/views/paymentviews.py b/rowers/views/paymentviews.py index 34a1f133..79c52ca1 100644 --- a/rowers/views/paymentviews.py +++ b/rowers/views/paymentviews.py @@ -390,6 +390,7 @@ def upgrade_checkouts_view(request): url = reverse('billing_view') return HttpResponseRedirect(url) else: + print('noot',form) messages.error(request,"There was an error in the payment form") url = reverse(upgrade_view) return HttpResponseRedirect(url)