Partner subdomain and Admin edits (#159)

backend/donations/models/main.py

@@ -69,6 +69,11 @@ def ngo_id_number_validator(value):
         raise ValidationError(error_message)
 
 
+class ActiveManager(models.Manager):
+    def get_queryset(self):
+        return super().get_queryset().filter(is_active=True)
+
+
 class Ngo(models.Model):
     # DEFAULT_NGO_LOGO = "https://storage.googleapis.com/redirectioneaza/logo_bw.png"
 
@@ -176,6 +181,9 @@ class Ngo(models.Model):
     date_created = models.DateTimeField(verbose_name=_("date created"), db_index=True, auto_now_add=timezone.now)
     date_updated = models.DateTimeField(verbose_name=_("date updated"), db_index=True, auto_now=timezone.now)
 
+    objects = models.Manager()
+    active = ActiveManager()
+
     class Meta:
         verbose_name = _("NGO")
         verbose_name_plural = _("NGOs")

backend/donations/views/my_account.py

@@ -7,6 +7,8 @@
 from django.urls import reverse, reverse_lazy
 from django.utils import timezone
 from django.utils.decorators import method_decorator
+from django.core.exceptions import PermissionDenied
+from django.http import Http404
 
 from .base import AccountHandler
 from ..models.main import Donor, Ngo
@@ -72,7 +74,11 @@ def get(self, request, *args, **kwargs):
         if user.is_superuser:
             return redirect(reverse("admin-ngos"))
 
+        if not user.is_authenticated or not user.ngo:
+            return redirect(reverse("contul-meu"))
+
         context = {
+            "title": "Date asociație",
             "user": user,
             "ngo": user.ngo if user.ngo else None,
             "counties": settings.FORM_COUNTIES,
@@ -83,11 +89,18 @@ def get(self, request, *args, **kwargs):
     @method_decorator(login_required(login_url=reverse_lazy("login")))
     def post(self, request, *args, **kwargs):
         post = request.POST
-
         user = request.user
 
+        if not user.is_authenticated:
+            raise PermissionDenied()
+
         if user.is_superuser:
-            return redirect(reverse("admin-ngos"))
+            ngo_url = post.get("old-ong-url", "")
+
+            try:
+                user.ngo = Ngo.objects.get(slug=ngo_url)
+            except Ngo.DoesNotExist:
+                raise Http404()
 
         ngo: Ngo = user.ngo
 
@@ -116,16 +129,72 @@ def post(self, request, *args, **kwargs):
 
         ngo.other_emails = ""
 
+        if request.user.is_superuser:
+            ngo.is_verified = post.get("ong-verificat") == "on"
+            ngo.is_active = post.get("ong-activ") == "on"
+
+        ## TODO: more admin changes
+
+        #     # if we want to change the url
+        #     if ong_url != ngo.key.id():
+
+        #         is_ngo_url_available = check_ngo_url(ong_url)
+        #         if is_ngo_url_available == False:
+        #             self.template_values["errors"] = url_taken
+        #             self.render()
+        #             return
+
+        #         new_key = Key(NgoEntity, ong_url)
+
+        #         # replace all the donors key
+        #         donors = Donor.query(Donor.ngo == ngo.key).fetch()
+        #         if donors:
+        #             for donor in donors:
+        #                 donor.ngo = new_key
+        #                 donor.put()
+
+        #         # replace the users key
+        #         ngos_user = User.query(Donor.ngo == ngo.key).get()
+        #         if ngos_user:
+        #             ngos_user.ngo = new_key
+        #             ngos_user.put()
+
+        #         # copy the old model
+        #         new_ngo = ngo
+        #         # delete the old model
+        #         ngo.key.delete()
+        #         # add a new key
+        #         new_ngo.key = new_key
+
+        #         ngo = new_ngo
+
+        #     if new_owner:
+        #         new_owner = User.query(User.email == new_owner).get()
+        #         if new_owner:
+        #             # delete the associtation between the old account and the NGO
+        #             old_user = User.query(User.ngo == ngo.key).get()
+        #             old_user.ngo = None
+        #             new_owner.ngo = ngo.key
+
+        #             old_user.put()
+        #             new_owner.put()
+        #         else:
+        #             self.template_values["errors"] = no_new_owner
+        #             self.render()
+        #             return
+
         ngo.save()
 
         if is_new_ngo:
             user.ngo = ngo
             user.save()
-
-        context = {
-            "user": user,
-            "ngo": user.ngo if user.ngo else None,
-            "counties": settings.FORM_COUNTIES,
-        }
-
-        return render(request, self.template_name, context)
+            if request.user.is_superuser:
+                return redirect(reverse("admin-ong", kwargs={"ngo_url": user.ngo.slug}))
+            else:
+                return redirect(reverse("contul-meu"))
+
+        else:
+            if request.user.is_superuser:
+                return redirect(reverse("admin-ong", kwargs={"ngo_url": user.ngo.slug}))
+            else:
+                return redirect(reverse("association"))

backend/donations/views/site.py

@@ -1,22 +1,44 @@
+from datetime import datetime
+
 from django.shortcuts import redirect, render
 from django.conf import settings
 from django.urls import reverse
+from django.utils import timezone
 
 from .base import BaseHandler
-from ..models.main import Ngo
+from ..models.main import Ngo, Donor
 
 
 class HomePage(BaseHandler):
     template_name = "index.html"
 
     def get(self, request, *args, **kwargs):
+        now = timezone.now()
+
         # TODO: the search isn't working
         context = {
+            "title": "redirectioneaza.ro",
             "limit": settings.DONATIONS_LIMIT,
             "DEFAULT_NGO_LOGO": settings.DEFAULT_NGO_LOGO,
-            "ngos": Ngo.objects.filter(is_active=True).order_by("name"),
+            "current_year": now.year,
         }
 
+        if request.partner:
+            context.update(
+                {
+                    "company_name": request.partner.name,
+                    "custom_header": request.partner.has_custom_header,
+                    "custom_note": request.partner.has_custom_note,
+                    "ngos": request.partner.ngos.filter(is_active=True).order_by("name"),
+                }
+            )
+        else:
+            context["stats"] = {
+                "ngos": Ngo.objects.count(),
+                "forms": Donor.objects.filter(date_created__gte=datetime(now.year, 1, 1)).count(),
+            }
+            context["ngos"] = Ngo.objects.filter(is_active=True).order_by("name")
+
         return render(request, self.template_name, context)
 
 

backend/partners/admin.py

@@ -5,4 +5,9 @@
 
 @admin.register(Partner)
 class PartnerAdmin(admin.ModelAdmin):
-    pass
+    list_display = (
+        "subdomain",
+        "name",
+        "is_active",
+    )
+    list_filter = ("is_active", "date_updated")

backend/partners/context_processors.py

@@ -0,0 +1,7 @@
+from django.http import HttpRequest
+
+
+def custom_subdomain(request: HttpRequest):
+    return {
+        "custom_subdomain": request.partner.subdomain if request.partner else "",
+    }

backend/partners/middleware.py

@@ -56,7 +56,7 @@ def __call__(self, request):
             partner = None
         else:
             try:
-                partner = Partner.objects.get(subdomain=subdomain)
+                partner = Partner.active.get(subdomain=subdomain)
             except Partner.DoesNotExist:
                 partner = None
 

backend/partners/migrations/0002_partner_has_custom_header_partner_has_custom_note.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.9 on 2024-01-31 20:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("partners", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="partner",
+            name="has_custom_header",
+            field=models.BooleanField(default=False, verbose_name="has custom header"),
+        ),
+        migrations.AddField(
+            model_name="partner",
+            name="has_custom_note",
+            field=models.BooleanField(default=False, verbose_name="has custom note"),
+        ),
+    ]

backend/partners/migrations/0003_partner_date_created_partner_date_updated.py

@@ -0,0 +1,27 @@
+# Generated by Django 4.2.9 on 2024-01-31 20:49
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("partners", "0002_partner_has_custom_header_partner_has_custom_note"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="partner",
+            name="date_created",
+            field=models.DateTimeField(
+                auto_now_add=True, default=django.utils.timezone.now, verbose_name="date created"
+            ),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="partner",
+            name="date_updated",
+            field=models.DateTimeField(auto_now=True, verbose_name="date updated"),
+        ),
+    ]

