')
diff --git a/mooringlicensing/management/commands/expire_application_due_to_no_payment.py b/mooringlicensing/management/commands/expire_application_due_to_no_payment.py
new file mode 100755
index 000000000..6ecc1b155
--- /dev/null
+++ b/mooringlicensing/management/commands/expire_application_due_to_no_payment.py
@@ -0,0 +1,58 @@
+from datetime import timedelta
+
+from django.utils import timezone
+from django.core.management.base import BaseCommand
+from django.core.exceptions import ImproperlyConfigured
+from django.db.models import Q
+
+import logging
+
+from mooringlicensing.components.proposals.email import send_expire_application_email, send_expire_notification_to_assessor
+from mooringlicensing.components.main.models import NumberOfDaysType, NumberOfDaysSetting
+from mooringlicensing.components.proposals.models import Proposal
+from mooringlicensing.management.commands.utils import construct_email_message
+from mooringlicensing.settings import CODE_DAYS_BEFORE_DUE_PAYMENT
+
+logger = logging.getLogger('cron_tasks')
+cron_email = logging.getLogger('cron_email')
+
+class Command(BaseCommand):
+ help = 'expire application if not paid within configurable number of days after being approved and send email to inform applicant'
+
+ def handle(self, *args, **options):
+ errors = []
+ updates = []
+ today = timezone.localtime(timezone.now()).date()
+
+ # Retrieve the number of days before expiry date of the proposals to email
+ days_type = NumberOfDaysType.objects.get(code=CODE_DAYS_BEFORE_DUE_PAYMENT)
+ days_setting = NumberOfDaysSetting.get_setting_by_date(days_type, today)
+ if not days_setting:
+ # No number of days found
+ raise ImproperlyConfigured("NumberOfDays: {} is not defined for the date: {}".format(days_type.name, today))
+
+ logger.info('Running command {}'.format(__name__))
+
+ # Construct queries
+ queries = Q()
+ queries &= Q(processing_status=Proposal.PROCESSING_STATUS_AWAITING_PAYMENT)
+ queries &= Q(payment_due_date__lt=today)
+
+ for p in Proposal.objects.filter(queries):
+ try:
+ p.processing_status = Proposal.PROCESSING_STATUS_EXPIRED
+ p.save()
+
+ send_expire_application_email(p, p.payment_due_date)
+ send_expire_notification_to_assessor(p, p.payment_due_date)
+ logger.info('Expired notification sent for Proposal {}'.format(p.lodgement_number))
+ updates.append(p.lodgement_number)
+ except Exception as e:
+ err_msg = 'Error sending expired notification for Proposal {}'.format(p.lodgement_number)
+ logger.error('{}\n{}'.format(err_msg, str(e)))
+ errors.append(err_msg)
+
+ cmd_name = __name__.split('.')[-1].replace('_', ' ').upper()
+ msg = construct_email_message(cmd_name, errors, updates)
+ logger.info(msg)
+ cron_email.info(msg)
diff --git a/mooringlicensing/management/commands/send_application_payment_due_reminder.py b/mooringlicensing/management/commands/send_application_payment_due_reminder.py
new file mode 100755
index 000000000..78ad49276
--- /dev/null
+++ b/mooringlicensing/management/commands/send_application_payment_due_reminder.py
@@ -0,0 +1,58 @@
+from datetime import timedelta
+
+from django.utils import timezone
+from django.core.management.base import BaseCommand
+from django.core.exceptions import ImproperlyConfigured
+from django.db.models import Q
+
+import logging
+
+from mooringlicensing.components.proposals.email import send_payment_reminder_email
+from mooringlicensing.components.main.models import NumberOfDaysType, NumberOfDaysSetting
+from mooringlicensing.components.proposals.models import Proposal
+from mooringlicensing.management.commands.utils import construct_email_message
+from mooringlicensing.settings import CODE_DAYS_FOR_DUE_PAYMENT_REMINDER
+
+logger = logging.getLogger('cron_tasks')
+cron_email = logging.getLogger('cron_email')
+
+class Command(BaseCommand):
+ help = 'send email reminder to applicant to submit payment for an application if not paid within configurable number of days after being approved'
+
+ def handle(self, *args, **options):
+ errors = []
+ updates = []
+ today = timezone.localtime(timezone.now()).date()
+
+ # Retrieve the number of days before expiry date of the proposals to email
+ days_type = NumberOfDaysType.objects.get(code=CODE_DAYS_FOR_DUE_PAYMENT_REMINDER)
+ days_setting = NumberOfDaysSetting.get_setting_by_date(days_type, today)
+ if not days_setting:
+ # No number of days found
+ raise ImproperlyConfigured("NumberOfDays: {} is not defined for the date: {}".format(days_type.name, today))
+ boundary_date = today + timedelta(days=days_setting.number_of_days)
+
+ logger.info('Running command {}'.format(__name__))
+
+ # Construct queries
+ queries = Q()
+ queries &= Q(processing_status=Proposal.PROCESSING_STATUS_AWAITING_PAYMENT)
+ queries &= Q(payment_due_date__lt=boundary_date)
+ queries &= Q(payment_reminder_sent=False)
+
+ for p in Proposal.objects.filter(queries):
+ try:
+ p.payment_reminder_sent = True
+ p.save()
+ send_payment_reminder_email(p)
+ logger.info('Payment reminder sent for Proposal {}'.format(p.lodgement_number))
+ updates.append(p.lodgement_number)
+ except Exception as e:
+ err_msg = 'Error sending payment reminder for Proposal {}'.format(p.lodgement_number)
+ logger.error('{}\n{}'.format(err_msg, str(e)))
+ errors.append(err_msg)
+
+ cmd_name = __name__.split('.')[-1].replace('_', ' ').upper()
+ msg = construct_email_message(cmd_name, errors, updates)
+ logger.info(msg)
+ cron_email.info(msg)
diff --git a/mooringlicensing/migrations/0376_proposal_payment_due_date.py b/mooringlicensing/migrations/0376_proposal_payment_due_date.py
new file mode 100644
index 000000000..32a1143d8
--- /dev/null
+++ b/mooringlicensing/migrations/0376_proposal_payment_due_date.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.0.9 on 2024-11-28 08:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('mooringlicensing', '0375_dcvpermit_status'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='proposal',
+ name='payment_due_date',
+ field=models.DateField(blank=True, null=True),
+ ),
+ ]
diff --git a/mooringlicensing/migrations/0377_proposal_payment_reminder_sent.py b/mooringlicensing/migrations/0377_proposal_payment_reminder_sent.py
new file mode 100644
index 000000000..71a60033d
--- /dev/null
+++ b/mooringlicensing/migrations/0377_proposal_payment_reminder_sent.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.0.9 on 2024-11-29 01:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('mooringlicensing', '0376_proposal_payment_due_date'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='proposal',
+ name='payment_reminder_sent',
+ field=models.BooleanField(default=False),
+ ),
+ ]
diff --git a/mooringlicensing/settings.py b/mooringlicensing/settings.py
index 8ff232ee3..e18ffe922 100755
--- a/mooringlicensing/settings.py
+++ b/mooringlicensing/settings.py
@@ -293,6 +293,8 @@ def show_toolbar(request):
]
# For NumberOfDaysSettings
+CODE_DAYS_BEFORE_DUE_PAYMENT = 'PaymentDueDate'
+CODE_DAYS_FOR_DUE_PAYMENT_REMINDER = 'PaymentReminder'
CODE_DAYS_BEFORE_DUE_COMPLIANCE = 'ComplianceDueDate'
CODE_DAYS_BEFORE_END_OF_SIX_MONTH_PERIOD_ML = 'MLVesselNominateNotification'
CODE_DAYS_BEFORE_END_OF_SIX_MONTH_PERIOD_WLA = 'WLAVesselNominateNotification'
@@ -311,6 +313,18 @@ def show_toolbar(request):
CODE_DAYS_FOR_FINAL_REMINDER = 'FinalReminderNotification'
TYPES_OF_CONFIGURABLE_NUMBER_OF_DAYS = [
+ {
+ 'code': CODE_DAYS_BEFORE_DUE_PAYMENT,
+ 'name': 'Payment due date',
+ 'description': 'Number of days before due date of post-approval payments',
+ 'default': 14
+ },
+ {
+ 'code': CODE_DAYS_FOR_DUE_PAYMENT_REMINDER,
+ 'name': 'Payment due date',
+ 'description': 'Number of days before reminder sent for due date of post-approval payments',
+ 'default': 7
+ },
{
'code': CODE_DAYS_BEFORE_DUE_COMPLIANCE,
'name': 'Compliance due date',
diff --git a/mooringlicensing/templates/mooringlicensing/emails_2/application_expire_notification.html b/mooringlicensing/templates/mooringlicensing/emails_2/application_expire_notification.html
new file mode 100755
index 000000000..2f99d5561
--- /dev/null
+++ b/mooringlicensing/templates/mooringlicensing/emails_2/application_expire_notification.html
@@ -0,0 +1,8 @@
+{% extends 'mooringlicensing/emails/base_email-rottnest.html' %}
+
+{% block content_body %}
+{% include "mooringlicensing/emails_2/salutation.html" %}
+
Please be aware that your {{ proposal.child_obj.description }}: {{ proposal.lodgement_number }} expired on {{ proposal.payment_due_date }} due to payment not being made
+
To apply for a new {{ proposal.child_obj.description }} please click here
+{% include "mooringlicensing/emails/signature-rottnest.html" %}
+{% endblock %}
diff --git a/mooringlicensing/templates/mooringlicensing/emails_2/application_expire_notification.txt b/mooringlicensing/templates/mooringlicensing/emails_2/application_expire_notification.txt
new file mode 100755
index 000000000..88436ac7f
--- /dev/null
+++ b/mooringlicensing/templates/mooringlicensing/emails_2/application_expire_notification.txt
@@ -0,0 +1,6 @@
+{% extends 'mooringlicensing/emails/base_email.txt' %}
+
+{% block content %}
+ Please be aware that your {{ proposal.child_obj.description }}: {{ proposal.lodgement_number }} expired on {{ proposal.payment_due_date }} due to payment not being made
+ To apply for a new {{ proposal.child_obj.description }} please access {{ url }}
+{% endblock %}
diff --git a/mooringlicensing/templates/mooringlicensing/emails_2/application_payment_reminder.html b/mooringlicensing/templates/mooringlicensing/emails_2/application_payment_reminder.html
new file mode 100755
index 000000000..d71aba380
--- /dev/null
+++ b/mooringlicensing/templates/mooringlicensing/emails_2/application_payment_reminder.html
@@ -0,0 +1,9 @@
+{% extends 'mooringlicensing/emails/base_email-rottnest.html' %}
+
+{% block content_body %}
+
Payment for application {{ proposal.lodgement_number }} is due by {{ due_date }}.
+
Please click here to login and check the Applications dashboard.
+{% include "mooringlicensing/emails/signature-rottnest.html" %}
+{% endblock %}
diff --git a/mooringlicensing/templates/mooringlicensing/emails_2/application_payment_reminder.txt b/mooringlicensing/templates/mooringlicensing/emails_2/application_payment_reminder.txt
new file mode 100755
index 000000000..941db2220
--- /dev/null
+++ b/mooringlicensing/templates/mooringlicensing/emails_2/application_payment_reminder.txt
@@ -0,0 +1,9 @@
+{% extends 'mooringlicensing/emails/base_email-rottnest.txt' %}
+
+{% block content_body %}
+Dear {{ applicant.first_name }} {{ applicant.last_name}},
+
+Payment for application {{ proposal.lodgement_number }} is due by {{ due_date }}.
+Please access {{ url }} to login and check the Applications dashboard.
+{% include "mooringlicensing/emails/signature-rottnest.html" %}
+{% endblock %}
diff --git a/mooringlicensing/templates/mooringlicensing/emails_2/assessor_expiry_notification.html b/mooringlicensing/templates/mooringlicensing/emails_2/assessor_expiry_notification.html
new file mode 100755
index 000000000..ffaf3dcd5
--- /dev/null
+++ b/mooringlicensing/templates/mooringlicensing/emails_2/assessor_expiry_notification.html
@@ -0,0 +1,5 @@
+{% extends 'mooringlicensing/emails/base_email-rottnest.html' %}
+
+{% block content_body %}
+
{{ applicant.first_name }} {{ applicant.last_name }} has not paid for application {{ proposal.lodgement_number }} before the due date of {{ due_date }}. The application has expired.
+{% endblock %}
diff --git a/mooringlicensing/templates/mooringlicensing/emails_2/assessor_expiry_notification.txt b/mooringlicensing/templates/mooringlicensing/emails_2/assessor_expiry_notification.txt
new file mode 100755
index 000000000..937b39fd0
--- /dev/null
+++ b/mooringlicensing/templates/mooringlicensing/emails_2/assessor_expiry_notification.txt
@@ -0,0 +1,5 @@
+{% extends 'mooringlicensing/emails/base_email-rottnest.txt' %}
+
+{% block content_body %}
+{{ applicant.first_name }} {{ applicant.last_name }} has not paid for application {{ proposal.lodgement_number }} before the due date of {{ due_date }}. The application has expired.
+{% endblock %}
diff --git a/mooringlicensing/templates/mooringlicensing/emails_2/email_20a.html b/mooringlicensing/templates/mooringlicensing/emails_2/email_20a.html
index 6daf16007..2bd08d137 100755
--- a/mooringlicensing/templates/mooringlicensing/emails_2/email_20a.html
+++ b/mooringlicensing/templates/mooringlicensing/emails_2/email_20a.html
@@ -4,6 +4,7 @@
{% include "mooringlicensing/emails_2/salutation.html" %}
Your authorised user permit application {{ proposal.lodgement_number }} has been conditionally approved pending payment of your fees. Please see attached document for more details.
The sticker(s) for your vessel will be mailed to you once payment has been made. Please click here to pay the fees for your authorised user permit.
+
Payment is due by {{proposal.payment_due_date}}.
Vessel stickers remain the property of RIA and must be returned or surrendered upon request, or prior to the sale or disposal of your vessel. Penalties apply.
Entry to the Reserve, access to the Shared Mooring System (SMS), and authorised use of mooring sites, is NOT approved until your current sticker is clearly displayed on the port side of your vessel. Penalties apply.
{% if details %}
Details: {{ details }}
{% endif %}
diff --git a/mooringlicensing/templates/mooringlicensing/emails_2/email_20a.txt b/mooringlicensing/templates/mooringlicensing/emails_2/email_20a.txt
index 953c188cf..82e032866 100755
--- a/mooringlicensing/templates/mooringlicensing/emails_2/email_20a.txt
+++ b/mooringlicensing/templates/mooringlicensing/emails_2/email_20a.txt
@@ -4,6 +4,7 @@
{% include "mooringlicensing/emails_2/salutation.txt" %}
Your authorised user permit application {{ proposal.lodgement_number }} has been conditionally approved pending payment of your fees. Please see attached document for more details.
The sticker(s) for your vessel will be mailed to you once payment has been made. Please access {{ payment_url }} to pay the fees for your authorised user permit.
+Payment is due by {{proposal.payment_due_date}}.
Vessel stickers remain the property of RIA and must be returned or surrendered upon request, or prior to the sale or disposal of your vessel. Penalties apply.
Entry to the Reserve, access to the Shared Mooring System (SMS), and authorised use of mooring sites, is NOT approved until your current sticker is clearly displayed on the port side of your vessel. Penalties apply.
{% if details %}Details: {{ details }}{% endif %}
diff --git a/mooringlicensing/templates/mooringlicensing/emails_2/email_22a.html b/mooringlicensing/templates/mooringlicensing/emails_2/email_22a.html
index 001fac4e3..6ec9faf24 100755
--- a/mooringlicensing/templates/mooringlicensing/emails_2/email_22a.html
+++ b/mooringlicensing/templates/mooringlicensing/emails_2/email_22a.html
@@ -12,6 +12,7 @@
{% endif %}
Entry to the Reserve and access to the Shared Mooring System (SMS) is NOT approved until your current sticker is clearly displayed on the port side of your vessel. Penalties apply.
Please click here to pay the fees for your authorised user permit.
+
Payment is due by {{proposal.payment_due_date}}.
{% if details %}
Details: {{ details }}
{% endif %}
{% include "mooringlicensing/emails/signature-rottnest.html" %}
{% endblock %}
diff --git a/mooringlicensing/templates/mooringlicensing/emails_2/email_22a.txt b/mooringlicensing/templates/mooringlicensing/emails_2/email_22a.txt
index cf775f8c4..5a10af7ca 100755
--- a/mooringlicensing/templates/mooringlicensing/emails_2/email_22a.txt
+++ b/mooringlicensing/templates/mooringlicensing/emails_2/email_22a.txt
@@ -12,6 +12,7 @@ to the Rottnest Island Authority and the new sticker for your vessel will be mai
{% endif %}
Entry to the Reserve and access to the Shared Mooring System (SMS) is NOT approved until your current sticker is clearly displayed on the port side of your vessel. Penalties apply.
Please access {{ payment_url }} to pay the fees for your authorised user permit.
+Payment is due by {{proposal.payment_due_date}}.
{% if details %}Details: {{ details }}{% endif %}
{% include "mooringlicensing/emails/signature-rottnest.txt" %}
{% endblock %}
diff --git a/mooringlicensing/templates/mooringlicensing/emails_2/email_23a.html b/mooringlicensing/templates/mooringlicensing/emails_2/email_23a.html
index d8df57a2f..0eb50b1e5 100755
--- a/mooringlicensing/templates/mooringlicensing/emails_2/email_23a.html
+++ b/mooringlicensing/templates/mooringlicensing/emails_2/email_23a.html
@@ -7,6 +7,7 @@
Entry to the Reserve and access to the Shared Mooring System (including use of your own mooring site) is NOT approved until your current sticker is clearly displayed on the port side of your vessel. Penalties apply.
Remember that vessel stickers remain the property of RIA and must be returned or surrendered upon request, or prior to the sale or disposal of your vessel. Penalties apply.
Please click here to pay the fees for your mooring site licence.
+
Payment is due by {{proposal.payment_due_date}}.
{% if details %}
Details: {{ details }}
{% endif %}
{% include "mooringlicensing/emails/signature-rottnest.html" %}
{% endblock %}
diff --git a/mooringlicensing/templates/mooringlicensing/emails_2/email_23a.txt b/mooringlicensing/templates/mooringlicensing/emails_2/email_23a.txt
index f4ea6a9b5..946779cb0 100755
--- a/mooringlicensing/templates/mooringlicensing/emails_2/email_23a.txt
+++ b/mooringlicensing/templates/mooringlicensing/emails_2/email_23a.txt
@@ -7,6 +7,7 @@ Once payment has been received the sticker(s) for your vessel(s) will be mailed
Entry to the Reserve and access to the Shared Mooring System (including use of your own mooring site) is NOT approved until your current sticker is clearly displayed on the port side of your vessel. Penalties apply.
Remember that vessel stickers remain the property of RIA and must be returned or surrendered upon request, or prior to the sale or disposal of your vessel. Penalties apply.
Please access {{ payment_url }} to pay the fees for your mooring site licence.
+Payment is due by {{proposal.payment_due_date}}.
{% if details %}Details: {{ details }}{% endif %}
{% include "mooringlicensing/emails/signature-rottnest.txt" %}
{% endblock %}
diff --git a/mooringlicensing/templates/mooringlicensing/emails_2/email_25a.html b/mooringlicensing/templates/mooringlicensing/emails_2/email_25a.html
index 1c341042c..2c921f803 100755
--- a/mooringlicensing/templates/mooringlicensing/emails_2/email_25a.html
+++ b/mooringlicensing/templates/mooringlicensing/emails_2/email_25a.html
@@ -12,6 +12,7 @@
{% endif %}
Entry to the Reserve and access to the Shared Mooring System (including use of your own mooring site) is NOT approved until your current sticker is clearly displayed on the port side of your vessel. Penalties apply.
Please click here to pay the fees for your mooring site licence.
+
Payment is due by {{proposal.payment_due_date}}.
{% if details %}
Details: {{ details }}
{% endif %}
{% include "mooringlicensing/emails/signature-rottnest.html" %}
{% endblock %}
diff --git a/mooringlicensing/templates/mooringlicensing/emails_2/email_25a.txt b/mooringlicensing/templates/mooringlicensing/emails_2/email_25a.txt
index 1b2f008fe..105e1fbfa 100755
--- a/mooringlicensing/templates/mooringlicensing/emails_2/email_25a.txt
+++ b/mooringlicensing/templates/mooringlicensing/emails_2/email_25a.txt
@@ -12,6 +12,7 @@ to the Rottnest Island Authority and the new sticker for your vessel will be mai
{% endif %}
Entry to the Reserve and access to the Shared Mooring System (including use of your own mooring site) is NOT approved until your current sticker is clearly displayed on the port side of your vessel. Penalties apply.
Please click here {{ payment_url }} to pay the fees for your mooring site licence.
+Payment is due by {{proposal.payment_due_date}}.
{% if details %}Details: {{ details }}{% endif %}
{% include "mooringlicensing/emails/signature-rottnest.txt" %}
{% endblock %}