Merge branch 'develop'

Author: mhieta

CHANGELOG.md

@@ -7,6 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.8.0] - 2025-05-15
+
+### Added
+
+- Remind permit expiration in 1 week or 1 day ([68f240e](https://github.com/City-of-Helsinki/parking-permits/commit/68f240e0b65514d83af7a4e2c0423eb604ec01b1))
+- Add permit end time to expiration remind ([0539567](https://github.com/City-of-Helsinki/parking-permits/commit/0539567202fcc2e1937a39cb1706da5305b7ab1b))
+- Remove dates from active temporary vehicle ([a3275ec](https://github.com/City-of-Helsinki/parking-permits/commit/a3275ec159fefd06b0e5ea1f1fc5d30426cc0ff5))
+- Limit webshop temporary vehicle creation ([e1a9e89](https://github.com/City-of-Helsinki/parking-permits/commit/e1a9e893d85b3d0038656ada71e06f8d2cd49034))
+- Improve expiration remind email messages ([6586d19](https://github.com/City-of-Helsinki/parking-permits/commit/6586d193b146b770d4cdbb8c4efd21c6e0aca422))
+- Refund emails via admin request for approval ([9c5bd3c](https://github.com/City-of-Helsinki/parking-permits/commit/9c5bd3c76a57fa2251e1e9ff1c53dba978d716be))
+
+### Fixed
+
+- Call correct temporary vehicle event function ([78bee6c](https://github.com/City-of-Helsinki/parking-permits/commit/78bee6c2e0599da7b81cd2b49000034f7bbddfe3))
+
 ## [1.7.2] - 2025-05-08
 
 ### Fixed

locale/fi/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-13 08:15+0200\n"
+"POT-Creation-Date: 2025-05-13 23:16+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -212,6 +212,9 @@ msgstr ""
 msgid "You can buy permit only for address %(primary_address)s."
 msgstr "Voit ostaa pysäköintitunnuksen vain osoitteelle %(primary_address)s."
 
+msgid "Source: Transport register, Traficom"
+msgstr "Lähde: Liikenneasioidenrekisteri, Traficom"
+
 msgid "Forbidden"
 msgstr "Lupa evätty"
 
@@ -341,6 +344,9 @@ msgstr "Palautukset"
 msgid "Refund ID"
 msgstr "Palautusnumero"
 
+msgid "incl. VAT"
+msgstr "sis. ALV"
+
 msgid "Extra info"
 msgstr "Lisätiedot"
 
@@ -1094,9 +1100,6 @@ msgstr ""
 "* Tunnus on voimassa valitsemastasi alkamispäivästä lähtien, kun "
 "maksusuoritus on hyväksytty"
 
-msgid "Source: Transport register, Traficom"
-msgstr "Lähde: Liikenneasioidenrekisteri, Traficom"
-
 msgid "Parking permit expiration date"
 msgstr "Pysäköintitunnuksen päättymispäivä"
 
@@ -1125,12 +1128,15 @@ msgstr "Palaute"
 msgid "Customer service contact info"
 msgstr "Asiakaspalvelu ja yhteystiedot"
 
+msgid "Your parking permit expires at"
+msgstr "Pysäköintitunnuksesi voimassaoloaika päättyy"
+
 msgid ""
-"Your parking permit will expire soon. You can renew your permit by logging "
-"in to the service again."
+"You can renew your permit by logging in to the service and selecting 'Extend "
+"parking permit'."
 msgstr ""
-"Pysäköintitunnuksesi voimassaoloaika päättyy lähiaikoina. Voit uusia "
-"tunnuksen kirjautumalla palveluun"
+"Voit uusia tunnuksen kirjautumalla palveluun ja valitsemalla 'Jatka "
+"pysäköintitunnuksen voimassaoloa'."
 
 msgid "Thank you for your order!"
 msgstr "Kiitos tilauksestasi!"
@@ -1166,9 +1172,6 @@ msgstr ""
 msgid "Total refundable amount"
 msgstr "Palautettava summa yhteensä"
 
-msgid "incl. VAT"
-msgstr "sis. ALV"
-
 msgid ""
 "You are entitled to a refund and it has been registered. You will receive a "
 "separate notification when the return has been approved."

locale/sv/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-13 08:15+0200\n"
+"POT-Creation-Date: 2025-05-13 23:16+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -208,6 +208,9 @@ msgstr "Du kan ha maximalt %(max_allowed_permit)s tillstånd."
 msgid "You can buy permit only for address %(primary_address)s."
 msgstr "Du kan endast köpa tillstånd för adressen %(primary_address)s."
 
+msgid "Source: Transport register, Traficom"
+msgstr "Källä: Trafik- och transportregistret, Traficom"
+
 msgid "Forbidden"
 msgstr "Förbjuden"
 
@@ -337,6 +340,9 @@ msgstr "Återbetalning"
 msgid "Refund ID"
 msgstr "Återbetalning ID"
 
+msgid "incl. VAT"
+msgstr "inkl. MOMS"
+
 msgid "Extra info"
 msgstr "Ytterligare uppgifter"
 
@@ -1094,9 +1100,6 @@ msgstr ""
 "* Parkeringpermit är i kraft från den valda startdatum, när betalningen är "
 "godkännt"
 
-msgid "Source: Transport register, Traficom"
-msgstr "Källä: Trafik- och transportregistret, Traficom"
-
 msgid "Parking permit expiration date"
 msgstr "Tillståndet upphör att gälla"
 
@@ -1125,12 +1128,14 @@ msgstr "Ge respons"
 msgid "Customer service contact info"
 msgstr "Kundtjänst kontaktuppgifter"
 
+msgid "Your parking permit expires at"
+msgstr "Ditt parkeringstillstånd går ut vid"
+
 msgid ""
-"Your parking permit will expire soon. You can renew your permit by logging "
-"in to the service again."
-msgstr ""
-"Ditt parkeringstillstånd går snart ut. Du kan förnya ditt tillstånd genom "
-"att logga in på tjänsten."
+"You can renew your permit by logging in to the service and selecting 'Extend "
+"parking permit'."
+msgstr "Du kan förnya ditt tillstånd genom att logga in på tjänsten och välja "
+"'Förläng parkeringstillstånd'."
 
 msgid "Thank you for your order!"
 msgstr "Tack för din beställning!"
@@ -1170,9 +1175,6 @@ msgstr ""
 msgid "Total refundable amount"
 msgstr "Totalt återbetalningsbart belopp"
 
-msgid "incl. VAT"
-msgstr "inkl. MOMS"
-
 msgid ""
 "You are entitled to a refund and it has been registered. You will receive a "
 "separate notification when the return has been approved."

parking_permits/admin_resolvers.py

@@ -873,8 +873,6 @@ def resolve_update_resident_permit(
             )
             logger.info(f"Refund for lowered permit price created: {refund}")
             refunds.append(refund)
-        if refunds:
-            send_refund_email(RefundEmailType.CREATED, customer, refunds)
 
     bypass_traficom_validation = permit_info.get("bypass_traficom_validation", False)
 
@@ -1178,6 +1176,16 @@ def resolve_refunds(obj, info, page_input, order_by=None, search_params=None):
 def resolve_request_for_approval(obj, info, ids):
     qs = Refund.objects.filter(id__in=ids, status=RefundStatus.OPEN)
     qs.update(status=RefundStatus.REQUEST_FOR_APPROVAL)
+    # send emails to customers
+    refunds = Refund.objects.filter(
+        id__in=ids, status=RefundStatus.REQUEST_FOR_APPROVAL
+    ).prefetch_related("orders__customer")
+    for refund in refunds:
+        send_refund_email(
+            RefundEmailType.CREATED,
+            refund.orders.first().customer,
+            [refund],
+        )
     return qs.count()
 
 

parking_permits/cron.py

@@ -72,9 +72,10 @@ def automatic_expiration_of_permits():
 def automatic_expiration_remind_notification_of_permits():
     logger.info("Automatically sending remind notifications for permits started...")
     count = 0
-    now = tz.localdate(tz.now())
+    current_date = tz.localdate(tz.now())
     expiring_permits = ParkingPermit.objects.filter(
-        end_time__lt=now + relativedelta(weeks=1),
+        Q(end_time__date=current_date + relativedelta(weeks=1))
+        | Q(end_time__date=current_date + relativedelta(days=1)),
         status=ParkingPermitStatus.VALID,
         contract_type=ContractType.FIXED_PERIOD,
     )

parking_permits/customer_permit.py

@@ -134,7 +134,7 @@ def remove_temporary_vehicle(self, permit_id):
         prev_active_temp_vehicles = list(active_temp_vehicles)
         active_temp_vehicles.update(is_active=False)
         for temp_vehicle in prev_active_temp_vehicles:
-            ParkingPermitEventFactory.make_add_temporary_vehicle_event(
+            ParkingPermitEventFactory.make_remove_temporary_vehicle_event(
                 permit, temp_vehicle, created_by=self.customer.user
             )
         sync_with_parkkihubi(permit)

parking_permits/forms.py

@@ -7,7 +7,6 @@
 from django.db import models
 from django.db.models import OuterRef, Q, Subquery, Value
 from django.db.models.functions import Concat
-from django.utils import timezone
 
 from parking_permits.models import (
     Address,
@@ -137,8 +136,6 @@ def filter_queryset(self, qs):
         if not q:
             return self.get_empty_queryset()
 
-        now = timezone.now()
-
         fields = [
             "vehicle__registration_number",
             "temp_vehicles__vehicle__registration_number",
@@ -170,8 +167,6 @@ def filter_queryset(self, qs):
                 TemporaryVehicle.objects.filter(
                     parkingpermit__pk=OuterRef("pk"),
                     is_active=True,
-                    start_time__lte=now,
-                    end_time__gte=now,
                 ).values("vehicle__registration_number")[:1]
             )
         ).filter(query)

parking_permits/migrations/0071_temporaryvehicle_created_by.py

@@ -0,0 +1,28 @@
+# Generated by Django 5.1.8 on 2025-05-13 10:21
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("parking_permits", "0070_announcement_emails_handled"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="temporaryvehicle",
+            name="created_by",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="+",
+                to=settings.AUTH_USER_MODEL,
+                verbose_name="Created by",
+            ),
+        ),
+    ]

parking_permits/models/order.py

@@ -18,7 +18,6 @@
     SubscriptionCancelError,
     SubscriptionValidationError,
 )
-from ..services.mail import RefundEmailType, send_refund_email
 from ..utils import (
     calc_net_price,
     calc_vat_price,
@@ -675,7 +674,7 @@ def cancel(self, cancel_reason, cancel_from_talpa=True, iban=""):
             logger.info(f"Creating Refund for permit {str(permit.id)}")
             from ..resolver_utils import create_refund
 
-            refund = create_refund(
+            create_refund(
                 user=permit.customer.user,
                 permits=[permit],
                 orders=[order],
@@ -687,7 +686,6 @@ def cancel(self, cancel_reason, cancel_from_talpa=True, iban=""):
             # Mark the order item as refunded
             order_item.is_refunded = True
             order_item.save()
-            send_refund_email(RefundEmailType.CREATED, permit.customer, [refund])
             logger.info(f"Refund for permit {str(permit.id)} created successfully")
 
         # Try to cancel subscription from Talpa as well

parking_permits/models/parking_permit.py

@@ -291,12 +291,10 @@ def is_order_confirmed(self):
 
     @property
     def active_temporary_vehicle(self):
-        now = timezone.now()
+        """Get the active temporary vehicle for the permit"""
         return (
             self.temporary_vehicles.filter(
                 is_active=True,
-                start_time__lte=now,
-                end_time__gte=now,
             )
             .select_related("vehicle")
             .first()
@@ -908,11 +906,18 @@ def parse_temporary_vehicle_times(
                 _("Temporary vehicle start time has to be after permit start time")
             )
 
+        # prevent end time from being less than start time + 1 hour
         end_dt = max(
             timezone.localtime(isoparse(end_time)),
             start_dt + timezone.timedelta(hours=1),
         )
 
+        # prevent end time from being more than permit end time
+        end_dt = min(
+            end_dt,
+            self.end_time,
+        )
+
         return start_dt, end_dt
 
     def add_temporary_vehicle(
@@ -929,7 +934,7 @@ def add_temporary_vehicle(
         If `check_limit` is `True` and limit is exceeded, will raise a TemporaryVehicleValidationError.
 
         """
-        if check_limit and self.is_temporary_vehicle_limit_exceeded():
+        if check_limit and self.is_temporary_vehicle_limit_exceeded(user):
             raise TemporaryVehicleValidationError(
                 _(
                     "Can not have more than 2 temporary vehicles in 365 days from first one."
@@ -942,6 +947,8 @@ def add_temporary_vehicle(
             vehicle=vehicle,
             end_time=end_time,
             start_time=start_time,
+            created_by=user,
+            created_at=timezone.now(),
         )
 
         self.temp_vehicles.add(temp_vehicle)
@@ -952,18 +959,17 @@ def add_temporary_vehicle(
 
         return temp_vehicle
 
-    def is_temporary_vehicle_limit_exceeded(self) -> bool:
-        """Check limit of temporary vehicles. A user can only
-        have max 2 temp vehicles over 12 months."""
+    def is_temporary_vehicle_limit_exceeded(self, user) -> bool:
+        """Check limit of temporary vehicles.
+        A user can only create max 2 temp vehicles over 12 months."""
         return (
-            len(
-                self.temp_vehicles.filter(
-                    start_time__gte=get_end_time(timezone.now(), -12)
-                )
-                .order_by("-start_time")
-                .values("pk")[:2]
+            self.temp_vehicles.filter(
+                start_time__gte=get_end_time(timezone.now(), -12),
+                created_by=user,
             )
-            == 2
+            .order_by("-start_time")
+            .count()
+            >= 2
         )
 
     def get_unused_order_items(self):