backend/partners/models.py

@@ -1,15 +1,23 @@
 from django.db import models
 from django.db.models.functions import Lower
 from django.utils.translation import gettext_lazy as _
+from django.utils import timezone
 
-from donations.models.main import Ngo
+from donations.models.main import Ngo, ActiveManager
 
 
 class Partner(models.Model):
     name = models.CharField(verbose_name=_("name"), max_length=100, blank=True, null=False, db_index=True)
     subdomain = models.CharField(verbose_name=_("subdomain"), max_length=100, blank=False, null=False, unique=True)
     is_active = models.BooleanField(verbose_name=_("is active"), db_index=True, default=True)
+    has_custom_header = models.BooleanField(verbose_name=_("has custom header"), default=False)
+    has_custom_note = models.BooleanField(verbose_name=_("has custom note"), default=False)
     ngos = models.ManyToManyField(verbose_name=_("NGOs"), to=Ngo, blank=True)
+    date_created = models.DateTimeField(verbose_name=_("date created"), auto_now_add=timezone.now, editable=False)
+    date_updated = models.DateTimeField(verbose_name=_("date updated"), auto_now=timezone.now, editable=False)
+
+    objects = models.Manager()
+    active = ActiveManager()
 
     class Meta:
         verbose_name = _("Partner")

