From 6d7d9f5792dbf64e347bec4d3bc1607b0d737af0 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 18 Dec 2018 12:39:34 +0100 Subject: [PATCH] billing address to user --- rowers/admin.py | 2 ++ rowers/models.py | 8 ++++++++ rowsandall_app/settings.py | 1 + 3 files changed, 11 insertions(+) diff --git a/rowers/admin.py b/rowers/admin.py index 1614ae88..e7a22b76 100644 --- a/rowers/admin.py +++ b/rowers/admin.py @@ -19,6 +19,8 @@ class RowerInline(admin.StackedInline): filter_horizontal = ('team','friends') fieldsets = ( + ('Billing Details', + {'fields':('street_address','city','postal_code','country',)}), ('Rower Plan', {'fields':('rowerplan','paymenttype','planexpires','teamplanexpires','clubsize','protrialexpires','plantrialexpires',)}), ('Rower Settings', diff --git a/rowers/models.py b/rowers/models.py index 3d3ee446..ad3d68b5 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -17,6 +17,7 @@ import os import twitter import re import pytz +from django_countries.fields import CountryField from scipy.interpolate import splprep, splev, CubicSpline import numpy as np @@ -571,6 +572,13 @@ class Rower(models.Model): ('Yoga','Yoga'), ) user = models.OneToOneField(User) + + #billing details + country = CountryField(default=None, null=True, blank=True) + street_address = models.CharField(default='',blank=True,null=True,max_length=200) + city = models.CharField(default='',blank=True,null=True,max_length=200) + postal_code = models.CharField(default='',blank=True,null=True,max_length=200) + gdproptin = models.BooleanField(default=False) gdproptindate = models.DateTimeField(blank=True,null=True) diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py index 61484bbf..7aedf773 100644 --- a/rowsandall_app/settings.py +++ b/rowsandall_app/settings.py @@ -66,6 +66,7 @@ INSTALLED_APPS = [ 'django_extensions', 'tz_detect', 'django_social_share', + 'django_countries', ] AUTHENTICATION_BACKENDS = (