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
2710a986
Commit
2710a986
authored
Mar 03, 2019
by
frekk
Browse files
remove bad cokelog sync code
parent
3816e0ed
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/memberdb/register.py
View file @
2710a986
...
...
@@ -22,28 +22,6 @@ from .models import Member, Membership, get_membership_choices, make_pending_mem
from
.forms
import
MyModelForm
from
.views
import
MyUpdateView
def
has_paid_dispense
(
membership
):
script
=
settings
.
BASE_DIR
+
"/memberdb/has_paid_dispense.sh"
cmd
=
[
script
,
membership
.
member
.
username
,
membership
.
get_dispense_item
()]
#log.info("has_paid_dispense: " + str(cmd))
try
:
# get a string containing the output of the program
# should be a datestring like "Feb 25 13:48:06"
res
=
subprocess
.
check_output
(
cmd
,
timeout
=
4
,
universal_newlines
=
True
)
date
=
datetime
.
strptime
(
res
,
"%b %d %H:%M:%S"
)
return
date
except
CalledProcessError
as
e
:
#log.warning("has_paid_dispense returned error code %d, output: '%s'" % (e.returncode, e.output))
pass
except
TimeoutExpired
as
e
:
#log.error(e)
pass
except
ValueError
:
#log.warning("cannot parse date '%s'" % res)
pass
return
None
"""
First step: enter an email address and some details (to fill at least a Member model) to create a pending membership.
see https://docs.djangoproject.com/en/2.1/ref/models/fields/#error-messages
...
...
@@ -128,11 +106,6 @@ class RenewForm(RegisterRenewForm):
def
save
(
self
,
commit
=
True
):
m
,
ms
=
super
().
save
(
commit
=
False
)
m
.
username
=
self
.
request
.
user
.
username
if
ms
.
date_paid
is
None
and
ms
.
payment_method
is
None
:
paid
=
has_paid_dispense
(
ms
)
if
paid
is
not
None
:
ms
.
date_paid
=
paid
ms
.
payment_method
=
'dispense'
if
(
commit
):
m
.
save
()
...
...
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