diff --git a/conservancy/supporters/migrations/0003_remove_sustainerorder_monthly_recurring_and_more.py b/conservancy/supporters/migrations/0003_remove_sustainerorder_monthly_recurring_and_more.py new file mode 100644 index 0000000000000000000000000000000000000000..8fc83585236ddb331e0e9eeb1d456831e1e9dbf7 --- /dev/null +++ b/conservancy/supporters/migrations/0003_remove_sustainerorder_monthly_recurring_and_more.py @@ -0,0 +1,33 @@ +# Generated by Django 4.2.11 on 2024-09-30 03:33 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('supporters', '0002_sustainerorder_monthly_recurring_and_more'), + ] + + operations = [ + migrations.RemoveField( + model_name='sustainerorder', + name='monthly_recurring', + ), + migrations.AddField( + model_name='sustainerorder', + name='recurring', + field=models.CharField(default='', max_length=10), + preserve_default=False, + ), + migrations.AlterField( + model_name='sustainerorder', + name='acknowledge_publicly', + field=models.BooleanField(default=True), + ), + migrations.AlterField( + model_name='sustainerorder', + name='add_to_mailing_list', + field=models.BooleanField(default=True), + ), + ] diff --git a/conservancy/supporters/models.py b/conservancy/supporters/models.py index 5d306313c2f81fc45c9598e13ce5fe9bd9e50aea..55a3c2b5b0d5977c74b3a8d7cbc4c86497fafdf6 100644 --- a/conservancy/supporters/models.py +++ b/conservancy/supporters/models.py @@ -19,6 +19,11 @@ class Supporter(models.Model): class SustainerOrder(models.Model): + RENEW_CHOICES = [ + ('', 'None'), + ('month', 'Monthly'), + ('year', 'Annual'), + ] TSHIRT_CHOICES = [ ( '', @@ -63,10 +68,10 @@ class SustainerOrder(models.Model): validators=[ validators.MinValueValidator(100), ]) - monthly_recurring = models.BooleanField(default=False) + recurring = models.CharField(max_length=10) paid_time = models.DateTimeField(null=True, blank=True) - acknowledge_publicly = models.BooleanField(default=False) - add_to_mailing_list = models.BooleanField(default=False) + acknowledge_publicly = models.BooleanField(default=True) + add_to_mailing_list = models.BooleanField(default=True) tshirt_size = models.CharField(max_length=50, choices=TSHIRT_CHOICES) street = models.CharField(max_length=255, blank=True) city = models.CharField(max_length=255, blank=True) diff --git a/conservancy/supporters/templates/supporters/sustainers_stripe2.html b/conservancy/supporters/templates/supporters/sustainers_stripe2.html index e741a25bc806983afdb797954d2b6c0e35edee06..2db1179254987690844c84cd85132b4b40067e05 100644 --- a/conservancy/supporters/templates/supporters/sustainers_stripe2.html +++ b/conservancy/supporters/templates/supporters/sustainers_stripe2.html @@ -35,17 +35,21 @@

To send your receipt

-