diff --git a/gms/memberdb/approve.py b/gms/memberdb/approve.py index e3c47d7871047c29d2c99e449544a3f957dc867d..91fe40f3fcbd631e556e86d2490fc1efa37fab92 100644 --- a/gms/memberdb/approve.py +++ b/gms/memberdb/approve.py @@ -71,7 +71,11 @@ class MembershipApprovalForm(MyModelForm): data['date_approved'] = now if (data['payment_confirm'] == True): + if (data['payment_method'] == ''): + self.add_error('payment_method', 'Please select a payment method') data['date_paid'] = now + else: + data['date_paid'] = None # make sure "no payment" is recorded for Life Members. # XXX this might not actually be the case, since some life members may want to also be financial members (ie. for constitutional voting rights) @@ -124,7 +128,6 @@ class MembershipApprovalAdminView(MyUpdateView): called when the approval form is submitted and valid data (according to the form's field types and defined validators) is given """ def form_valid(self, form): - breakpoint() ms = form.save() self.admin.message_user(self.request, 'Approve success')