diff --git a/core/management/commands/populate.py b/core/management/commands/populate.py index d3356d3e..cccaf098 100644 --- a/core/management/commands/populate.py +++ b/core/management/commands/populate.py @@ -389,7 +389,7 @@ Welcome to the wiki page! s = Subscription( member=User.objects.filter(pk=root.pk).first(), subscription_type=default_subscription, - payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0], + payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0][0], ) s.subscription_start = s.compute_start() s.subscription_end = s.compute_end( @@ -401,7 +401,7 @@ Welcome to the wiki page! s = Subscription( member=User.objects.filter(pk=skia.pk).first(), subscription_type=default_subscription, - payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0], + payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0][0], ) s.subscription_start = s.compute_start() s.subscription_end = s.compute_end( @@ -413,7 +413,7 @@ Welcome to the wiki page! s = Subscription( member=User.objects.filter(pk=counter.pk).first(), subscription_type=default_subscription, - payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0], + payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0][0], ) s.subscription_start = s.compute_start() s.subscription_end = s.compute_end( @@ -425,7 +425,7 @@ Welcome to the wiki page! s = Subscription( member=User.objects.filter(pk=comptable.pk).first(), subscription_type=default_subscription, - payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0], + payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0][0], ) s.subscription_start = s.compute_start() s.subscription_end = s.compute_end( @@ -437,7 +437,7 @@ Welcome to the wiki page! s = Subscription( member=User.objects.filter(pk=r.pk).first(), subscription_type=default_subscription, - payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0], + payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0][0], ) s.subscription_start = s.compute_start() s.subscription_end = s.compute_end( @@ -449,7 +449,7 @@ Welcome to the wiki page! s = Subscription( member=User.objects.filter(pk=subscriber.pk).first(), subscription_type=default_subscription, - payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0], + payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0][0], ) s.subscription_start = s.compute_start() s.subscription_end = s.compute_end( @@ -461,7 +461,7 @@ Welcome to the wiki page! s = Subscription( member=User.objects.filter(pk=old_subscriber.pk).first(), subscription_type=default_subscription, - payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0], + payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0][0], ) s.subscription_start = s.compute_start(datetime(year=2012, month=9, day=4)) s.subscription_end = s.compute_end( @@ -841,7 +841,7 @@ Welcome to the wiki page! s = Subscription( member=User.objects.filter(pk=sli.pk).first(), subscription_type=list(settings.SITH_SUBSCRIPTIONS.keys())[0], - payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0], + payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0][0], ) s.subscription_start = s.compute_start() s.subscription_end = s.compute_end( @@ -853,7 +853,7 @@ Welcome to the wiki page! s = Subscription( member=User.objects.filter(pk=krophil.pk).first(), subscription_type=list(settings.SITH_SUBSCRIPTIONS.keys())[0], - payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0], + payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0][0], ) s.subscription_start = s.compute_start() s.subscription_end = s.compute_end( diff --git a/subscription/models.py b/subscription/models.py index 2effe59f..21bc91b3 100644 --- a/subscription/models.py +++ b/subscription/models.py @@ -25,7 +25,6 @@ from datetime import date, timedelta from django.db import models from django.utils import timezone -from ast import literal_eval as make_tuple from django.utils.translation import ugettext_lazy as _ from django.conf import settings from django.core.exceptions import ValidationError @@ -72,10 +71,6 @@ class Subscription(models.Model): verbose_name=_("location"), ) - def get_payment_method_display(self): - - return _(make_tuple(self.payment_method)[1]) - class Meta: ordering = ["subscription_start"]