From d39ff91a744873da79c48fb4f5e49b64e6ad27f7 Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias.brunner@vshn.ch>
Date: Fri, 23 May 2025 08:57:20 +0200
Subject: [PATCH] small admin improvements

---
 hub/services/models.py | 22 ++++++++++++----------
 hub/settings.py        |  5 ++++-
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/hub/services/models.py b/hub/services/models.py
index d7b931e..0905f4f 100644
--- a/hub/services/models.py
+++ b/hub/services/models.py
@@ -502,6 +502,7 @@ class VSHNAppCatBaseFee(models.Model):
     )
 
     class Meta:
+        verbose_name = "Service Base Fee"
         unique_together = ("vshn_appcat_price_config", "currency")
         ordering = ["currency"]
 
@@ -592,21 +593,11 @@ class VSHNAppCatPrice(models.Model):
         choices=VariableUnit.choices,
         default=VariableUnit.RAM,
     )
-    ha_replica_min = models.IntegerField(
-        default=1, help_text="Minimum of replicas for HA"
-    )
-    ha_replica_max = models.IntegerField(
-        default=1, help_text="Maximum supported replicas"
-    )
     term = models.CharField(
         max_length=3,
         default=Term.MTH,
         choices=Term.choices,
     )
-
-    valid_from = models.DateTimeField(blank=True, null=True)
-    valid_to = models.DateTimeField(blank=True, null=True)
-
     discount_model = models.ForeignKey(
         ProgressiveDiscountModel,
         on_delete=models.SET_NULL,
@@ -615,6 +606,16 @@ class VSHNAppCatPrice(models.Model):
         related_name="price_configs",
     )
 
+    ha_replica_min = models.IntegerField(
+        default=1, help_text="Minimum of replicas for HA"
+    )
+    ha_replica_max = models.IntegerField(
+        default=1, help_text="Maximum supported replicas"
+    )
+
+    valid_from = models.DateTimeField(blank=True, null=True)
+    valid_to = models.DateTimeField(blank=True, null=True)
+
     class Meta:
         verbose_name = "AppCat Price"
 
@@ -678,6 +679,7 @@ class VSHNAppCatUnitRate(models.Model):
     )
 
     class Meta:
+        verbose_name = "Service Unit Rate"
         unique_together = ("vshn_appcat_price_config", "currency", "service_level")
         ordering = ["currency", "service_level"]
 
diff --git a/hub/settings.py b/hub/settings.py
index ef46a24..dd5064a 100644
--- a/hub/settings.py
+++ b/hub/settings.py
@@ -248,7 +248,10 @@ JAZZMIN_SETTINGS = {
     "navigation_expanded": True,
     "hide_apps": ["broker"],
     "order_with_respect_to": ["services", "auth"],
-    "changeform_format_overrides": {"services.ProgressiveDiscountModel": "single"},
+    "changeform_format_overrides": {
+        "services.ProgressiveDiscountModel": "single",
+        "services.VSHNAppCatPrice": "single",
+    },
     "related_modal_active": True,
 }