Fix timezone issues and create coffee view unit test
This commit is contained in:
+2
-2
@@ -6,7 +6,7 @@ from django.utils.translation import ugettext_lazy as _
|
||||
from members.models import Member, Payment, Request
|
||||
|
||||
import csv
|
||||
import datetime
|
||||
from django.utils import timezone
|
||||
import logging
|
||||
|
||||
|
||||
@@ -73,7 +73,7 @@ class MemberForm(forms.ModelForm):
|
||||
payment_data = {
|
||||
'source': payment_source,
|
||||
'member': member.id,
|
||||
'date': datetime.datetime.now(),
|
||||
'date': timezone.now(),
|
||||
}
|
||||
form = PaymentForm(payment_data)
|
||||
if not form.is_valid():
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.11 on 2017-09-25 16:24
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
import django.utils.timezone
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('members', '0015_auto_20170925_1917'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='member',
|
||||
name='created',
|
||||
field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='Created'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='payment',
|
||||
name='date',
|
||||
field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='Date'),
|
||||
),
|
||||
]
|
||||
+2
-3
@@ -4,7 +4,6 @@ from django.db import models
|
||||
from django.utils import timezone
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from datetime import datetime
|
||||
import csv
|
||||
|
||||
|
||||
@@ -79,7 +78,7 @@ class Request(BaseMember):
|
||||
class Payment(models.Model):
|
||||
"""Payment model representing one payment event."""
|
||||
|
||||
date = models.DateTimeField(_('Date'), default=datetime.now)
|
||||
date = models.DateTimeField(_('Date'), default=timezone.now)
|
||||
source = models.CharField(_('Source'), choices=[
|
||||
('AYY', _('AYY')),
|
||||
('cash', _('Cash')),
|
||||
@@ -100,7 +99,7 @@ class Payment(models.Model):
|
||||
class Member(BaseMember):
|
||||
"""Member model represets one member on the registry."""
|
||||
|
||||
created = models.DateTimeField(_('Created'), default=datetime.now)
|
||||
created = models.DateTimeField(_('Created'), default=timezone.now)
|
||||
|
||||
def last_paid(self):
|
||||
"""Return member's last payment."""
|
||||
|
||||
Reference in New Issue
Block a user