controller

admin_frontend/templates/admin_frontend/base.html

@@ -102,6 +102,27 @@
                       </ul>
                   </div>
               </div>
+
+              <div x-data="{ open: {% if '/webadmin/frontend/' in request.path %}true{% else %}false{% endif %} }">
+                  <div @click="open = !open" class="flex items-center justify-between rounded px-3 py-2 hover:bg-gray-50 cursor-pointer">
+                      <span class="truncate">Frontend</span>
+                      <svg :class="{'rotate-180': open}" class="w-4 h-4 transform transition-transform" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
+                      </svg>
+                  </div>
+                  <div x-show="open" x-cloak class="pl-4">
+                      {% app_menu 'public_frontend_admin' as pf_menu_items %}
+                      <ul class="space-y-1">
+                        {% for it in pf_menu_items %}
+                          <li>
+                            <a href="{{ it.url }}" class="flex items-center justify-between rounded px-3 py-2 hover:bg-gray-50 {% if request.path == it.url %}bg-blue-50 text-blue-700{% else %}text-gray-700{% endif %}">
+                              <span class="truncate">{{ it.label }}</span>
+                            </a>
+                          </li>
+                        {% endfor %}
+                      </ul>
+                  </div>
+              </div>
               <div x-data="{ open: {% if '/webadmin/orgs/' in request.path %}true{% else %}false{% endif %} }">
                   <div @click="open = !open" class="flex items-center justify-between rounded px-3 py-2 hover:bg-gray-50 cursor-pointer">
                       <span class="truncate">Organization</span>

admin_frontend/templates/admin_frontend/lead_detail.html

@@ -0,0 +1,103 @@
+{% extends 'admin_frontend/base.html' %}
+{% block title %}Lead #{{ lead.id }}{% endblock %}
+{% block content %}
+  <div class="flex items-center justify-between mb-4">
+    <h1 class="text-2xl font-semibold">Lead Details</h1>
+    <a href="{% url 'public_frontend_admin:leads_list' %}" class="btn-outline">Back</a>
+  </div>
+
+  <div class="bg-white rounded shadow p-6 space-y-4">
+    <div>
+      <div class="text-sm text-gray-500">Created</div>
+      <div class="font-medium">{{ lead.created_at }}</div>
+    </div>
+    <div>
+      <div class="text-sm text-gray-500">Organization</div>
+      <div class="font-medium">{{ lead.organization.name }} <span class="text-gray-400">({{ lead.organization.code }})</span></div>
+    </div>
+    <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+      <div>
+        <div class="text-sm text-gray-500">Name</div>
+        <div class="font-medium">{{ lead.name }}</div>
+      </div>
+      <div>
+        <div class="text-sm text-gray-500">Source</div>
+        <div class="font-medium">{{ lead.get_source_display|default:'-' }}</div>
+      </div>
+      <div>
+        <div class="text-sm text-gray-500">Email</div>
+        <div class="font-medium">{{ lead.email|default:'-' }}</div>
+      </div>
+      <div>
+        <div class="text-sm text-gray-500">Phone</div>
+        <div class="font-medium">{{ lead.phone|default:'-' }}</div>
+      </div>
+    </div>
+    {% if lead.subject %}
+    <div>
+      <div class="text-sm text-gray-500">Subject</div>
+      <div class="font-medium">{{ lead.subject }}</div>
+    </div>
+    {% endif %}
+    {% if lead.message %}
+    <div>
+      <div class="text-sm text-gray-500">Message</div>
+      <div class="whitespace-pre-line">{{ lead.message }}</div>
+    </div>
+    {% endif %}
+  </div>
+
+  <div class="bg-white rounded shadow p-6 space-y-4 mt-6">
+    <h2 class="text-xl font-semibold">Uploaded Files</h2>
+    {% if documents %}
+      <ul class="divide-y divide-gray-100">
+        {% for d in documents %}
+          <li class="py-3 flex items-center justify-between">
+            <div>
+              <div class="font-medium">
+                <a href="{{ d.file.url }}" target="_blank" class="text-blue-700 hover:underline">
+                  {{ d.file.name|cut:"media/"|cut:"/" }}
+                </a>
+              </div>
+              <div class="text-sm text-gray-500">{{ d.kind|default:'file' }} • {{ d.created_at }}</div>
+            </div>
+            <div>
+              <a href="{{ d.file.url }}" target="_blank" class="btn-outline">View</a>
+            </div>
+          </li>
+        {% endfor %}
+      </ul>
+    {% else %}
+      <p class="text-gray-500">No files uploaded for this lead.</p>
+    {% endif %}
+  </div>
+
+  <div class="bg-white rounded shadow p-6 space-y-4 mt-6">
+    <h2 class="text-xl font-semibold">Create Pickup</h2>
+    <form method="post" action="{% url 'public_frontend_admin:lead_convert_to_pickup' lead.pk %}">
+      {% csrf_token %}
+      <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+        <div class="md:col-span-2">
+          <label class="block text-sm text-gray-600 mb-1">Address</label>
+          <textarea name="address" rows="3" class="w-full border rounded px-3 py-2" placeholder="Pickup address" required>{{ suggested.address }}</textarea>
+        </div>
+        <div>
+          <label class="block text-sm text-gray-600 mb-1">Scheduled At (optional)</label>
+          <input type="datetime-local" name="scheduled_at" class="w-full border rounded px-3 py-2" value="">
+        </div>
+        <div>
+          <label class="block text-sm text-gray-600 mb-1">Assign Driver (optional)</label>
+          <select name="driver" class="w-full border rounded px-3 py-2">
+            <option value="">-- Select driver --</option>
+            {% for u in drivers %}
+              <option value="{{ u.id }}">{{ u.username }}</option>
+            {% endfor %}
+          </select>
+        </div>
+      </div>
+      <div class="mt-4 flex justify-end">
+        <button class="px-4 py-2 bg-blue-600 text-white rounded">Create Pickup</button>
+      </div>
+    </form>
+  </div>
+{% endblock %}

