diff --git a/docs/index.rst b/docs/index.rst index 44f08ec..844e944 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -13,6 +13,7 @@ Contents: member group + membership Indices and tables diff --git a/docs/member.rst b/docs/member.rst index b36767c..10bae43 100644 --- a/docs/member.rst +++ b/docs/member.rst @@ -42,7 +42,7 @@ GET /member/ "country" : "Norway", "postal_code" : 0266, "street_address" : "Odins gate 12A" - } + }, "created" : "2013-05-22T21:58:44", "date_of_birth" : null, "email" : "robert.kolner@gmail.com", @@ -77,7 +77,7 @@ GET /member/(int)/ **Example response**: - .. sourcevode:: http + .. sourcecode:: http HTTP/1.1 200 OK Vary: Accept diff --git a/dusken/models.py b/dusken/models.py index dee0f1d..91d891e 100644 --- a/dusken/models.py +++ b/dusken/models.py @@ -53,11 +53,14 @@ class ExtendedMemberDetail(models.Model): updated = models.DateTimeField(auto_now=True) pass -class PaymentForMembership(models.Model): +class PaymentType(models.Model): + name = models.CharField(max_length=255) + +class Payment(models.Model): # Note: More like tokens? - sms_payment_id = models.IntegerField(unique=True, null=True, blank=True) - webshop_payment_id = models.IntegerField(unique=True, null=True, blank=True) - voucher_id = models.IntegerField(unique=True, null=True, blank=True) + payment_type = models.ForeignKey(PaymentType) + value = models.IntegerField() + transaction_id = models.IntegerField(unique=True, null=True, blank=True) created = models.DateTimeField(auto_now_add=True) updated = models.DateTimeField(auto_now=True)