Merge branch 'main' into copilot/add-crm-view-income-tracking

Author: nijel

weblate_web/crm/templates/crm/index.html

@@ -178,6 +178,19 @@
                  aria-describedby="row-invoices">{% translate "View" %}</a>
             </td>
           </tr>
+          <tr>
+            <th scope="row" id="row-invoices">
+              <a href="{% url 'crm:service-list' kind="premium" %}">Premium support services</a>
+            </th>
+
+            <td></td>
+
+            <td>
+              <a href="{% url 'crm:service-list' kind="premium" %}"
+                 class="viewlink"
+                 aria-describedby="row-invoices">{% translate "View" %}</a>
+            </td>
+          </tr>
         </table>
       {% endif %}
       {% if perms.invoices.view_income %}

weblate_web/crm/tests.py

@@ -1,4 +1,4 @@
-from datetime import timedelta
+from datetime import date, timedelta
 from decimal import Decimal
 
 import responses
@@ -8,6 +8,7 @@
 from django.utils import timezone
 
 from weblate_web.invoices.models import (
+    Currency,
     Discount,
     Invoice,
     InvoiceCategory,
@@ -229,8 +230,8 @@ def create_test_invoice(self, year, month, category, amount):
             kind=InvoiceKind.INVOICE,
             category=category,
             customer=self.customer,
-            issue_date=timezone.datetime(year, month, 15).date(),
-            currency=0,  # EUR
+            issue_date=date(year, month, 15),
+            currency=Currency.EUR,
         )
         invoice.invoiceitem_set.create(
             description="Test item", quantity=1, unit_price=amount
@@ -305,8 +306,8 @@ def test_income_filters_only_invoices(self):
             kind=InvoiceKind.INVOICE,
             category=InvoiceCategory.HOSTING,
             customer=self.customer,
-            issue_date=timezone.datetime(current_year, 1, 15).date(),
-            currency=0,
+            issue_date=date(current_year, 1, 15),
+            currency=Currency.EUR,
         )
         invoice.invoiceitem_set.create(
             description="Invoice item", quantity=1, unit_price=Decimal(1000)
@@ -317,8 +318,8 @@ def test_income_filters_only_invoices(self):
             kind=InvoiceKind.QUOTE,
             category=InvoiceCategory.HOSTING,
             customer=self.customer,
-            issue_date=timezone.datetime(current_year, 1, 15).date(),
-            currency=0,
+            issue_date=date(current_year, 1, 15),
+            currency=Currency.EUR,
         )
         quote.invoiceitem_set.create(
             description="Quote item", quantity=1, unit_price=Decimal(5000)

weblate_web/crm/views.py

@@ -27,6 +27,7 @@
 
 if TYPE_CHECKING:
     from collections.abc import Callable
+    from uuid import UUID
 
     from django.http import HttpRequest
 
@@ -76,6 +77,8 @@ def get_title(self) -> str:
                 return "Extended support services"
             case "dedicated":
                 return "Dedicated hosting services"
+            case "premium":
+                return "Premium support services"
         raise ValueError(self.kwargs["kind"])
 
     def get_context_data(self, **kwargs):
@@ -109,7 +112,15 @@ def get_queryset(self):
                 ).distinct()
             case "dedicated":
                 return qs.filter(
-                    subscription__package__category=PackageCategory.PACKAGE_DEDICATED
+                    subscription__package__category=PackageCategory.PACKAGE_DEDICATED,
+                    subscription__expires__gte=timezone.now(),
+                    subscription__enabled=True,
+                ).distinct()
+            case "premium":
+                return qs.filter(
+                    subscription__package__name="premium",
+                    subscription__expires__gte=timezone.now(),
+                    subscription__enabled=True,
                 ).distinct()
         raise ValueError(self.kwargs["kind"])
 
@@ -575,7 +586,7 @@ def filter_by_month(inv: Invoice, idx: int) -> bool:
 
     def _get_invoices_and_totals(
         self, year: int, month: int | None = None
-    ) -> tuple[list[Invoice], dict[int, Decimal]]:
+    ) -> tuple[list[Invoice], dict[UUID, Decimal]]:
         """Fetch invoices and pre-calculate totals (shared helper)."""
         query = Invoice.objects.filter(kind=InvoiceKind.INVOICE, issue_date__year=year)
         if month:

weblate_web/templates/support.html

@@ -93,6 +93,7 @@ <h2>{% translate "Extended self-hosted support" %}</h2>
               <li>{% translate "Issues in your environment fixed immediately." %}</li>
               <li>{% translate "Priority e-mail support." %}</li>
               <li>{% translate "Only available with the installation package" %}</li>
+              <li>{% translate "Be prepared with security notifications prior to the fix publication." %}</li>
             </ul>
             <a href="{% url 'subscription-new' %}?plan=extended"
                class="format-item bottom-left">{{ extended_support_package.price|price_format }}<span>{% translate "annually" %}</span></a>
@@ -110,6 +111,7 @@ <h2>{% translate "Premium self-hosted support" %}</h2>
               <li>{% translate "Issues in your environment fixed immediately." %}</li>
               <li>{% translate "Priority e-mail support." %}</li>
               <li>{% translate "Next business day support response guaranteed." %}</li>
+              <li>{% translate "Be prepared with security notifications prior to the fix publication." %}</li>
             </ul>
             <a href="{% url 'subscription-new' %}?plan=premium"
                class="format-item bottom-left">{{ premium_support_package.price|price_format }}<span>{% translate "annually" %}</span></a>