admin_frontend/templates/admin_frontend/leads_list.html

@@ -0,0 +1,56 @@
+{% extends 'admin_frontend/base.html' %}
+{% block title %}Leads{% endblock %}
+{% block content %}
+<div class="flex items-center justify-between mb-4">
+  <h1 class="text-2xl font-semibold">Leads</h1>
+</div>
+
+<div class="bg-white rounded shadow p-4 mb-4">
+  {% load crispy_forms_tags %}
+  <form method="get" class="space-y-3 flex gap-2 items-end flex-wrap">
+    {{ filter.form|crispy }}
+    <div class="flex items-center gap-2">
+      <button class="px-3 py-2 bg-blue-600 text-white rounded">Filter</button>
+      <a href="{% url 'public_frontend_admin:leads_list' %}" class="btn-outline">Reset</a>
+    </div>
+  </form>
+  {% if filter.qs.count != page_obj.paginator.count %}
+    <p class="text-sm text-gray-500 mt-2">Filtered results: {{ page_obj.paginator.count }} items</p>
+  {% endif %}
+  </div>
+
+<div class="bg-white rounded shadow overflow-hidden">
+  <table class="min-w-full divide-y divide-gray-200">
+    <thead class="bg-gray-50">
+      <tr>
+        <th class="px-4 py-2 text-left text-xs font-medium text-gray-500">Created</th>
+        <th class="px-4 py-2 text-left text-xs font-medium text-gray-500">Organization</th>
+        <th class="px-4 py-2 text-left text-xs font-medium text-gray-500">Name</th>
+        <th class="px-4 py-2 text-left text-xs font-medium text-gray-500">Contact</th>
+        <th class="px-4 py-2 text-left text-xs font-medium text-gray-500">Source</th>
+        <th class="px-4 py-2"></th>
+      </tr>
+    </thead>
+    <tbody class="divide-y divide-gray-200">
+      {% for l in leads %}
+      <tr>
+        <td class="px-4 py-2 text-gray-500 whitespace-nowrap">{{ l.created_at }}</td>
+        <td class="px-4 py-2">{{ l.organization.name }} <span class="text-gray-400">({{ l.organization.code }})</span></td>
+        <td class="px-4 py-2 font-medium">{{ l.name }}</td>
+        <td class="px-4 py-2">
+          {% if l.email %}<div class="text-sm">{{ l.email }}</div>{% endif %}
+          {% if l.phone %}<div class="text-sm">{{ l.phone }}</div>{% endif %}
+        </td>
+        <td class="px-4 py-2">{{ l.get_source_display|default:'-' }}</td>
+        <td class="px-4 py-2 text-right">
+          <a class="btn-outline" href="{% url 'public_frontend_admin:lead_detail' l.pk %}">View</a>
+        </td>
+      </tr>
+      {% empty %}
+      <tr><td class="px-4 py-4 text-center text-gray-500" colspan="6">No leads found.</td></tr>
+      {% endfor %}
+    </tbody>
+  </table>
+  {% include 'admin_frontend/_pagination.html' %}
+  </div>
+{% endblock %}

