diff --git a/gms/squarepay/admin.py b/gms/squarepay/admin.py index a69a0ddffe437bf588b1e707b483444e0db05262..27157f1002ca8a26aa21f38ea840043c45d79ff7 100644 --- a/gms/squarepay/admin.py +++ b/gms/squarepay/admin.py @@ -4,16 +4,12 @@ from gms import admin from .models import CardPayment, MembershipPayment class CardPaymentAdmin(admin.ModelAdmin): - list_display = ['amount', 'url_field', 'date_created', 'is_paid'] - readonly_fields = ['token', 'idempotency_key'] + list_display = ['amount', 'date_created', 'is_paid'] + readonly_fields = ['idempotency_key'] - def url_field(self, obj): - return format_html('<a href="{}">Goto payment page</a>', obj.get_absolute_url()) - url_field.short_description = 'Payment URL' - url_field.allow_tags = True class MembershipPaymentAdmin(CardPaymentAdmin): - list_display = ['amount', 'url_field', 'date_created', 'is_paid', 'membership'] + list_display = ['amount', 'date_created', 'is_paid', 'membership'] admin.site.register(CardPayment, CardPaymentAdmin) admin.site.register(MembershipPayment, MembershipPaymentAdmin) diff --git a/gms/squarepay/models.py b/gms/squarepay/models.py index 4a3a420259e5b184fe222ac80973322ac3f43193..65e5ad1d200646558ea0922a4324322a479a8d4d 100644 --- a/gms/squarepay/models.py +++ b/gms/squarepay/models.py @@ -1,6 +1,5 @@ import uuid -from django.core.management.utils import get_random_string from django.db import models from django.urls import reverse @@ -15,9 +14,6 @@ class CardPayment(models.Model): date_created = models.DateTimeField('Date created', auto_now_add=True) date_paid = models.DateTimeField('Date paid (payment captured)', null=True, blank=True) - def get_absolute_url(self): - return reverse('squarepay:pay', kwargs={ 'pk': self.pk, 'token': self.token }) - class MembershipPayment(CardPayment): """ Link the payment to a specific membership diff --git a/gms/squarepay/urls.py b/gms/squarepay/urls.py index 607cfed6e56898cc60d24452cb3688480f0eeac5..8ae3290fb55b3cfe6c402346039778f944a9e2c7 100644 --- a/gms/squarepay/urls.py +++ b/gms/squarepay/urls.py @@ -4,6 +4,5 @@ from .views import PaymentFormView, MembershipPaymentView app_name = 'squarepay' urlpatterns = [ - #path('pay/<int:pk>/<str:token>/', PaymentFormView.as_view(), name='pay'), path('pay/<int:pk>/<str:token>/', MembershipPaymentView.as_view(), name='pay'), ]