Processing receivable fees

Author: rennerocha

thebook/members/admin.py

@@ -1,3 +1,4 @@
+from django import forms
 from django.contrib import admin
 
 from thebook.members.models import (

thebook/members/managers.py

@@ -5,42 +5,19 @@
 
 
 class ReceivableFeeManager(models.Manager):
-    def create_for_next_month(self):
-        from thebook.members.models import FeePaymentStatus, Membership
 
-        today = datetime.date.today()
+    def create_for_next_month(self):
+        return self.create_for_next_period()
 
-        next_month = today.month + 1 if today.month < 12 else 1
-        next_year = today.year + 1 if today.month == 12 else today.year
+    def create_for_next_period(self):
+        from thebook.members.models import FeePaymentStatus, Membership
 
         receivable_fees = []
 
         memberships = Membership.objects.filter(active=True)
         for membership in memberships:
-            _, last_day_of_next_payment_month = calendar.monthrange(
-                membership.next_membership_fee_payment_date.year,
-                membership.next_membership_fee_payment_date.month,
-            )
-            due_date = datetime.date(
-                membership.next_membership_fee_payment_date.year,
-                membership.next_membership_fee_payment_date.month,
-                last_day_of_next_payment_month,
-            )
-
-            if (due_date.year, due_date.month) != (next_year, next_month):
-                continue
-
-            start_date = datetime.date(due_date.year, due_date.month, 1)
-
-            receivable_fees.append(
-                self.model(
-                    membership=membership,
-                    start_date=start_date,
-                    due_date=due_date,
-                    amount=membership.membership_fee_amount,
-                    status=FeePaymentStatus.UNPAID,
-                )
-            )
+            receivable_fees.append(self.create_for_next_period(commit=False))
+
         return self.model.objects.bulk_create(
             receivable_fees,
             update_conflicts=True,

thebook/members/migrations/0012_alter_membership_active.py

@@ -0,0 +1,22 @@
+# Generated by Django 5.2.2 on 2025-08-11 21:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("members", "0011_remove_receivablefeetransactionmatchrule_priority"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="membership",
+            name="active",
+            field=models.BooleanField(
+                default=False,
+                help_text="Indicates is we are expecting to be receiving fees from this membership",
+                verbose_name="Active Membership",
+            ),
+        ),
+    ]

thebook/members/migrations/0013_alter_membership_payment_method_and_more.py

@@ -0,0 +1,47 @@
+# Generated by Django 5.2.2 on 2025-09-08 23:29
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "bookkeeping",
+            "0014_remove_categorymatchrule_valid_comparison_function_and_more",
+        ),
+        ("members", "0012_alter_membership_active"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="membership",
+            name="payment_method",
+            field=models.IntegerField(
+                choices=[(1, "PayPal"), (2, "Pix"), (3, "Recurring Pix")],
+                default=1,
+                help_text="How fees are paid?",
+                verbose_name="Payment Method",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="receivablefee",
+            name="status",
+            field=models.IntegerField(
+                choices=[(1, "Paid"), (2, "Unpaid"), (3, "Due"), (4, "Skipped")],
+                default=2,
+                verbose_name="Payment Status",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="receivablefee",
+            name="transaction",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="bookkeeping.transaction",
+            ),
+        ),
+    ]

thebook/members/models.py

@@ -31,25 +31,29 @@ class FeePaymentStatus:
     PAID = 1
     UNPAID = 2
     DUE = 3
+    SKIPPED = 4
 
     @classproperty
     def choices(cls):
         return (
             (cls.PAID, _("Paid")),
             (cls.UNPAID, _("Unpaid")),
             (cls.DUE, _("Due")),
+            (cls.SKIPPED, _("Skipped")),
         )
 
 
 class PaymentMethod:
     PAYPAL = 1
     PIX = 2
+    PIX_RECURRING = 3
 
     @classproperty
     def choices(cls):
         return (
             (cls.PAYPAL, _("PayPal")),
             (cls.PIX, _("Pix")),
+            (cls.PIX_RECURRING, _("Recurring Pix")),
         )
 
 
@@ -80,7 +84,7 @@ class Membership(models.Model):
         help_text=_("How fees are paid?"),
     )
     active = models.BooleanField(
-        default=True,
+        default=False,
         verbose_name=_("Active Membership"),
         help_text=_(
             "Indicates is we are expecting to be receiving fees from this membership"
@@ -97,6 +101,60 @@ def __str__(self):
         active_status = "Active" if self.active else "Inactive"
         return f"{active_status} membership of {self.member.name}"
 
+    def create_next_receivable_fee(self, commit=True):
+        if not self.active:
+            return None
+
+        def _next_period(current_date, payment_interval):
+            month_increment = {
+                FeeIntervals.MONTHLY: 1,
+                FeeIntervals.QUARTERLY: 3,
+                FeeIntervals.BIANNUALLY: 6,
+                FeeIntervals.ANNUALLY: 12,
+            }
+            next_possible_month = current_date.month + month_increment[payment_interval]
+
+            if (
+                next_possible_month % 12 == next_possible_month
+                or next_possible_month % 12 == 0
+            ):
+                next_month = next_possible_month
+                next_year = current_date.year
+            else:
+                next_month = next_possible_month % 12
+                next_year = current_date.year + 1
+
+            return next_month, next_year
+
+        last_receivable_fee = self.receivable_fees.first()
+        if last_receivable_fee is None:
+            _, last_day_of_month = calendar.monthrange(
+                self.start_date.year, self.start_date.month
+            )
+            start_date = datetime.date(self.start_date.year, self.start_date.month, 1)
+            due_date = datetime.date(
+                self.start_date.year, self.start_date.month, last_day_of_month
+            )
+        else:
+            next_month, next_year = _next_period(
+                last_receivable_fee.start_date, self.payment_interval
+            )
+            _, last_day_of_month = calendar.monthrange(next_year, next_month)
+            start_date = datetime.date(next_year, next_month, 1)
+            due_date = datetime.date(next_year, next_month, last_day_of_month)
+
+        receivable_fee = ReceivableFee(
+            membership=self,
+            start_date=start_date,
+            due_date=due_date,
+            amount=self.membership_fee_amount,
+            status=FeePaymentStatus.UNPAID,
+        )
+        if commit:
+            receivable_fee.save()
+
+        return receivable_fee
+
     @property
     def next_membership_fee_payment_date(self):
         allowed_months = sorted(

thebook/members/signals.py

@@ -24,6 +24,7 @@ def _send_onboarding_message(membership):
 @receiver(post_save, sender=Membership)
 def check_active_status(sender, instance, created, **kwargs):
     if created:
+        instance.create_next_receivable_fee()
         return
 
     if instance.active and not instance._original_active: