update the partner middleware and pages

Author: tudoramariei

backend/donations/views/site.py

@@ -72,8 +72,8 @@ def _partner_response(self, context: Dict, partner: Partner):
         context.update(
             {
                 "company_name": partner.name,
-                "custom_header": partner.has_custom_header,
-                "custom_note": partner.has_custom_note,
+                "has_custom_header": partner.has_custom_header,
+                "has_custom_note": partner.has_custom_note,
                 "ngos": partner_ngos,
             }
         )

backend/partners/middleware.py

@@ -26,7 +26,7 @@ def extract_subdomain(host: str, apex: str) -> str:
         # Drop the port number (if present)
         host = host.split(":", maxsplit=1)[0]
 
-        # Drop the www. prefix (if present)
+        # Drop the `www.` prefix (if present)
         if host[:4] == "www.":
             host = host[4:]
 
@@ -40,21 +40,17 @@ def extract_subdomain(host: str, apex: str) -> str:
 
         return subdomain
 
-    def __init__(self, get_response):
-        self.get_response = get_response
-
-    def __call__(self, request):
-        if request.path == "/health/":
-            logger.debug("Healthcheck: Skipping PartnerDomainMiddleware")
-            return self.get_response(request)
+    def _get_partner_from_subdomain(self, request):
+        if settings.FORCE_PARTNER:
+            return Partner.active.first()
 
-        logger.debug("Request host %s", request.get_host())
         try:
             subdomain = PartnerDomainMiddleware.extract_subdomain(request.get_host(), settings.APEX_DOMAIN)
         except InvalidSubdomain:
             raise Http404(f"Invalid APEX_DOMAIN: {settings.APEX_DOMAIN}")
 
         logger.debug("Subdomain %s", subdomain or "None")
+
         if not subdomain:
             partner = None
         else:
@@ -63,6 +59,19 @@ def __call__(self, request):
             except Partner.DoesNotExist:
                 partner = None
 
+        return partner
+
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        if request.path == "/health/":
+            logger.debug("Healthcheck: Skipping PartnerDomainMiddleware")
+            return self.get_response(request)
+
+        logger.debug("Request host %s", request.get_host())
+        partner = self._get_partner_from_subdomain(request)
+
         request.partner = partner
         logger.debug("Request partner %s", request.partner or "None")
 

backend/redirectioneaza/settings/app_configs.py

@@ -7,6 +7,7 @@
 from django.utils.translation import gettext_lazy as _
 from localflavor.ro.ro_counties import COUNTIES_CHOICES
 
+from .base import DEBUG
 from .environment import env
 
 # Global parameters
@@ -131,3 +132,7 @@
 if len(ENCRYPT_KEY) != 32 or ENCRYPT_KEY == "%INVALID%":
     raise Exception("ENCRYPT_KEY must be exactly 32 characters long")
 FERNET_OBJECT = Fernet(urlsafe_b64encode(ENCRYPT_KEY.encode("utf-8")))
+
+FORCE_PARTNER = False
+if DEBUG:
+    FORCE_PARTNER = env.bool("FORCE_PARTNER", False)

backend/redirectioneaza/settings/environment.py

@@ -21,6 +21,7 @@
     TIMEDELTA_DONATIONS_LIMIT_DOWNLOAD_DAYS=(int, 31),
     IS_CONTAINERIZED=(bool, False),
     RECAPTCHA_ENABLED=(bool, True),
+    FORCE_PARTNER=(bool, False),
     # proxy headers
     USE_PROXY_FORWARDED_HOST=(bool, False),
     PROXY_SSL_HEADER=(str, "HTTP_CLOUDFRONT_FORWARDED_PROTO"),

backend/templates/v2/public/components/home/hero.html

@@ -7,22 +7,32 @@
 
         <h1 class="block mt-1 text-4xl font-extrabold tracking-tight sm:text-5xl xl:text-6xl">
 
-          <span class="block text-gray-900">
-            {% if custom_subdomain %}
-              {% trans "Redirect 3.5% of your tax to one of the NGOs" %}
+          {% if custom_subdomain %}
+            {% if has_custom_note %}
+              {% trans "Redirect 3.5% of your income tax" as heading_main %}
+              {% trans "to a cause of your choice" as heading_secondary %}
             {% else %}
-              {% trans "You decide what happens" %}
+              {% trans "Redirect 3.5% of your tax to one of the NGOs" as heading_main %}
+              {% blocktrans trimmed asvar heading_secondary %}
+                supported by {{ company_name }}
+              {% endblocktrans %}
             {% endif %}
-          </span>
+          {% else %}
+            {% trans "You decide what happens" as heading_main %}
+            {% trans "with 3.5% of the income tax" as heading_secondary %}
+          {% endif %}
 
-          <span class="block text-amber-300">
-            {% if custom_subdomain %}
-              {% trans "supported by" %}
-              {{ company_name }}
-            {% else %}
-              {% trans "with 3.5% of the income tax" %}
-            {% endif %}
-          </span>
+          {% if heading_main %}
+            <div class="block text-gray-900">
+              {{ heading_main }}
+            </div>
+          {% endif %}
+
+          {% if heading_secondary %}
+            <div class="block text-amber-300">
+              {{ heading_secondary }}
+            </div>
+          {% endif %}
 
         </h1>
 
@@ -36,6 +46,16 @@ <h1 class="block mt-1 text-4xl font-extrabold tracking-tight sm:text-5xl xl:text
           <strong>{{ limit.day }} {{ month_limit }}</strong>.
         </p>
 
+        {% if has_custom_note %}
+          <p class="mt-3 text-base text-gray-500 sm:mt-5">
+            {% blocktrans trimmed %}
+              If your favorite NGO is not on this page,
+              check the full list of organizations on
+              <a class="underline text-cyan-700" href="https://redirectioneaza.ro">redirectioneaza.ro</a>.
+            {% endblocktrans %}
+          </p>
+        {% endif %}
+
         {% if not custom_subdomain %}
           {% include "public/components/home/hero-search.html" %}