From d8bb68906fca9cd4245c6b4607d9e8a3c958123f Mon Sep 17 00:00:00 2001 From: frekk Date: Mon, 4 Mar 2019 01:18:02 +0800 Subject: [PATCH] fix the bugs that were supposed to be already fixed --- src/memberdb/actions.py | 2 +- src/squarepay/cokelog.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/memberdb/actions.py b/src/memberdb/actions.py index bb9a584..e7c0f99 100644 --- a/src/memberdb/actions.py +++ b/src/memberdb/actions.py @@ -129,7 +129,7 @@ def refresh_dispense_payment(modeladmin, request, queryset): num_changed = 0 membership_list = list(queryset) for ms in membership_list: - if ms.date_paid is not None or ms.username == '' or ms.username is None: + if ms.date_paid is not None: continue if try_update_from_dispense(ms): ms.save() diff --git a/src/squarepay/cokelog.py b/src/squarepay/cokelog.py index 01748af..96e26ef 100644 --- a/src/squarepay/cokelog.py +++ b/src/squarepay/cokelog.py @@ -95,6 +95,10 @@ def try_update_from_dispense(membership): Note: this WILL overwrite any existing payment information """ + if membership.member.username == '' or membership.member.username is None: + # can't do anything with empty usernames + return False + # check if anything has happened since last time if member_cokelog.is_loaded(): member_cokelog.reload() -- GitLab