Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
UCC
uccportal
Commits
0cb5f718
Commit
0cb5f718
authored
Feb 26, 2019
by
frekk
Browse files
make approval form respect already-paid memberships
parent
81cc295d
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/memberdb/approve.py
View file @
0cb5f718
...
@@ -32,6 +32,7 @@ class MembershipApprovalForm(MyModelForm):
...
@@ -32,6 +32,7 @@ class MembershipApprovalForm(MyModelForm):
# override the model membership_type field so we display all the options with prices
# override the model membership_type field so we display all the options with prices
self
.
fields
[
'membership_type'
].
choices
=
get_membership_choices
()
self
.
fields
[
'membership_type'
].
choices
=
get_membership_choices
()
self
.
fields
[
'payment_confirm'
].
initial
=
(
self
.
instance
.
date_paid
is
not
None
)
def
clean
(
self
):
def
clean
(
self
):
"""
"""
...
@@ -50,9 +51,13 @@ class MembershipApprovalForm(MyModelForm):
...
@@ -50,9 +51,13 @@ class MembershipApprovalForm(MyModelForm):
data
[
'date_approved'
]
=
now
data
[
'date_approved'
]
=
now
if
(
data
[
'payment_confirm'
]
==
True
):
if
(
data
[
'payment_confirm'
]
==
True
):
if
(
data
[
'payment_method'
]
==
''
):
if
data
[
'payment_method'
]
==
self
.
instance
.
payment_method
and
data
[
'payment_confirm'
]
==
(
self
.
instance
.
date_paid
is
not
None
):
self
.
add_error
(
'payment_method'
,
'Please select a payment method'
)
# check if the payment was already made, preserve the date_paid
data
[
'date_paid'
]
=
now
data
[
'date_paid'
]
=
self
.
instance
.
date_paid
else
:
if
(
data
[
'payment_method'
]
==
''
):
self
.
add_error
(
'payment_method'
,
'Please select a payment method'
)
data
[
'date_paid'
]
=
now
else
:
else
:
data
[
'date_paid'
]
=
None
data
[
'date_paid'
]
=
None
...
...
src/memberdb/models.py
View file @
0cb5f718
...
@@ -109,6 +109,7 @@ def make_pending_membership(member):
...
@@ -109,6 +109,7 @@ def make_pending_membership(member):
# otherwise update the existing membership and mark as pending
# otherwise update the existing membership and mark as pending
latest
.
approved
=
False
latest
.
approved
=
False
latest
.
date_approved
=
None
latest
.
date_submitted
=
timezone
.
now
()
latest
.
date_submitted
=
timezone
.
now
()
return
latest
return
latest
...
...
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