backend/redirectioneaza/settings.py

@@ -197,6 +197,8 @@
                 "django.template.context_processors.request",
                 "django.contrib.auth.context_processors.auth",
                 "django.contrib.messages.context_processors.messages",
+                "partners.context_processors.custom_subdomain",
+                "users.context_processors.is_admin",
             ],
         },
     },
@@ -207,6 +209,10 @@
         "APP_DIRS": False,
         "OPTIONS": {
             "environment": "redirectioneaza.jinja2.environment",
+            "context_processors": [
+                "partners.context_processors.custom_subdomain",
+                "users.context_processors.is_admin",
+            ],
         },
     },
 ]

backend/templates/v1/components/ngo-details-form.html

@@ -115,7 +115,7 @@
             <div class="form-group">
                 <div class="col-xs-12">
                     <label for="ong-activ" class="col-xs-3">Activ:</label>
-                    <input type="checkbox" id="ong-activ" name="ong-activ" {{ "checked" if ngo.active }} />
+                    <input type="checkbox" id="ong-activ" name="ong-activ" {{ "checked" if ngo.is_active }} />
                 </div>
                 <div class="col-xs-12">
                     <label for="ong-verificat" class="col-xs-3">Verificat:</label>
@@ -131,10 +131,10 @@
                                 <p>Cont asociat:</p>
                             </div>
                             <div class="panel-body">
-                                <p>Nume: {{ "{0} {1}".decode("utf-8").format(owner.first_name, owner.last_name) }}</p>
+                                <p>Nume: {{ "{0} {1}".format(owner.first_name, owner.last_name) }}</p>
                                 <p>Email: {{ owner.email }}</p>
                                 <p>Verificat: {{ owner.is_verified }}</p>
-                                <p>Creat la: {{ owner.created.strftime("%d/%m/%Y") }}</p>
+                                <p>Creat la: {{ owner.date_joined.strftime("%d/%m/%Y") }}</p>
                             </div>
                         </div>
                     </div>

backend/users/context_processors.py

@@ -0,0 +1,7 @@
+from django.http import HttpRequest
+
+
+def is_admin(request: HttpRequest):
+    return {
+        "is_admin": request.user.is_superuser,
+    }