admin_frontend/urls.py

@@ -21,6 +21,7 @@ urlpatterns = [
     path("introduction-requests/<int:pk>/edit/", views.intro_request_edit, name="intro_request_edit"),
     path("introduction-requests/<int:pk>/delete/", views.intro_request_delete, name="intro_request_delete"),
 
+    # Leads (from public_frontend)
     path("leaderboard/", views.leaderboard, name="leaderboard"),
     path("profiles/<int:pk>/toggle-verify/", views.profile_toggle_verify, name="profile_toggle_verify"),
     path("introduction-requests/<int:pk>/accept/", views.intro_request_accept, name="intro_request_accept"),

admin_frontend/views.py

@@ -390,3 +390,6 @@ def intro_request_delete(request, pk: int):
 
 
 ## Recycle Core admin UI moved to recycle_core app
+
+
+## Leads UI moved to public_frontend/views_admin.py

ecoloop/settings.py

@@ -73,6 +73,7 @@ INSTALLED_APPS = [
     'allauth.socialaccount.providers.google',
     'allauth.socialaccount.providers.facebook',
     'allauth.socialaccount.providers.line',
+    'widget_tweaks',
     'orgs',
     'public_frontend',
     'theme',
@@ -198,7 +199,8 @@ AUTH_PASSWORD_VALIDATORS = [
 
 LANGUAGE_CODE = 'en-us'
 
-TIME_ZONE = 'UTC'
+# Set application timezone to Bangkok (Asia/Bangkok)
+TIME_ZONE = 'Asia/Bangkok'
 
 USE_I18N = True
 

ecoloop/urls.py

@@ -30,6 +30,7 @@ urlpatterns = [
     path('accounts/', include('allauth.urls')),
     path('webadmin/', include('admin_frontend.urls')),
     path('webadmin/orgs/', include('orgs.urls_admin')),
+    path('webadmin/frontend/', include('public_frontend.urls_admin')),
     path('webadmin/settings/', include('settings.urls')),
     path('webadmin/cms/', include('cms.urls')),
     path('webadmin/recycle/', include('recycle_core.urls')),

public_frontend/forms.py

@@ -3,9 +3,28 @@ from __future__ import annotations
 from django import forms
 
 
+class MultiFileInput(forms.ClearableFileInput):
+    allow_multiple_selected = True
+
+
+class MultiFileField(forms.Field):
+    widget = MultiFileInput
+
+    def __init__(self, *args, **kwargs):
+        kwargs.setdefault("required", False)
+        super().__init__(*args, **kwargs)
+
+    def to_python(self, data):
+        # Accept a list of UploadedFile or an empty list/None
+        return data
+
+    def validate(self, value):
+        # Only enforce presence if required=True
+        if self.required and not value:
+            raise forms.ValidationError("This field is required.")
+
+
 class PickupRequestForm(forms.Form):
-    class MultiFileInput(forms.ClearableFileInput):
-        allow_multiple_selected = True
 
     name = forms.CharField(max_length=255)
     email = forms.EmailField(required=False)
@@ -13,7 +32,7 @@ class PickupRequestForm(forms.Form):
     address = forms.CharField(widget=forms.Textarea)
     preferred_at = forms.DateTimeField(required=False, widget=forms.DateTimeInput(attrs={"type": "datetime-local"}))
     materials = forms.CharField(label="Materials/Notes", widget=forms.Textarea, required=False)
-    photos = forms.FileField(required=False, widget=MultiFileInput, help_text="Optional: upload photos of scrap")
+    photos = MultiFileField(widget=MultiFileInput, help_text="Optional: upload photos of scrap")
 
 
 class ContactForm(forms.Form):

public_frontend/migrations/0002_alter_lead_source.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.24 on 2025-09-23 09:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('public_frontend', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='lead',
+            name='source',
+            field=models.CharField(blank=True, choices=[('contact', 'Contact'), ('pickup_request', 'Pickup Request'), ('listing_request', 'Listing Request'), ('other', 'Other')], max_length=64),
+        ),
+    ]

public_frontend/models.py

@@ -5,15 +5,19 @@ from orgs.models import Organization
 
 
 class Lead(models.Model):
+    class LeadSource(models.TextChoices):
+        CONTACT = "contact", "Contact"
+        PICKUP_REQUEST = "pickup_request", "Pickup Request"
+        LISTING_REQUEST = "listing_request", "Listing Request"
+        OTHER = "other", "Other"
     organization = models.ForeignKey(Organization, on_delete=models.CASCADE, related_name="leads")
     name = models.CharField(max_length=255)
     email = models.EmailField(blank=True)
     phone = models.CharField(max_length=64, blank=True)
     subject = models.CharField(max_length=255, blank=True)
     message = models.TextField(blank=True)
-    source = models.CharField(max_length=64, blank=True)
+    source = models.CharField(max_length=64, blank=True, choices=LeadSource.choices)
     created_at = models.DateTimeField(auto_now_add=True)
 
     def __str__(self) -> str:  # pragma: no cover
         return f"Lead {self.name} ({self.organization.code})"
-

public_frontend/templates/public_frontend/base.html

@@ -1,4 +1,4 @@
-{% load tailwind_tags %}
+{% load tailwind_tags static %}
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -6,6 +6,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <title>{% if current_site %}{{ current_site.name }}{% else %}Ecoloop{% endif %} — {% block title %}{% endblock %}</title>
   {% tailwind_css %}
+  <script defer src="{% static 'alpinejs/dist/cdn.min.js' %}"></script>
 </head>
 <body class="bg-gray-50 text-gray-900">
   <header class="bg-white shadow">
@@ -21,6 +22,15 @@
     </div>
   </header>
   <main class="mx-auto max-w-7xl p-4 sm:p-6 lg:p-8 min-h-[80vh]">
+    {% if messages %}
+      <div id="messages" class="max-w-3xl mx-auto mb-4 space-y-2">
+        {% for message in messages %}
+          <div class="rounded border px-4 py-3 shadow {% if 'success' in message.tags %}bg-emerald-50 border-emerald-200 text-emerald-800{% elif 'error' in message.tags %}bg-rose-50 border-rose-200 text-rose-800{% elif 'warning' in message.tags %}bg-amber-50 border-amber-200 text-amber-900{% else %}bg-sky-50 border-sky-200 text-sky-900{% endif %}">
+            {{ message }}
+          </div>
+        {% endfor %}
+      </div>
+    {% endif %}
     {% block content %}{% endblock %}
   </main>
   <footer class="bg-white border-t">

public_frontend/templates/public_frontend/home.html

@@ -9,7 +9,7 @@
     <h1 class="text-3xl md:text-4xl font-bold mb-2">Streamline Your Factory's Recycling</h1>
     <p class="text-gray-600 max-w-2xl mx-auto mb-6">We partner with businesses like yours to manage scrap materials efficiently. Browse listings, request a pickup, and turn your waste into a resource.</p>
     <div class="flex gap-3 justify-center">
-      <a href="#pickup-request" class="btn-primary">Request a Pickup</a>
+      <a href="{% url 'public_frontend:pickup_request' %}" class="btn-primary">Request a Pickup</a>
       <a href="#listings" class="btn-outline">Browse Listings</a>
     </div>
   </section>
@@ -73,42 +73,7 @@
     </div>
   </section>
 
-  {# Pickup Request Section #}
-  <section id="pickup-request">
-    <h2 class="text-2xl font-semibold mb-3">Request a Pickup</h2>
-    <form method="post" enctype="multipart/form-data" action="{% url 'public_frontend:pickup_request' %}" class="bg-white rounded-lg shadow-md p-4 grid gap-4">
-      {% csrf_token %}
-      <div>
-        <label class="block text-sm font-medium mb-1">Name</label>
-        <input type="text" name="name" value="{{ pickup_form.name.value|default:'' }}" required class="w-full border rounded px-3 py-2">
-      </div>
-      <div class="grid md:grid-cols-2 gap-4">
-        <div>
-          <label class="block text-sm font-medium mb-1">Email</label>
-          <input type="email" name="email" value="{{ pickup_form.email.value|default:'' }}" class="w-full border rounded px-3 py-2">
-        </div>
-        <div>
-          <label class="block text-sm font-medium mb-1">Phone</label>
-          <input type="text" name="phone" value="{{ pickup_form.phone.value|default:'' }}" class="w-full border rounded px-3 py-2">
-        </div>
-      </div>
-      <div>
-        <label class="block text-sm font-medium mb-1">Pickup Address</label>
-        <textarea name="address" required class="w-full border rounded px-3 py-2" rows="3">{{ pickup_form.address.value|default:'' }}</textarea>
-      </div>
-      <div>
-        <label class="block text-sm font-medium mb-1">Materials / Notes</label>
-        <textarea name="materials" class="w-full border rounded px-3 py-2" rows="4">{{ pickup_form.materials.value|default:'' }}</textarea>
-      </div>
-      <div>
-        <label class="block text-sm font-medium mb-1">Photos (optional)</label>
-        <input type="file" name="photos" multiple accept="image/*" class="w-full border rounded px-3 py-2">
-      </div>
-      <div>
-        <button class="btn-primary" type="submit">Submit Request</button>
-      </div>
-    </form>
-  </section>
+  {# Pickup Request Section removed; use dedicated page instead #}
 
   {# Blog Section #}
   <section id="blog">

public_frontend/templates/public_frontend/pickup_request.html

@@ -1,46 +1,91 @@
 {% extends 'public_frontend/base.html' %}
 {% block title %}Request Pickup{% endblock %}
+{% load crispy_forms_tags widget_tweaks %}
 {% block content %}
 <h1 class="text-xl font-semibold mb-4">Request a Pickup</h1>
-<form method="post" enctype="multipart/form-data" class="bg-white rounded shadow p-4 grid gap-4">
-  {% csrf_token %}
-  <div>
-    <label class="block text-sm font-medium mb-1">Name</label>
-    <input type="text" name="name" value="{{ form.name.value|default:'' }}" required class="w-full border rounded px-3 py-2">
-    {% if form.name.errors %}<p class="text-red-600 text-sm">{{ form.name.errors.0 }}</p>{% endif %}
-  </div>
-  <div class="grid md:grid-cols-2 gap-4">
-    <div>
-      <label class="block text-sm font-medium mb-1">Email</label>
-      <input type="email" name="email" value="{{ form.email.value|default:'' }}" class="w-full border rounded px-3 py-2">
-    </div>
+<div x-data="pickupForm()">
+  <div class="bg-white rounded shadow p-4" >
+    <form x-ref="form" id="pickup-form" method="post" enctype="multipart/form-data" class="space-y-4">
+      {% csrf_token %}
+      {{ form.name|attr:"x-ref:name"|as_crispy_field }}
+      <div class="grid md:grid-cols-2 gap-4">
+        <div>
+          {{ form.email|attr:"x-ref:email"|as_crispy_field }}
+        </div>
     <div>
-      <label class="block text-sm font-medium mb-1">Phone</label>
-      <input type="text" name="phone" value="{{ form.phone.value|default:'' }}" class="w-full border rounded px-3 py-2">
+      {{ form.phone|attr:"x-ref:phone"|as_crispy_field }}
     </div>
+      </div>
+      {{ form.address|attr:"x-ref:address"|as_crispy_field }}
+      <div class="grid md:grid-cols-2 gap-4">
+        <div>
+          {{ form.preferred_at|attr:"x-ref:preferred_at"|as_crispy_field }}
+        </div>
+      </div>
+      {{ form.materials|attr:"x-ref:materials"|as_crispy_field }}
+      {{ form.photos|attr:"x-ref:photos"|as_crispy_field }}
+      <div>
+        <button id="open-review" class="btn btn-primary" type="button" @click="openReview">Review &amp; Submit</button>
+      </div>
+    </form>
   </div>
-  <div>
-    <label class="block text-sm font-medium mb-1">Pickup Address</label>
-    <textarea name="address" required class="w-full border rounded px-3 py-2" rows="3">{{ form.address.value|default:'' }}</textarea>
-    {% if form.address.errors %}<p class="text-red-600 text-sm">{{ form.address.errors.0 }}</p>{% endif %}
-  </div>
-  <div class="grid md:grid-cols-2 gap-4">
-    <div>
-      <label class="block text-sm font-medium mb-1">Preferred Date/Time</label>
-      <input type="datetime-local" name="preferred_at" value="{{ form.preferred_at.value|default:'' }}" class="w-full border rounded px-3 py-2">
+
+  <dialog x-ref="dialog" id="review_modal" class="modal dark:bg-black/40">
+    <div class="modal-box dark:bg-gray-900 dark:text-gray-100 dark:border dark:border-gray-700">
+      <h3 class="font-bold text-lg">Review Your Pickup Request</h3>
+      <div class="py-4 space-y-3">
+        <div><div class="text-sm text-gray-600 dark:text-gray-300">Name</div><div class="font-medium" x-text="rv.name || '—'"></div></div>
+        <div class="grid md:grid-cols-2 gap-4">
+          <div><div class="text-sm text-gray-600 dark:text-gray-300">Email</div><div class="font-medium" x-text="rv.email || '—'"></div></div>
+          <div><div class="text-sm text-gray-600 dark:text-gray-300">Phone</div><div class="font-medium" x-text="rv.phone || '—'"></div></div>
+        </div>
+        <div><div class="text-sm text-gray-600 dark:text-gray-300">Pickup Address</div><div class="whitespace-pre-line" x-text="rv.address || '—'"></div></div>
+        <div class="grid md:grid-cols-2 gap-4">
+          <div><div class="text-sm text-gray-600 dark:text-gray-300">Preferred Date/Time</div><div class="font-medium" x-text="rv.preferred_at || '—'"></div></div>
+        </div>
+        <div><div class="text-sm text-gray-600 dark:text-gray-300">Materials / Notes</div><div class="whitespace-pre-line" x-text="rv.materials || '—'"></div></div>
+        <div>
+          <div class="text-sm text-gray-600 dark:text-gray-300">Photos</div>
+          <ul class="list-disc list-inside text-sm text-gray-700 dark:text-gray-300">
+            <template x-if="(rv.photos||[]).length === 0"><li>No files attached.</li></template>
+            <template x-for="fname in rv.photos" :key="fname"><li x-text="fname"></li></template>
+          </ul>
+        </div>
+      </div>
+      <div class="modal-action">
+        <button class="btn" @click="$refs.dialog.close()">Edit</button>
+        <button class="btn btn-primary" @click.prevent="confirm">Confirm &amp; Send</button>
+      </div>
     </div>
-  </div>
-  <div>
-    <label class="block text-sm font-medium mb-1">Materials / Notes</label>
-    <textarea name="materials" class="w-full border rounded px-3 py-2" rows="4">{{ form.materials.value|default:'' }}</textarea>
-  </div>
-  <div>
-    <label class="block text-sm font-medium mb-1">Photos (optional)</label>
-    <input type="file" name="photos" multiple accept="image/*" class="w-full border rounded px-3 py-2">
-  </div>
-  <div>
-    <button class="btn-primary" type="submit">Submit Request</button>
-  </div>
-</form>
-<style>.btn-primary{background:#1d4ed8;color:white;padding:.5rem .75rem;border-radius:.375rem}</style>
+    <form method="dialog" class="modal-backdrop dark:bg-black/60">
+      <button class="dark:text-gray-200">close</button>
+    </form>
+  </dialog>
+</div>
+<script>
+  function pickupForm(){
+    return {
+      rv: {name:'', email:'', phone:'', address:'', preferred_at:'', materials:'', photos: []},
+      openReview(){
+        console.log(this.$refs.form)
+        const fd = new FormData(this.$refs.form);
+        this.rv.name = fd.get('name') || '';
+        this.rv.email = fd.get('email') || '';
+        this.rv.phone = fd.get('phone') || '';
+        this.rv.address = fd.get('address') || '';
+        this.rv.preferred_at = fd.get('preferred_at') || '';
+        this.rv.materials = fd.get('materials') || '';
+        const input = this.$refs.photos;
+        this.rv.photos = input && input.files ? Array.from(input.files).map(f => f.name) : [];
+        console.log(this.$refs)
+        if(this.$refs.dialog.showModal){ this.$refs.dialog.showModal(); }
+        else { this.$refs.dialog.setAttribute('open','open'); }
+      },
+      confirm(){
+        if(this.$refs.dialog.close){ this.$refs.dialog.close(); } else { this.$refs.dialog.removeAttribute('open'); }
+        this.$refs.form.submit();
+      }
+    }
+  }
+</script>
 {% endblock %}

public_frontend/urls_admin.py

@@ -0,0 +1,11 @@
+from django.urls import path
+
+from . import views_admin as views
+
+app_name = "public_frontend_admin"
+
+urlpatterns = [
+    path("leads/", views.leads_list, name="leads_list"),
+    path("leads/<int:pk>/", views.lead_detail, name="lead_detail"),
+    path("leads/<int:pk>/convert-to-pickup/", views.lead_convert_to_pickup, name="lead_convert_to_pickup"),
+]

public_frontend/views.py

@@ -125,7 +125,8 @@ def pickup_request(request):
                 return redirect("public_frontend:home")
             else:
                 messages.error(request, result.error or "Unable to submit your request.")
-        messages.error(request, "Please correct the errors below.")
+        else:
+            messages.error(request, "Please correct the errors below.")
     return render(request, "public_frontend/pickup_request.html", {"form": form, "org": org})
 
 

public_frontend/views_admin.py

@@ -0,0 +1,189 @@
+from __future__ import annotations
+
+from django.shortcuts import render, get_object_or_404, redirect
+from django.contrib.admin.views.decorators import staff_member_required
+from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
+import django_filters as filters
+from django.contrib import messages
+from django.urls import reverse
+from django.contrib.auth import get_user_model
+from datetime import datetime
+from django.contrib.contenttypes.models import ContentType
+
+from admin_frontend.templatetags.public_urls import public_route
+from admin_frontend.nav import _nav_items
+from .models import Lead
+
+
+@staff_member_required
+@public_route(label="Leads", order=22, icon="envelope")
+def leads_list(request):
+    """List Leads captured from the public site with filtering and pagination."""
+
+    class LeadFilter(filters.FilterSet):
+        name = filters.CharFilter(field_name="name", lookup_expr="icontains", label="Name")
+        email = filters.CharFilter(field_name="email", lookup_expr="icontains", label="Email")
+        phone = filters.CharFilter(field_name="phone", lookup_expr="icontains", label="Phone")
+        org = filters.CharFilter(field_name="organization__code", lookup_expr="icontains", label="Org Code")
+        source = filters.ChoiceFilter(field_name="source", label="Source", choices=Lead.LeadSource.choices)
+        created_at = filters.DateTimeFromToRangeFilter(
+            field_name="created_at",
+            label="Created between",
+            widget=filters.widgets.RangeWidget(
+                attrs={
+                    "type": "datetime-local",
+                    "style": "color-scheme: light;",
+                    "class": "border border-gray-300 rounded-md px-3 py-2 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500",
+                }
+            ),
+        )
+
+        class Meta:
+            model = Lead
+            fields = ["name", "email", "phone", "org", "source", "created_at"]
+
+        def __init__(self, *args, **kwargs):
+            super().__init__(*args, **kwargs)
+            try:
+                from crispy_forms.helper import FormHelper
+                from crispy_forms.layout import Layout, Field
+                helper = FormHelper()
+                helper.form_tag = False
+                helper.layout = Layout(
+                    Field("name", template="crispy/field_nowrap.html"),
+                    Field("email", template="crispy/field_nowrap.html"),
+                    Field("phone", template="crispy/field_nowrap.html"),
+                    Field("org", template="crispy/field_nowrap.html"),
+                    Field("source", template="crispy/field_nowrap.html"),
+                    Field("created_at", template="crispy/field_nowrap.html"),
+                )
+                self.form.helper = helper
+            except Exception:
+                pass
+
+    qs = Lead.objects.select_related("organization").order_by("-created_at")
+    lead_filter = LeadFilter(request.GET, queryset=qs)
+
+    paginator = Paginator(lead_filter.qs, 10)
+    page = request.GET.get("page")
+    try:
+        page_obj = paginator.page(page)
+    except PageNotAnInteger:
+        page_obj = paginator.page(1)
+    except EmptyPage:
+        page_obj = paginator.page(paginator.num_pages)
+
+    context = {
+        "nav": _nav_items(),
+        "leads": page_obj.object_list,
+        "page_obj": page_obj,
+        "filter": lead_filter,
+    }
+    return render(request, "admin_frontend/leads_list.html", context)
+
+
+@staff_member_required
+def lead_detail(request, pk: int):
+    lead = get_object_or_404(Lead.objects.select_related("organization"), pk=pk)
+
+    def _parse_pickup_details(message: str):
+        data = {"address": "", "preferred": "", "materials": ""}
+        try:
+            for line in (message or "").splitlines():
+                if line.lower().startswith("address:"):
+                    data["address"] = line.split(":", 1)[1].strip()
+                elif line.lower().startswith("preferred:"):
+                    data["preferred"] = line.split(":", 1)[1].strip()
+                elif line.lower().startswith("materials:"):
+                    data["materials"] = line.split(":", 1)[1].strip()
+        except Exception:
+            pass
+        return data
+
+    suggested = _parse_pickup_details(getattr(lead, "message", "") or "")
+    # Fetch any uploaded Documents attached to this Lead
+    try:
+        from recycle_core.models import Document
+        ct = ContentType.objects.get_for_model(Lead)
+        documents = Document.objects.filter(content_type=ct, object_id=lead.id).order_by("-created_at")
+    except Exception:
+        documents = []
+
+    User = get_user_model()
+    drivers = User.objects.all().order_by("username")
+    context = {"nav": _nav_items(), "lead": lead, "drivers": drivers, "suggested": suggested, "documents": documents}
+    return render(request, "admin_frontend/lead_detail.html", context)
+
+
+@staff_member_required
+def lead_convert_to_pickup(request, pk: int):
+    lead = get_object_or_404(Lead.objects.select_related("organization"), pk=pk)
+    if request.method != "POST":
+        return redirect("public_frontend_admin:lead_detail", pk=pk)
+
+    from recycle_core.models import Customer, CustomerSite, PickupOrder
+
+    address = (request.POST.get("address") or "").strip()
+    scheduled_at_raw = (request.POST.get("scheduled_at") or "").strip()
+    driver_id = (request.POST.get("driver") or "").strip()
+
+    if not address:
+        messages.error(request, "Address is required to create a pickup.")
+        return redirect("public_frontend_admin:lead_detail", pk=pk)
+
+    scheduled_at = None
+    if scheduled_at_raw:
+        try:
+            scheduled_at = datetime.fromisoformat(scheduled_at_raw)
+        except Exception:
+            messages.error(request, "Invalid date/time format for schedule.")
+            return redirect("public_frontend_admin:lead_detail", pk=pk)
+
+    # Find or create customer for this lead under the same organization
+    org = lead.organization
+    customer = None
+    if lead.email:
+        customer = Customer.objects.filter(organization=org, email__iexact=lead.email).first()
+    if customer is None:
+        customer = Customer.objects.filter(organization=org, name__iexact=lead.name).first()
+    if customer is None:
+        customer = Customer.objects.create(
+            organization=org,
+            name=lead.name,
+            email=lead.email,
+            phone=lead.phone,
+            billing_address="",
+        )
+
+    # Create a site for the pickup
+    site = CustomerSite.objects.create(
+        customer=customer,
+        name="",
+        address=address,
+        contact_name=lead.name,
+        contact_phone=lead.phone,
+        contact_email=lead.email,
+    )
+
+    pickup = PickupOrder.objects.create(
+        organization=org,
+        customer=customer,
+        site=site,
+        status=PickupOrder.STATUS_REQUESTED,
+        scheduled_at=scheduled_at,
+    )
+
+    # Optionally assign a driver and mark scheduled
+    if driver_id:
+        try:
+            User = get_user_model()
+            driver = User.objects.get(pk=int(driver_id))
+            pickup.assigned_driver = driver
+            if scheduled_at:
+                pickup.status = PickupOrder.STATUS_SCHEDULED
+            pickup.save(update_fields=["assigned_driver", "status"])
+        except Exception:
+            pass
+
+    messages.success(request, f"Created pickup #{pickup.id} for customer '{customer.name}'.")
+    return redirect("recycle_core:pickups_list")

requirements.txt

@@ -19,3 +19,4 @@ django-extensions
 # pygraphviz is preferred; alternatively install pydotplus and graphviz
 pygraphviz
 django-npm
+django-widget-tweaks

theme/static_src/src/styles.css

@@ -48,4 +48,17 @@
   [id^="div_id_"]:has(> input[type="radio"]) > label {
     @apply mb-0;
   }
+
+  /* Restore native picker icon that crispy-tailwind may hide via appearance-none */
+  input[type="date"], input[type="time"], input[type="datetime-local"] {
+    -webkit-appearance: auto;
+    appearance: auto;
+    color-scheme: light;
+    background-color: #fff;
+  }
+  input[type="datetime-local"]::-webkit-calendar-picker-indicator {
+    opacity: 1;
+    display: block;
+  }
 }
+