Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
10e834bd
Commit
10e834bd
authored
Aug 18, 2018
by
Joren Vrancken
Browse files
Merge branch 'fix/registrations-renewal-start-date' into 'master'
Fix renewal since date calculation See merge request
!899
parents
9dc3542b
35846c87
Changes
2
Hide whitespace changes
Inline
Side-by-side
website/registrations/services.py
View file @
10e834bd
"""The services defined by the registrations package"""
import
string
import
unicodedata
from
datetime
import
timedelta
from
django.conf
import
settings
from
django.contrib.auth
import
get_user_model
...
...
@@ -265,7 +264,7 @@ def _create_membership_from_entry(entry, member=None):
if
membership
.
until
is
None
:
raise
ValueError
(
'This member already has a never ending '
'membership'
)
since
=
membership
.
until
+
timedelta
(
days
=
1
)
since
=
membership
.
until
except
Renewal
.
DoesNotExist
:
pass
until
=
timezone
.
datetime
(
year
=
lecture_year
+
1
,
...
...
website/registrations/tests/test_services.py
View file @
10e834bd
...
...
@@ -403,7 +403,7 @@ class ServicesTest(TestCase):
self
.
e3
.
length
=
Entry
.
MEMBERSHIP_YEAR
membership3
=
services
.
_create_membership_from_entry
(
self
.
e3
)
self
.
assertEqual
(
membership3
.
since
,
existing_membership
.
until
+
timedelta
(
days
=
1
)
)
existing_membership
.
until
)
self
.
assertEqual
(
membership3
.
until
,
timezone
.
datetime
(
year
=
2017
,
month
=
9
,
day
=
1
).
date
())
self
.
assertEqual
(
membership3
.
user
,
self
.
e3
.
member
)
...
...
Joren Vrancken
@jvrancken
mentioned in commit
7afb4086
·
Aug 18, 2018
mentioned in commit
7afb4086
mentioned in commit 7afb40860f91e0d3a7ae6ecb7411e59475e44442
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment