Merge branch 'develop' into feature-payment

This commit is contained in:
henu
2017-03-29 19:15:48 +03:00
37 changed files with 646 additions and 146 deletions
+2 -2
View File
@@ -24,7 +24,7 @@ memberlogger = logging.getLogger(__name__)
logging.basicConfig(format='[%(levelname)s]%(asctime)s %(message)s', level=settings.LOGGERLEVEL, filename=settings.LOGPATH)
# REST API views
#API views
########################################
class MembersList(generics.ListCreateAPIView):
queryset = Member.objects.all()
@@ -237,7 +237,7 @@ def new_member_request(request, *args, **kwargs):
message += 'AYY-membership: ' + str(mem.AYY) + '\r\n'
message += 'To mail list: ' + str(mem.jas) + '\r\n'
message += 'Created: ' + mem.created.isoformat(' ') + '\r\n'
message += 'Please go to the http://sika.sahkoinsinoorikilta.fi/members/ and do something about it!\r\n'
message += 'Please go to the https://sika.sahkoinsinoorikilta.fi/members/ and do something about it!\r\n'
# TODO: send mail when application is ready
# send_mail_wrapper(subject, message)