Bernard Siebens
29d61eeea8
A Billing tab (tiers, their dated prices, and everything we are owed), a billing panel on each club (plan, periods, payment history, invoice), and the dues on the dashboard and the club tables. Every state change goes through the billing service, and a BillingError surfaces as a message rather than a 500 -- so "that period is waived", "no price in force", "already billed for that period" and a missing PDF library all explain themselves instead of crashing. The dashboard now separates the two pots of money that were previously one word. "Revenue per month" was CLUB SHOP revenue -- members paying their clubs, which is never ours -- sitting on our dashboard under a label that implied it was income. It is now "Platform dues per month" (what clubs paid us) with the club-shop series renamed club_revenue, and the club tables carry a Plan column and what each club owes us, annotated in the same single query. Rate changes are add-only in the UI as well as the model: the price form creates a dated row and never edits the last one, and a test asserts that raising the rate leaves an already-open period at the amount it was billed at. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
106 lines
4.8 KiB
Python
106 lines
4.8 KiB
Python
from decimal import Decimal
|
|
|
|
from django import forms
|
|
from django.utils.translation import gettext_lazy as _
|
|
from waffle import get_waffle_flag_model
|
|
|
|
from billing.models import DuePayment, Subscription, Tier, TierPrice
|
|
from club.models import Club
|
|
|
|
from .services.admins import find_member_by_email
|
|
|
|
|
|
class ClubForm(forms.ModelForm):
|
|
class Meta:
|
|
model = Club
|
|
fields = ["name", "slug", "logo", "primary_color"]
|
|
help_texts = {"slug": _("Drives the club's subdomain. Left blank, it is derived from the name.")}
|
|
# Deliberately a text input, not <input type="color">: a colour picker cannot
|
|
# express "no colour" -- it would submit #000000 for every club that never
|
|
# touched it, and every club would silently get a black theme.
|
|
widgets = {"primary_color": forms.TextInput(attrs={"placeholder": "#1e40af"})}
|
|
|
|
def __init__(self, *args, **kwargs):
|
|
super().__init__(*args, **kwargs)
|
|
self.fields["slug"].required = False
|
|
|
|
|
|
class ClubAdminForm(forms.Form):
|
|
"""Grant club-admin rights to an email address, creating the person if new."""
|
|
|
|
email = forms.EmailField(label=_("Email address"), help_text=_("If this email has no account yet, one is created and they set a password via the reset link."))
|
|
first_name = forms.CharField(label=_("First name"), required=False)
|
|
last_name = forms.CharField(label=_("Last name"), required=False)
|
|
|
|
def clean(self):
|
|
cleaned = super().clean()
|
|
email = cleaned.get("email")
|
|
|
|
# Only a brand-new person needs a name; an existing member already has one.
|
|
if email and find_member_by_email(email) is None:
|
|
for field in ("first_name", "last_name"):
|
|
if not cleaned.get(field):
|
|
self.add_error(field, _("Required: this email has no account yet."))
|
|
|
|
return cleaned
|
|
|
|
|
|
class PlatformAdminForm(forms.Form):
|
|
"""Grant platform access to an email address, creating the account if new."""
|
|
|
|
email = forms.EmailField(label=_("Email address"), help_text=_("If this email has no account yet, one is created and they set a password via the reset link."))
|
|
is_superuser = forms.BooleanField(label=_("Superuser"), required=False, help_text=_("Superusers can manage platform admins. Everyone granted access is staff."))
|
|
|
|
|
|
class FlagForm(forms.ModelForm):
|
|
class Meta:
|
|
model = get_waffle_flag_model()
|
|
fields = ["name", "note", "everyone", "superusers", "staff", "percent"]
|
|
help_texts = {
|
|
"everyone": _("Yes = on for all clubs, No = off everywhere (overrides club targeting). Leave unknown to target clubs."),
|
|
}
|
|
|
|
|
|
class TierForm(forms.ModelForm):
|
|
class Meta:
|
|
model = Tier
|
|
fields = ["name", "description", "is_active"]
|
|
|
|
|
|
class TierPriceForm(forms.ModelForm):
|
|
class Meta:
|
|
model = TierPrice
|
|
fields = ["active_from", "amount"]
|
|
widgets = {"active_from": forms.DateInput(attrs={"type": "date"})}
|
|
help_texts = {"active_from": _("Periods opening on or after this date are billed at this amount. Existing periods keep the amount they were billed at.")}
|
|
|
|
|
|
class SubscriptionForm(forms.ModelForm):
|
|
"""Put a club on a tier. The first period opens when the subscription is created."""
|
|
|
|
start = forms.DateField(required=False, widget=forms.DateInput(attrs={"type": "date"}), label=_("First period starts"), help_text=_("Left blank, the period starts today."))
|
|
|
|
class Meta:
|
|
model = Subscription
|
|
fields = ["tier", "auto_archive", "notes"]
|
|
|
|
def __init__(self, *args, **kwargs):
|
|
super().__init__(*args, **kwargs)
|
|
# An inactive tier still bills its existing subscriptions, but must not be picked up
|
|
# by a new one — which is the whole point of retiring a tier.
|
|
self.fields["tier"].queryset = Tier.objects.filter(is_active=True)
|
|
|
|
|
|
class DuePaymentForm(forms.Form):
|
|
amount = forms.DecimalField(max_digits=10, decimal_places=2, min_value=Decimal("0.01"), label=_("Amount"))
|
|
method = forms.ChoiceField(choices=DuePayment.Method.choices, initial=DuePayment.Method.BANK_TRANSFER, label=_("Method"))
|
|
reference = forms.CharField(required=False, label=_("Reference"), help_text=_("Bank reference, transaction id — whatever lets you find this again."))
|
|
paid_at = forms.DateTimeField(required=False, widget=forms.DateTimeInput(attrs={"type": "datetime-local"}), label=_("Received"), help_text=_("Left blank, now."))
|
|
note = forms.CharField(required=False, widget=forms.Textarea(attrs={"rows": 2}), label=_("Note"))
|
|
|
|
|
|
class OpenPeriodForm(forms.Form):
|
|
"""Renew, or reactivate an archived club."""
|
|
|
|
start = forms.DateField(required=False, widget=forms.DateInput(attrs={"type": "date"}), label=_("Period starts"), help_text=_("Left blank, it continues from the end of the last period — so a lapsed year is still owed."))
|