From b7a0f5635487c5430002faec8a63f7ba38bb15a6 Mon Sep 17 00:00:00 2001
From: frekk <frekk@ucc.asn.au>
Date: Thu, 24 Jan 2019 22:05:25 +0800
Subject: [PATCH] unfacked circular dependencies and shet
---
gms/squarepay/admin.py | 10 +++-------
gms/squarepay/models.py | 4 ----
gms/squarepay/urls.py | 1 -
3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/gms/squarepay/admin.py b/gms/squarepay/admin.py
index a69a0dd..27157f1 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 4a3a420..65e5ad1 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 607cfed..8ae3290 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'),
]
--
GitLab