aatish
/
dynamicweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #670 from pcoder/task/5690/redirect-on-payment-error 

Task/5690/redirect on payment error
This commit is contained in:
Pcoder 2018-10-06 07:59:40 +02:00 committed by GitHub
parent 10dab1350a 5770c231ee
commit 733fb9fc43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
datacenterlight/utils.py
View File

@ -96,7 +96,7 @@ def clear_all_session_vars(request):
if request.session is not None: if request.session is not None:
for session_var in ['specs', 'template', 'billing_address', for session_var in ['specs', 'template', 'billing_address',
'billing_address_data', 'card_id', 'billing_address_data', 'card_id',
'token', 'customer','generic_payment_type', 'token', 'customer', 'generic_payment_type',
'generic_payment_details', 'product_id']: 'generic_payment_details', 'product_id']:
if session_var in request.session: if session_var in request.session:
del request.session[session_var] del request.session[session_var]

43
datacenterlight/views.py
View File

@ -398,7 +398,8 @@ class PaymentOrderView(FormView):
"description": generic_payment_form.cleaned_data.get( "description": generic_payment_form.cleaned_data.get(
'description' 'description'
), ),
"product_id": product.id "product_id": product.id,
"product_slug": product.product_slug
} }
request.session["generic_payment_details"] = ( request.session["generic_payment_details"] = (
gp_details gp_details
@ -570,7 +571,14 @@ class OrderConfirmationView(DetailView):
response = { response = {
'status': False, 'status': False,
'redirect': "{url}#{section}".format( 'redirect': "{url}#{section}".format(
url=reverse('datacenterlight:payment'), url=(reverse(
'show_product',
kwargs={'product_slug':
request.session['generic_payment_details']
['product_slug']}
) if 'generic_payment_details' in request.session else
reverse('datacenterlight:payment')
),
section='payment_error'), section='payment_error'),
'msg_title': str(_('Error.')), 'msg_title': str(_('Error.')),
'msg_body': str( 'msg_body': str(
@ -609,7 +617,16 @@ class OrderConfirmationView(DetailView):
response = { response = {
'status': False, 'status': False,
'redirect': "{url}#{section}".format( 'redirect': "{url}#{section}".format(
url=reverse('hosting:payment'), url=(reverse(
'show_product',
kwargs={'product_slug':
request.session
['generic_payment_details']
['product_slug']}
) if 'generic_payment_details' in
request.session else
reverse('datacenterlight:payment')
),
section='payment_error'), section='payment_error'),
'msg_title': str(_('Error.')), 'msg_title': str(_('Error.')),
'msg_body': str( 'msg_body': str(
@ -664,8 +681,12 @@ class OrderConfirmationView(DetailView):
response = { response = {
'status': False, 'status': False,
'redirect': "{url}#{section}".format( 'redirect': "{url}#{section}".format(
url=(reverse('datacenterlight:payment') + url=(reverse('show_product', kwargs={
"?type=generic"), 'product_slug': gp_details['product_slug']}
) if 'generic_payment_details' in
request.session else
reverse('datacenterlight:payment')
),
section='payment_error'), section='payment_error'),
'msg_title': str(_('Error.')), 'msg_title': str(_('Error.')),
'msg_body': str( 'msg_body': str(
@ -736,8 +757,16 @@ class OrderConfirmationView(DetailView):
response = { response = {
'status': False, 'status': False,
'redirect': "{url}#{section}".format( 'redirect': "{url}#{section}".format(
url=reverse('datacenterlight:payment'), url=(reverse(
section='payment_error'), 'show_product',
kwargs={'product_slug':
request.session['generic_payment_details']
['product_slug']}
) if 'generic_payment_details' in request.session else
reverse('datacenterlight:payment')
),
section='payment_error'
),
'msg_title': str(_('Error.')), 'msg_title': str(_('Error.')),
'msg_body': str( 'msg_body': str(
_('There was a payment related error.' _('There was a payment related error.'