carbon, invoice, weigh ticket

admin_frontend/templates/admin_frontend/dashboard.html

     <div class="text-gray-500 text-sm">Introduction Requests</div>
     <div class="text-3xl font-bold">{{ counts.intro_requests }}</div>
   </div>
+  <div class="bg-white rounded shadow p-4 md:col-span-3">
+    <div class="text-gray-500 text-sm mb-2">Carbon Summary</div>
+    <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+      <div>
+        <div class="text-gray-500 text-xs">Pending Events</div>
+        <div class="text-2xl font-semibold">{{ carbon.pending_events|default:0 }}</div>
+      </div>
+      <div>
+        <div class="text-gray-500 text-xs">Approved kgCO2e (MTD)</div>
+        <div class="text-2xl font-semibold">{{ carbon.approved_mtd|default:0 }}</div>
+      </div>
+    </div>
+  </div>
   </div>
 {% endblock %}
-

admin_frontend/views.py

 from api.services.matching import rank_users_for, rank_opportunities_for
 from api.services.benefit import build_leaderboard_queryset
 from .nav import _nav_items
+from recycle_core.models import CarbonEvent, CarbonBalance
+from django.utils import timezone
 from orgs.models import OrganizationSite
 
 
 @staff_member_required
 @public_route(label="Dashboard", order=10, icon="home")
 def dashboard(request):
+    org = getattr(request, "org", None)
+    # Carbon summaries
+    pending_qs = CarbonEvent.objects.filter(status=CarbonEvent.STATUS_PENDING)
+    if org is not None:
+        pending_qs = pending_qs.filter(organization=org)
+    pending_count = pending_qs.count()
+
+    today = timezone.now().date()
+    bal = CarbonBalance.objects.filter(year=today.year, month=today.month)
+    if org is not None:
+        bal = bal.filter(organization=org)
+    approved_mtd = sum((b.approved_kgco2e for b in bal), start=0)
+
     context = {
         "nav": _nav_items(),
         "counts": {
             "opportunities": Opportunity.objects.count(),
             "intro_requests": IntroductionRequest.objects.count(),
         },
+        "carbon": {
+            "pending_events": pending_count,
+            "approved_mtd": approved_mtd,
+        },
     }
     return render(request, "admin_frontend/dashboard.html", context)
 

billing/urls_admin.py

 
 urlpatterns = [
     path("invoices/", views.invoices_list, name="invoices_list"),
+    path("invoices/<int:pk>/", views.invoice_detail, name="invoice_detail"),
+    path("invoices/<int:pk>/set-status/", views.invoice_set_status, name="invoice_set_status"),
     path("invoices/<int:pk>/add-payment/", views.invoice_add_payment, name="invoice_add_payment"),
     path("payouts/", views.payouts_list, name="payouts_list"),
     path("payouts/export/", views.payouts_export_csv, name="payouts_export_csv"),
 ]
-

billing/views.py

 from django.shortcuts import render, redirect, get_object_or_404
 from django.contrib.admin.views.decorators import staff_member_required
 from django.contrib import messages
+from django.views.decorators.http import require_POST
 from django.urls import reverse
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 import django_filters as filters
     return redirect("billing:invoices_list")
 
 
+@staff_member_required
+@breadcrumbs(label="Invoice Detail", parent="re_invoices")
+def invoice_detail(request, pk: int):
+    inv = get_object_or_404(
+        Invoice.objects.select_related("organization", "customer").prefetch_related("lines", "payments"), pk=pk
+    )
+    # Scope check to current org if applicable
+    org = getattr(request, "org", None)
+    if org is not None and inv.organization_id != org.id:
+        messages.error(request, "Invoice not in this organization.")
+        return redirect("billing:invoices_list")
+
+    # Totals
+    payments_total = inv.payments.aggregate(s=Coalesce(Sum("amount"), Value(Decimal("0.00"))))["s"] or Decimal("0.00")
+    balance = (Decimal(inv.total_amount) - Decimal(payments_total)).quantize(Decimal("0.01"))
+
+    pay_form = PaymentForm()
+    context = {
+        "nav": _nav_items(),
+        "invoice": inv,
+        "payments_total": payments_total,
+        "balance": balance,
+        "pay_form": pay_form,
+        "status_choices": Invoice.STATUS_CHOICES,
+    }
+    return render(request, "recycle_core/invoice_detail.html", context)
+
+
+@staff_member_required
+@require_POST
+def invoice_set_status(request, pk: int):
+    inv = get_object_or_404(Invoice, pk=pk)
+    new_status = (request.POST.get("status") or "").strip()
+    valid = {k for k, _ in Invoice.STATUS_CHOICES}
+    if new_status not in valid:
+        messages.error(request, "Invalid status selection.")
+        return redirect("billing:invoice_detail", pk=inv.id)
+    inv.status = new_status
+    inv.save(update_fields=["status", "updated_at"])
+    messages.success(request, f"Invoice status updated to '{new_status}'.")
+    return redirect("billing:invoice_detail", pk=inv.id)
+
+
 # Payouts UI + CSV ----------------------------------------------------------
 
 @staff_member_required

ecoloop/settings.py

     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.sites',
+    'django.contrib.humanize',
     'rest_framework',
     'djoser',
     'drf_spectacular',

orgs/migrations/0008_userprofile_address_line1_userprofile_address_line2_and_more.py

+# Generated by Django 4.2.24 on 2025-09-29 10:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('orgs', '0007_userprofile_my_photo'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userprofile',
+            name='address_line1',
+            field=models.CharField(blank=True, max_length=255),
+        ),
+        migrations.AddField(
+            model_name='userprofile',
+            name='address_line2',
+            field=models.CharField(blank=True, max_length=255),
+        ),
+        migrations.AddField(
+            model_name='userprofile',
+            name='city',
+            field=models.CharField(blank=True, max_length=128),
+        ),
+        migrations.AddField(
+            model_name='userprofile',
+            name='country',
+            field=models.CharField(blank=True, max_length=64),
+        ),
+        migrations.AddField(
+            model_name='userprofile',
+            name='department',
+            field=models.CharField(blank=True, max_length=128),
+        ),
+        migrations.AddField(
+            model_name='userprofile',
+            name='job_title',
+            field=models.CharField(blank=True, max_length=128),
+        ),
+        migrations.AddField(
+            model_name='userprofile',
+            name='phone',
+            field=models.CharField(blank=True, max_length=32),
+        ),
+        migrations.AddField(
+            model_name='userprofile',
+            name='postal_code',
+            field=models.CharField(blank=True, max_length=32),
+        ),
+        migrations.AddField(
+            model_name='userprofile',
+            name='preferred_language',
+            field=models.CharField(blank=True, max_length=10),
+        ),
+        migrations.AddField(
+            model_name='userprofile',
+            name='state',
+            field=models.CharField(blank=True, max_length=128),
+        ),
+    ]

orgs/migrations/0009_organization_allow_add_residual_line_and_more.py

+# Generated by Django 4.2.24 on 2025-09-30 14:36
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('orgs', '0008_userprofile_address_line1_userprofile_address_line2_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='organization',
+            name='allow_add_residual_line',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AddField(
+            model_name='organization',
+            name='allow_adjust_net_to_lines',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AddField(
+            model_name='organization',
+            name='ticket_tolerance_abs_kg',
+            field=models.DecimalField(decimal_places=3, default=0.5, max_digits=10),
+        ),
+        migrations.AddField(
+            model_name='organization',
+            name='ticket_tolerance_pct',
+            field=models.DecimalField(decimal_places=2, default=1.0, max_digits=5),
+        ),
+    ]

orgs/models.py

     )
     currency_code = models.CharField(max_length=8, choices=CURRENCY_CHOICES, default="USD")
 
+    # Weigh ticket reconciliation settings
+    ticket_tolerance_abs_kg = models.DecimalField(max_digits=10, decimal_places=3, default=0.500)
+    ticket_tolerance_pct = models.DecimalField(max_digits=5, decimal_places=2, default=1.00)
+    allow_adjust_net_to_lines = models.BooleanField(default=True)
+    allow_add_residual_line = models.BooleanField(default=True)
+
     def __str__(self) -> str:
         return self.name
 
     organization = models.ForeignKey(Organization, on_delete=models.CASCADE, related_name="users")
     role = models.CharField(max_length=16, choices=ROLE_CHOICES, default=ROLE_MANAGER)
     my_photo = models.ImageField(upload_to="user_photos/", blank=True, null=True)
+    # Contact and profile details
+    phone = models.CharField(max_length=32, blank=True)
+    job_title = models.CharField(max_length=128, blank=True)
+    department = models.CharField(max_length=128, blank=True)
+    preferred_language = models.CharField(max_length=10, blank=True)
+    # Address fields
+    address_line1 = models.CharField(max_length=255, blank=True)
+    address_line2 = models.CharField(max_length=255, blank=True)
+    city = models.CharField(max_length=128, blank=True)
+    state = models.CharField(max_length=128, blank=True)
+    postal_code = models.CharField(max_length=32, blank=True)
+    country = models.CharField(max_length=64, blank=True)
 
     def __str__(self) -> str:
         return f"{self.user.username} ({self.role})"

public_frontend/forms.py

 
 from django import forms
 from django.contrib.auth import get_user_model
+from django.conf import settings
 from django.core.exceptions import ValidationError
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import Layout, Field
         if commit:
             instance.save()
         return instance
+
+
+class PublicUserProfileExtraForm(forms.ModelForm):
+    class Meta:
+        model = UserProfile
+        fields = [
+            "phone",
+            "job_title",
+            "department",
+            "preferred_language",
+            "address_line1",
+            "address_line2",
+            "city",
+            "state",
+            "postal_code",
+            "country",
+        ]
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        # Render preferred_language as a dropdown of available LANGUAGES
+        try:
+            lang_choices = list(getattr(settings, "LANGUAGES", []))
+        except Exception:
+            lang_choices = []
+        if lang_choices:
+            self.fields["preferred_language"] = forms.ChoiceField(
+                choices=[("", "—")] + lang_choices,
+                required=False,
+                label=self.fields.get("preferred_language").label if self.fields.get("preferred_language") else "Preferred language",
+            )
+        self.helper = FormHelper()
+        self.helper.form_tag = False
+        self.helper.layout = Layout(
+            Field("phone"),
+            Field("job_title"),
+            Field("department"),
+            Field("preferred_language"),
+            Field("address_line1"),
+            Field("address_line2"),
+            Field("city"),
+            Field("state"),
+            Field("postal_code"),
+            Field("country"),
+        )

public_frontend/migrations/0003_lead_created_by.py

+# Generated by Django 4.2.24 on 2025-09-29 09:48
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('public_frontend', '0002_alter_lead_source'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='lead',
+            name='created_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='leads_created', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

public_frontend/models.py

 from __future__ import annotations
 
 from django.db import models
+from django.conf import settings
 from orgs.models import Organization
 
 
     message = models.TextField(blank=True)
     source = models.CharField(max_length=64, blank=True, choices=LeadSource.choices)
     created_at = models.DateTimeField(auto_now_add=True)
+    created_by = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        related_name="leads_created",
+    )
 
     def __str__(self) -> str:  # pragma: no cover
         return f"Lead {self.name} ({self.organization.code})"

public_frontend/templates/public_frontend/base.html

     {% 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 %}">
+          <div class="msg 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 %}
       <a href="/webadmin/" class="hover:underline">{% trans "Staff Login" %}</a>
     </div>
   </footer>
+  <script>
+    // Fade-in then auto-fade-out system messages
+    window.addEventListener('DOMContentLoaded', () => {
+      const items = document.querySelectorAll('#messages .msg');
+      items.forEach((el, idx) => {
+        el.style.opacity = '0';
+        el.style.transform = 'translateY(-4px)';
+        el.style.transition = 'opacity 300ms ease, transform 300ms ease';
+        // Staggered fade-in
+        setTimeout(() => {
+          el.style.opacity = '1';
+          el.style.transform = 'translateY(0)';
+        }, 30 + idx * 50);
+        // Auto fade-out and remove
+        setTimeout(() => {
+          el.style.opacity = '0';
+          el.style.transform = 'translateY(-4px)';
+          setTimeout(() => { try { el.remove(); } catch(e) {} }, 400);
+        }, 5000 + idx * 120);
+      });
+    });
+  </script>
 </body>
 </html>

public_frontend/templates/public_frontend/my_profile.html

 {% load crispy_forms_tags i18n %}
 {% block title %}{% trans "My Profile" %}{% endblock %}
 {% block content %}
-<div class="max-w-3xl mx-auto">
+<div class="max-w-5xl mx-auto" x-data="{ section: 'profile' }" x-init="section = (location.hash==='\#history' ? 'history' : 'profile')">
   <h1 class="text-2xl font-semibold mb-4">{% trans "My Profile" %}</h1>
-  <form method="post" enctype="multipart/form-data" class="bg-white rounded shadow p-4">
-    {% csrf_token %}
-    <div class="grid grid-cols-1 gap-6">
-      <div>
-        <h2 class="text-base font-semibold mb-2">{% trans "Account" %}</h2>
-        <div class="grid md:grid-cols-2 gap-4 mb-2">
-          <div>
-            <label class="block text-sm font-medium mb-1">{% trans "Username" %}</label>
-            <input type="text" value="{{ username_value }}" class="w-full border rounded px-3 py-2 bg-gray-50" disabled>
+  <div class="grid grid-cols-1 md:grid-cols-12 gap-6">
+    <aside class="md:col-span-3">
+      <nav class="bg-white rounded shadow p-4">
+        <div class="text-xs font-semibold text-gray-500 uppercase tracking-wider mb-2">{% trans "Navigation" %}</div>
+        <ul class="space-y-1">
+          <li>
+            <a href="#profile" @click.prevent="section='profile'" :class="section==='profile' ? 'bg-blue-50 text-blue-700' : 'text-gray-700'" class="block rounded px-3 py-2 hover:bg-gray-50">{% trans "Profile" %}</a>
+          </li>
+          <li>
+            <a href="#history" @click.prevent="section='history'" :class="section==='history' ? 'bg-blue-50 text-blue-700' : 'text-gray-700'" class="block rounded px-3 py-2 hover:bg-gray-50">{% trans "Request History" %}</a>
+          </li>
+        </ul>
+      </nav>
+    </aside>
+    <section class="md:col-span-9 space-y-6">
+      <div x-show="section==='profile'" x-cloak>
+        {% if carbon %}
+        <div class="grid grid-cols-1 md:grid-cols-2 gap-4 mb-4">
+          <div class="bg-white rounded shadow p-4">
+            <div class="text-gray-500 text-xs">Pending Carbon Events</div>
+            <div class="text-2xl font-semibold">{{ carbon.pending_events }}</div>
           </div>
-          <div>
-            <label class="block text-sm font-medium mb-1">{% trans "Role" %}</label>
-            <input type="text" value="{{ role_label }}" class="w-full border rounded px-3 py-2 bg-gray-50" disabled>
+          <div class="bg-white rounded shadow p-4">
+            <div class="text-gray-500 text-xs">Approved kgCO2e (MTD)</div>
+            <div class="text-2xl font-semibold">{{ carbon.approved_mtd }}</div>
           </div>
         </div>
-        {{ form_user|crispy }}
-      </div>
-      {% if has_profile %}
-      <div>
-        <h2 class="text-base font-semibold mb-2">{% trans "Profile Photo" %}</h2>
-        <div class="flex items-start gap-4">
-          <div>
-            <img id="my-photo-preview" src="{% if request.user.recycle_profile.my_photo %}{{ request.user.recycle_profile.my_photo.url }}{% else %}#{% endif %}" alt="Current photo" class="w-24 h-24 rounded object-cover border {% if not request.user.recycle_profile.my_photo %}hidden{% endif %}" />
-            {% if not request.user.recycle_profile.my_photo %}
-              <div id="my-photo-placeholder" class="w-24 h-24 rounded bg-gray-100 flex items-center justify-center text-gray-400 border">No photo</div>
+        {% endif %}
+        <form method="post" enctype="multipart/form-data" class="bg-white rounded shadow p-4">
+          {% csrf_token %}
+          <div class="grid grid-cols-1 gap-6">
+            <div>
+              <h2 class="text-base font-semibold mb-2">{% trans "Account" %}</h2>
+              <div class="grid md:grid-cols-2 gap-4 mb-2">
+                <div>
+                  <label class="block text-sm font-medium mb-1">{% trans "Username" %}</label>
+                  <input type="text" value="{{ username_value }}" class="w-full border rounded px-3 py-2 bg-gray-50" disabled>
+                </div>
+                <div>
+                  <label class="block text-sm font-medium mb-1">{% trans "Role" %}</label>
+                  <input type="text" value="{{ role_label }}" class="w-full border rounded px-3 py-2 bg-gray-50" disabled>
+                </div>
+              </div>
+              {{ form_user|crispy }}
+            </div>
+            {% if has_profile %}
+            <div>
+              <h2 class="text-base font-semibold mb-2">{% trans "Profile Photo" %}</h2>
+              <div class="flex items-start gap-4">
+                <div>
+                  <img id="my-photo-preview" src="{% if request.user.recycle_profile.my_photo %}{{ request.user.recycle_profile.my_photo.url }}{% else %}#{% endif %}" alt="Current photo" class="w-24 h-24 rounded object-cover border {% if not request.user.recycle_profile.my_photo %}hidden{% endif %}" />
+                  {% if not request.user.recycle_profile.my_photo %}
+                    <div id="my-photo-placeholder" class="w-24 h-24 rounded bg-gray-100 flex items-center justify-center text-gray-400 border">No photo</div>
+                  {% endif %}
+                </div>
+                <div class="flex-1">
+                  {{ form_photo.my_photo }}
+                  <div class="flex items-center gap-3">
+                    <button type="button" id="btn-pick-photo" class="btn-outline">Change photo</button>
+                    {% if form_photo.remove_photo %}
+                      <label class="inline-flex items-center gap-2 text-sm text-gray-700">
+                        {{ form_photo.remove_photo }} Remove current photo
+                      </label>
+                    {% endif %}
+                  </div>
+                  <p class="text-xs text-gray-500 mt-1">JPG/PNG, up to 5MB.</p>
+                  <style>.btn-outline{border:1px solid #cbd5e1;padding:.375rem .5rem;border-radius:.375rem}</style>
+                </div>
+              </div>
+            </div>
+            <div>
+              <h2 class="text-base font-semibold mb-2">{% trans "Contact & Address" %}</h2>
+              {{ form_extras|crispy }}
+            </div>
             {% endif %}
           </div>
-          <div class="flex-1">
-            {{ form_photo.my_photo }}
-            <div class="flex items-center gap-3">
-              <button type="button" id="btn-pick-photo" class="btn-outline">Change photo</button>
-              {% if form_photo.remove_photo %}
-                <label class="inline-flex items-center gap-2 text-sm text-gray-700">
-                  {{ form_photo.remove_photo }} Remove current photo
-                </label>
-              {% endif %}
-            </div>
-            <p class="text-xs text-gray-500 mt-1">JPG/PNG, up to 5MB.</p>
-            <style>.btn-outline{border:1px solid #cbd5e1;padding:.375rem .5rem;border-radius:.375rem}</style>
+          <div class="mt-4">
+            <button class="btn-primary" type="submit">{% trans "Save Changes" %}</button>
+            <style>.btn-primary{background:#1d4ed8;color:#fff;padding:.5rem .75rem;border-radius:.375rem}</style>
+          </div>
+        </form>
+      </div>
+      <div x-show="section==='history'" x-cloak>
+        <div class="bg-white rounded shadow p-4">
+          <h2 class="text-base font-semibold mb-3">{% trans "Request History" %}</h2>
+          {% if request_history %}
+          <div class="overflow-x-auto">
+            <table class="min-w-full text-sm">
+              <thead>
+                <tr class="text-left text-gray-600">
+                  <th class="px-3 py-2">{% trans "Date" %}</th>
+                  <th class="px-3 py-2">{% trans "Subject" %}</th>
+                  <th class="px-3 py-2">{% trans "Organization" %}</th>
+                </tr>
+              </thead>
+              <tbody class="bg-white">
+                {% for it in request_history %}
+                <tr class="border-t">
+                  <td class="px-3 py-2 whitespace-nowrap">{{ it.created_at|date:"Y-m-d H:i" }}</td>
+                  <td class="px-3 py-2">{{ it.subject|default:"Pickup Request" }}</td>
+                  <td class="px-3 py-2">{{ it.organization.name }}</td>
+                </tr>
+                {% endfor %}
+              </tbody>
+            </table>
           </div>
+          {% else %}
+            <div class="text-sm text-gray-600">{% trans "No requests found for your account email." %}</div>
+          {% endif %}
         </div>
       </div>
-      {% endif %}
-    </div>
-    <div class="mt-4">
-      <button class="btn-primary" type="submit">{% trans "Save Changes" %}</button>
-      <style>.btn-primary{background:#1d4ed8;color:#fff;padding:.5rem .75rem;border-radius:.375rem}</style>
-    </div>
-  </form>
+    </section>
+  </div>
 </div>
 <script>
   (function(){

public_frontend/views.py

 from recycle_core.models import Material, ScrapListing, PickupOrder
 from cms.models import Post, PostCategory
 
-from .forms import PickupRequestForm, ContactForm, RegistrationForm, PublicUserForm, PublicUserPhotoForm
+from .forms import (
+    PickupRequestForm,
+    ContactForm,
+    RegistrationForm,
+    PublicUserForm,
+    PublicUserPhotoForm,
+    PublicUserProfileExtraForm,
+)
 from .models import Lead
 from recycle_core.controllers.pickup_request import (
     PickupRequestController,
 
 def pickup_request(request):
     org = getattr(request, "org", None)
-    form = PickupRequestForm(request.POST or None, request.FILES or None)
+    # Prefill form for authenticated users
+    initial = {}
+    if request.user.is_authenticated:
+        u = request.user
+        full_name = (getattr(u, "get_full_name", lambda: "")() or "").strip()
+        initial["name"] = full_name or u.username
+        if getattr(u, "email", ""):
+            initial["email"] = u.email
+    form = PickupRequestForm(request.POST or None, request.FILES or None, initial=initial)
     if request.method == "POST":
         if not org:
             messages.error(request, "Organization context missing.")
                 materials=form.cleaned_data.get("materials", ""),
                 preferred_at=form.cleaned_data.get("preferred_at"),
                 files=request.FILES.getlist("photos") if hasattr(request, "FILES") and "photos" in request.FILES else [],
+                created_by=request.user if request.user.is_authenticated else None,
             )
             result = ctrl.submit(data)
             if result.ok:
                 subject=form.cleaned_data.get("subject", ""),
                 message=form.cleaned_data.get("message", ""),
                 source="contact",
+                created_by=request.user if request.user.is_authenticated else None,
             )
             messages.success(request, "Thanks! We will get back to you shortly.")
             return redirect("public_frontend:home")
 
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth import get_user_model
+from django.utils import timezone
+from recycle_core.models import CarbonEvent, CarbonBalance
 
 
 @login_required
     if request.method == "POST":
         form_user = PublicUserForm(request.POST, instance=user)
         form_photo = PublicUserPhotoForm(request.POST, request.FILES, instance=profile) if profile else None
+        form_extras = PublicUserProfileExtraForm(request.POST, instance=profile) if profile else None
         ok_user = form_user.is_valid()
         ok_photo = True if form_photo is None else form_photo.is_valid()
-        if ok_user and ok_photo:
+        ok_extras = True if form_extras is None else form_extras.is_valid()
+        if ok_user and ok_photo and ok_extras:
             form_user.save()
             if form_photo is not None:
                 form_photo.save()
+            if form_extras is not None:
+                form_extras.save()
             messages.success(request, "Profile updated.")
             return redirect(reverse("public_frontend:my_profile"))
         messages.error(request, "Please correct the errors below.")
     else:
         form_user = PublicUserForm(instance=user)
         form_photo = PublicUserPhotoForm(instance=profile) if profile else None
+        form_extras = PublicUserProfileExtraForm(instance=profile) if profile else None
+
+    # Request history (pickup requests submitted via public form, matched by email)
+    history = []
+    try:
+        email = (user.email or "").strip()
+        if email:
+            qs = Lead.objects.filter(email__iexact=email, source="pickup_request").order_by("-created_at")
+            org = getattr(request, "org", None)
+            if org is not None:
+                qs = qs.filter(organization=org)
+            history = list(qs[:20])
+    except Exception:
+        history = []
+
+    # Carbon summary for user's organization
+    org = getattr(request, "org", None) or getattr(profile, "organization", None)
+    carbon = None
+    if org is not None:
+        today = timezone.now().date()
+        bal = CarbonBalance.objects.filter(organization=org, year=today.year, month=today.month).first()
+        pending = CarbonEvent.objects.filter(organization=org, status=CarbonEvent.STATUS_PENDING).count()
+        carbon = {
+            "pending_events": pending,
+            "approved_mtd": bal.approved_kgco2e if bal else 0,
+        }
 
     return render(
         request,
         "public_frontend/my_profile.html",
-        {"form_user": form_user, "form_photo": form_photo, "has_profile": bool(profile), "username_value": user.username, "role_label": role_label},
+        {
+            "form_user": form_user,
+            "form_photo": form_photo,
+            "form_extras": form_extras,
+            "has_profile": bool(profile),
+            "username_value": user.username,
+            "role_label": role_label,
+            "request_history": history,
+            "carbon": carbon,
+        },
     )

recycle_core/apps.py

 class RecycleCoreConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
     name = 'recycle_core'
+
+    def ready(self):  # pragma: no cover - side effects only
+        try:
+            from . import signals  # noqa: F401
+        except Exception:
+            # Avoid crashing app loading if migrations incomplete
+            pass

recycle_core/controllers/pickup_request.py

 
 from dataclasses import dataclass
 from typing import Iterable, List, Optional
+from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.models import ContentType
 from django.utils import timezone
 
     materials: str = ""
     preferred_at: Optional[timezone.datetime] = None
     files: Optional[Iterable] = None  # iterable of UploadedFile
+    created_by: Optional[object] = None  # User, but avoid circular import typing
 
 
 @dataclass
                 subject="Pickup Request",
                 message=message,
                 source="pickup_request",
+                created_by=data.created_by if getattr(data, "created_by", None) else None,
             )
 
             # Attach uploaded files as Documents linked to the Lead
 
         except Exception as e:
             return PickupRequestResult(ok=False, error=str(e), document_ids=[])
-

recycle_core/forms.py

     ProvidedService,
     Customer,
     CustomerSite,
+    MaterialEmissionFactor,
+    PickupItem,
 )
 from markdownfield.widgets import MDEWidget
 from orgs.models import UserProfile
         if gross is not None and tare is not None and net is None:
             cleaned["net_weight"] = (Decimal(gross) - Decimal(tare)).quantize(Decimal("0.001"))
         return cleaned
+
+
+class WeighLineForm(forms.Form):
+    material = forms.ModelChoiceField(queryset=Material.objects.none())
+    quantity = forms.DecimalField(max_digits=12, decimal_places=3)
+    unit = forms.ChoiceField(choices=(), required=True)
+
+    def __init__(self, *args, **kwargs):
+        org = kwargs.pop("organization", None)
+        super().__init__(*args, **kwargs)
+        from .models import Material as Mat
+        self.fields["unit"].choices = Mat.UNIT_CHOICES
+        # Scope materials by organization if provided
+        if org is not None:
+            self.fields["material"].queryset = Material.objects.filter(organization=org).order_by("name")
+        else:
+            self.fields["material"].queryset = Material.objects.all().order_by("name")
+
+
+class MaterialEmissionFactorForm(forms.ModelForm):
+    class Meta:
+        model = MaterialEmissionFactor
+        fields = [
+            "organization",
+            "material",
+            "unit",
+            "kgco2e_per_unit",
+            "source",
+            "effective_from",
+            "effective_to",
+        ]
+
+
+class PickupItemForm(forms.Form):
+    material = forms.ModelChoiceField(queryset=Material.objects.none())
+    estimated_qty = forms.DecimalField(max_digits=12, decimal_places=3, required=False)
+    unit = forms.ChoiceField(choices=(), required=True)
+
+    def __init__(self, *args, **kwargs):
+        org = kwargs.pop("organization", None)
+        super().__init__(*args, **kwargs)
+        from .models import Material as Mat
+        self.fields["unit"].choices = Mat.UNIT_CHOICES
+        if org is not None:
+            self.fields["material"].queryset = Material.objects.filter(organization=org).order_by("name")
+        else:
+            self.fields["material"].queryset = Material.objects.all().order_by("name")
+
+
+class WeighTicketWeightsForm(forms.Form):
+    gross_weight = forms.DecimalField(max_digits=12, decimal_places=3)
+    tare_weight = forms.DecimalField(max_digits=12, decimal_places=3)
+    unit = forms.ChoiceField(choices=(), required=True)
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        from .models import Material as Mat
+        self.fields["unit"].choices = Mat.UNIT_CHOICES
+
+    def clean(self):
+        cleaned = super().clean()
+        g = cleaned.get("gross_weight")
+        t = cleaned.get("tare_weight")
+        if g is not None and t is not None and g < t:
+            self.add_error("gross_weight", "Gross must be greater than or equal to tare")
+        return cleaned

recycle_core/management/commands/seed_ecoloop.py

     ScrapBid,
     ScrapListingInvite,
     ScrapAward,
+    MaterialEmissionFactor,
 )
 from recycle_core.services.billing import generate_invoice_for_pickup
 
         can, _ = Material.objects.get_or_create(organization=org, category="Metals", name="Aluminum Can", defaults={"default_unit": Material.UNIT_KG})
         cardboard, _ = Material.objects.get_or_create(organization=org, category="Paper", name="Cardboard", defaults={"default_unit": Material.UNIT_KG})
 
+        # Emission factors (demo values)
+        MaterialEmissionFactor.objects.get_or_create(
+            organization=org, material=pet, unit=Material.UNIT_KG,
+            defaults={"kgco2e_per_unit": Decimal("0.050"), "source": "Demo factor"}
+        )
+        MaterialEmissionFactor.objects.get_or_create(
+            organization=org, material=can, unit=Material.UNIT_KG,
+            defaults={"kgco2e_per_unit": Decimal("0.150"), "source": "Demo factor"}
+        )
+
         # Price list
         pl, _ = PriceList.objects.get_or_create(
             organization=org,

recycle_core/migrations/0003_materialemissionfactor_carbonevent_carbonbalance.py

+# Generated by Django 4.2.24 on 2025-09-30 08:47
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('orgs', '0008_userprofile_address_line1_userprofile_address_line2_and_more'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('recycle_core', '0002_alter_pickuporder_options_alter_scraplisting_options_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='MaterialEmissionFactor',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('unit', models.CharField(choices=[('kg', 'Kilogram'), ('lb', 'Pound'), ('pcs', 'Pieces')], default='kg', max_length=8)),
+                ('kgco2e_per_unit', models.DecimalField(decimal_places=6, max_digits=16)),
+                ('source', models.CharField(blank=True, max_length=255)),
+                ('effective_from', models.DateField(blank=True, null=True)),
+                ('effective_to', models.DateField(blank=True, null=True)),
+                ('material', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='emission_factors', to='recycle_core.material')),
+                ('organization', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_factors', to='orgs.organization')),
+            ],
+            options={
+                'indexes': [models.Index(fields=['organization', 'material', 'unit'], name='recycle_cor_organiz_71d624_idx')],
+            },
+        ),
+        migrations.CreateModel(
+            name='CarbonEvent',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('quantity', models.DecimalField(decimal_places=3, max_digits=14)),
+                ('unit', models.CharField(choices=[('kg', 'Kilogram'), ('lb', 'Pound'), ('pcs', 'Pieces')], default='kg', max_length=8)),
+                ('kgco2e', models.DecimalField(decimal_places=6, max_digits=18)),
+                ('event_date', models.DateTimeField(db_index=True, default=django.utils.timezone.now)),
+                ('status', models.CharField(choices=[('pending', 'Pending'), ('approved', 'Approved'), ('rejected', 'Rejected')], db_index=True, default='pending', max_length=16)),
+                ('approved_at', models.DateTimeField(blank=True, null=True)),
+                ('notes', models.TextField(blank=True)),
+                ('approved_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='approved_carbon_events', to=settings.AUTH_USER_MODEL)),
+                ('material', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='recycle_core.material')),
+                ('organization', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='carbon_events', to='orgs.organization')),
+                ('weigh_line', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='carbon_events', to='recycle_core.weighline')),
+                ('weigh_ticket', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='carbon_events', to='recycle_core.weighticket')),
+            ],
+            options={
+                'indexes': [models.Index(fields=['organization', 'status'], name='recycle_cor_organiz_fad901_idx'), models.Index(fields=['organization', 'event_date'], name='recycle_cor_organiz_3206eb_idx')],
+                'unique_together': {('weigh_line',)},
+            },
+        ),
+        migrations.CreateModel(
+            name='CarbonBalance',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('year', models.PositiveSmallIntegerField()),
+                ('month', models.PositiveSmallIntegerField()),
+                ('events_count', models.PositiveIntegerField(default=0)),
+                ('approved_kgco2e', models.DecimalField(decimal_places=6, default=0, max_digits=18)),
+                ('organization', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='carbon_balances', to='orgs.organization')),
+            ],
+            options={
+                'indexes': [models.Index(fields=['organization', 'year', 'month'], name='recycle_cor_organiz_1160f2_idx')],
+                'unique_together': {('organization', 'year', 'month')},
+            },
+        ),
+    ]

recycle_core/migrations/0004_alter_weighticket_pickup.py

+# Generated by Django 4.2.24 on 2025-09-30 09:56
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('recycle_core', '0003_materialemissionfactor_carbonevent_carbonbalance'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='weighticket',
+            name='pickup',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='weigh_tickets', to='recycle_core.pickuporder'),
+        ),
+    ]

recycle_core/migrations/0005_weighticket_finalized_at_weighticket_finalized_by_and_more.py

+# Generated by Django 4.2.24 on 2025-09-30 14:36
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('recycle_core', '0004_alter_weighticket_pickup'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='weighticket',
+            name='finalized_at',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='weighticket',
+            name='finalized_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='finalized_tickets', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='weighticket',
+            name='is_finalized',
+            field=models.BooleanField(default=False),
+        ),
+    ]

recycle_core/migrations/0006_alter_weighticket_options.py

+# Generated by Django 4.2.24 on 2025-09-30 14:58
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('recycle_core', '0005_weighticket_finalized_at_weighticket_finalized_by_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='weighticket',
+            options={'permissions': (('generate_invoice', 'Can generate invoice from weigh ticket'), ('edit_weigh_ticket', 'Can edit weigh ticket weights'))},
+        ),
+    ]

recycle_core/models.py

 
 
 class WeighTicket(TimestampedModel):
-    pickup = models.OneToOneField(PickupOrder, on_delete=models.CASCADE, related_name="weigh_ticket")
+    pickup = models.ForeignKey(PickupOrder, on_delete=models.CASCADE, related_name="weigh_tickets")
     ticket_number = models.CharField(max_length=64, blank=True)
     gross_weight = models.DecimalField(max_digits=12, decimal_places=3)
     tare_weight = models.DecimalField(max_digits=12, decimal_places=3)
     unit = models.CharField(max_length=8, choices=Material.UNIT_CHOICES, default=Material.UNIT_KG)
     recorded_by = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, blank=True, related_name="weigh_tickets")
     recorded_at = models.DateTimeField(default=timezone.now)
+    # Finalization controls
+    is_finalized = models.BooleanField(default=False)
+    finalized_by = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, blank=True, related_name="finalized_tickets")
+    finalized_at = models.DateTimeField(null=True, blank=True)
 
     class Meta:
         permissions = (
             ("generate_invoice", "Can generate invoice from weigh ticket"),
+            ("edit_weigh_ticket", "Can edit weigh ticket weights"),
         )
 
 
 
     class Meta:
         unique_together = ("listing", "invited_org")
+
+
+# Carbon accounting models ---------------------------------------------------
+
+
+class MaterialEmissionFactor(TimestampedModel):
+    """Emission factor for a given material per unit.
+
+    Values are in kgCO2e per given unit (default kg). Factors can be
+    organization-specific and time-bounded via effective dates.
+    """
+
+    organization = models.ForeignKey(Organization, on_delete=models.CASCADE, related_name="material_factors")
+    material = models.ForeignKey(Material, on_delete=models.CASCADE, related_name="emission_factors")
+    unit = models.CharField(max_length=8, choices=Material.UNIT_CHOICES, default=Material.UNIT_KG)
+    kgco2e_per_unit = models.DecimalField(max_digits=16, decimal_places=6)
+    source = models.CharField(max_length=255, blank=True)
+    effective_from = models.DateField(null=True, blank=True)
+    effective_to = models.DateField(null=True, blank=True)
+
+    class Meta:
+        indexes = [
+            models.Index(fields=["organization", "material", "unit"]),
+        ]
+        unique_together = ()
+
+    def __str__(self) -> str:  # pragma: no cover - simple display
+        return f"{self.material.name} {self.kgco2e_per_unit} kgCO2e/{self.unit}"
+
+
+class CarbonEvent(TimestampedModel):
+    """Calculated carbon impact event (e.g., from a weigh ticket line).
+
+    Events flow through an approvals queue before contributing to monthly
+    CarbonBalance aggregates.
+    """
+
+    STATUS_PENDING = "pending"
+    STATUS_APPROVED = "approved"
+    STATUS_REJECTED = "rejected"
+    STATUS_CHOICES = (
+        (STATUS_PENDING, "Pending"),
+        (STATUS_APPROVED, "Approved"),
+        (STATUS_REJECTED, "Rejected"),
+    )
+
+    organization = models.ForeignKey(Organization, on_delete=models.CASCADE, related_name="carbon_events")
+    weigh_ticket = models.ForeignKey(WeighTicket, on_delete=models.SET_NULL, null=True, blank=True, related_name="carbon_events")
+    # Optional linkage to a specific line for traceability
+    weigh_line = models.ForeignKey(WeighLine, on_delete=models.SET_NULL, null=True, blank=True, related_name="carbon_events")
+    material = models.ForeignKey(Material, on_delete=models.SET_NULL, null=True, blank=True)
+    quantity = models.DecimalField(max_digits=14, decimal_places=3)
+    unit = models.CharField(max_length=8, choices=Material.UNIT_CHOICES, default=Material.UNIT_KG)
+    kgco2e = models.DecimalField(max_digits=18, decimal_places=6)
+    event_date = models.DateTimeField(default=timezone.now, db_index=True)
+
+    status = models.CharField(max_length=16, choices=STATUS_CHOICES, default=STATUS_PENDING, db_index=True)
+    approved_by = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, blank=True, related_name="approved_carbon_events")
+    approved_at = models.DateTimeField(null=True, blank=True)
+    notes = models.TextField(blank=True)
+
+    class Meta:
+        indexes = [
+            models.Index(fields=["organization", "status"]),
+            models.Index(fields=["organization", "event_date"]),
+        ]
+        unique_together = ("weigh_line",)
+
+
+class CarbonBalance(TimestampedModel):
+    """Monthly aggregation of approved CarbonEvents per organization."""
+
+    organization = models.ForeignKey(Organization, on_delete=models.CASCADE, related_name="carbon_balances")
+    year = models.PositiveSmallIntegerField()
+    month = models.PositiveSmallIntegerField()
+    events_count = models.PositiveIntegerField(default=0)
+    approved_kgco2e = models.DecimalField(max_digits=18, decimal_places=6, default=0)
+
+    class Meta:
+        unique_together = ("organization", "year", "month")
+        indexes = [models.Index(fields=["organization", "year", "month"])]
+
+    def __str__(self) -> str:  # pragma: no cover - simple display
+        return f"{self.organization.code} {self.year}-{self.month:02d}"

recycle_core/services/billing.py

 
 
 def generate_invoice_for_pickup(pickup: PickupOrder) -> Invoice:
-    if getattr(pickup, "weigh_ticket", None) is None:
-        raise ValueError("Pickup has no weigh ticket")
+    if not pickup.weigh_tickets.exists():
+        raise ValueError("Pickup has no weigh tickets")
 
     # If invoice already exists and not void, return it (idempotent)
     existing = pickup.invoices.filter(status__in=[Invoice.STATUS_DRAFT, Invoice.STATUS_ISSUED, Invoice.STATUS_PAID]).first()
     total = Decimal("0.00")
     payout_total = Decimal("0.00")
 
-    for line in pickup.weigh_ticket.lines.all():
-        sell_price = _get_price(price_list, line.material_id, line.unit, PriceListItem.DIRECTION_SELL)
-        buy_price = _get_price(price_list, line.material_id, line.unit, PriceListItem.DIRECTION_BUY)
-
-        if sell_price is not None and sell_price > 0:
-            line_total = (Decimal(line.quantity) * Decimal(sell_price)).quantize(Decimal("0.01"))
-            InvoiceLine.objects.create(
-                invoice=inv,
-                description=f"{line.material.name} ({line.unit})",
-                material=line.material,
-                quantity=line.quantity,
-                unit=line.unit,
-                unit_price=sell_price,
-                line_total=line_total,
-            )
-            total += line_total
-
-        if buy_price is not None and buy_price > 0:
-            payout_total += (Decimal(line.quantity) * Decimal(buy_price)).quantize(Decimal("0.01"))
+    for t in pickup.weigh_tickets.all():
+        for line in t.lines.all():
+            sell_price = _get_price(price_list, line.material_id, line.unit, PriceListItem.DIRECTION_SELL)
+            buy_price = _get_price(price_list, line.material_id, line.unit, PriceListItem.DIRECTION_BUY)
+
+            if sell_price is not None and sell_price > 0:
+                line_total = (Decimal(line.quantity) * Decimal(sell_price)).quantize(Decimal("0.01"))
+                InvoiceLine.objects.create(
+                    invoice=inv,
+                    description=f"{line.material.name} ({line.unit})",
+                    material=line.material,
+                    quantity=line.quantity,
+                    unit=line.unit,
+                    unit_price=sell_price,
+                    line_total=line_total,
+                )
+                total += line_total
+
+            if buy_price is not None and buy_price > 0:
+                payout_total += (Decimal(line.quantity) * Decimal(buy_price)).quantize(Decimal("0.01"))
 
     inv.total_amount = total
     inv.issued_at = timezone.now()
     pickup.save(update_fields=["status"]) 
 
     return inv
+
+
+def regenerate_invoice_for_pickup(pickup: PickupOrder) -> Invoice:
+    existing = pickup.invoices.filter(status__in=[Invoice.STATUS_DRAFT, Invoice.STATUS_ISSUED, Invoice.STATUS_PAID]).first()
+    if not existing:
+        return generate_invoice_for_pickup(pickup)
+    if existing.status != Invoice.STATUS_DRAFT:
+        raise ValueError("Invoice not in draft status; cannot regenerate")
+
+    price_list = pickup.customer.price_list
+    if not price_list:
+        price_list = PriceList.objects.filter(organization=pickup.organization).order_by("id").first()
+    if not price_list:
+        raise ValueError("No price list found for customer or organization")
+
+    # Clear lines and rebuild
+    InvoiceLine.objects.filter(invoice=existing).delete()
+
+    total = Decimal("0.00")
+    payout_total = Decimal("0.00")
+    for t in pickup.weigh_tickets.all():
+        for line in t.lines.all():
+            sell_price = _get_price(price_list, line.material_id, line.unit, PriceListItem.DIRECTION_SELL)
+            buy_price = _get_price(price_list, line.material_id, line.unit, PriceListItem.DIRECTION_BUY)
+
+            if sell_price is not None and sell_price > 0:
+                line_total = (Decimal(line.quantity) * Decimal(sell_price)).quantize(Decimal("0.01"))
+                InvoiceLine.objects.create(
+                    invoice=existing,
+                    description=f"{line.material.name} ({line.unit})",
+                    material=line.material,
+                    quantity=line.quantity,
+                    unit=line.unit,
+                    unit_price=sell_price,
+                    line_total=line_total,
+                )
+                total += line_total
+
+            if buy_price is not None and buy_price > 0:
+                payout_total += (Decimal(line.quantity) * Decimal(buy_price)).quantize(Decimal("0.01"))
+
+    existing.total_amount = total
+    # Keep draft; do not auto issue
+    if not existing.currency_code:
+        existing.currency_code = price_list.currency_code
+    existing.save(update_fields=["total_amount", "currency_code", "updated_at"])
+    return existing

recycle_core/services/carbon.py

+from __future__ import annotations
+
+from datetime import date
+from decimal import Decimal
+from typing import Iterable
+
+from django.db import transaction
+from django.db.models import Q
+from django.utils import timezone
+
+from ..models import (
+    Organization,
+    Material,
+    WeighTicket,
+    WeighLine,
+    MaterialEmissionFactor,
+    CarbonEvent,
+    CarbonBalance,
+)
+
+
+LB_TO_KG = Decimal("0.45359237")
+
+
+def _convert_qty(qty: Decimal, from_unit: str, to_unit: str) -> Decimal:
+    if from_unit == to_unit:
+        return qty
+    # Minimal support: lb <-> kg; pcs assumed 1:1 (no conversion)
+    if from_unit == Material.UNIT_LB and to_unit == Material.UNIT_KG:
+        return (qty * LB_TO_KG).quantize(Decimal("0.000"))
+    if from_unit == Material.UNIT_KG and to_unit == Material.UNIT_LB:
+        return (qty / LB_TO_KG).quantize(Decimal("0.000"))
+    return qty
+
+
+def get_applicable_factor(org: Organization, material: Material, unit: str, as_of: date | None = None) -> MaterialEmissionFactor | None:
+    """Return the most recent factor effective for the given org/material/unit.
+
+    If none matches the unit, try the material's default unit as a fallback.
+    """
+    as_of = as_of or timezone.now().date()
+    qs = (
+        MaterialEmissionFactor.objects.filter(
+            organization=org,
+            material=material,
+            unit=unit,
+        )
+        .filter(Q(effective_from__isnull=True) | Q(effective_from__lte=as_of))
+        .order_by("-effective_from", "-id")
+    )
+    fac = qs.first()
+    if fac:
+        return fac
+    # fallback to default unit
+    if unit != material.default_unit:
+        qs2 = (
+            MaterialEmissionFactor.objects.filter(
+                organization=org,
+                material=material,
+                unit=material.default_unit,
+            )
+            .filter(Q(effective_from__isnull=True) | Q(effective_from__lte=as_of))
+            .order_by("-effective_from", "-id")
+        )
+        return qs2.first()
+    return None
+
+
+@transaction.atomic
+def create_event_for_line(line: WeighLine) -> CarbonEvent | None:
+    """Create or update a pending CarbonEvent for a given weigh line.
+
+    Returns the event or None if no factor available.
+    """
+    ticket = line.ticket
+    org = ticket.pickup.organization
+    fac = get_applicable_factor(org, line.material, line.unit)
+    if not fac:
+        # Try convert to factor unit
+        fac = get_applicable_factor(org, line.material, fac_unit := line.material.default_unit)
+        if not fac:
+            return None
+        qty = _convert_qty(Decimal(line.quantity), line.unit, fac.unit)
+    else:
+        qty = Decimal(line.quantity)
+    kgco2e = (qty * Decimal(fac.kgco2e_per_unit)).quantize(Decimal("0.000001"))
+
+    ev, _ = CarbonEvent.objects.update_or_create(
+        weigh_line=line,
+        defaults={
+            "organization": org,
+            "weigh_ticket": ticket,
+            "material": line.material,
+            "quantity": qty,
+            "unit": fac.unit,
+            "kgco2e": kgco2e,
+            "event_date": timezone.now(),
+            "status": CarbonEvent.STATUS_PENDING,
+        },
+    )
+    return ev
+
+
+def calculate_events_for_ticket(ticket: WeighTicket) -> list[CarbonEvent]:
+    events: list[CarbonEvent] = []
+    for ln in ticket.lines.select_related("material"):
+        ev = create_event_for_line(ln)
+        if ev:
+            events.append(ev)
+    return events
+
+
+def approve_events(org: Organization, events: Iterable[CarbonEvent], *, approver) -> int:
+    """Approve events and update monthly CarbonBalance aggregates.
+
+    Returns number approved.
+    """
+    approved = 0
+    months: set[tuple[int, int]] = set()
+    now = timezone.now()
+    for ev in events:
+        if ev.organization_id != org.id:
+            continue
+        if ev.status == CarbonEvent.STATUS_APPROVED:
+            continue
+        ev.status = CarbonEvent.STATUS_APPROVED
+        ev.approved_by = approver
+        ev.approved_at = now
+        ev.save(update_fields=["status", "approved_by", "approved_at", "updated_at"])
+        months.add((ev.event_date.year, ev.event_date.month))
+        approved += 1
+    # recompute balances for affected months
+    for (y, m) in months:
+        recompute_balance_for_month(org, y, m)
+    return approved
+
+
+def recompute_balance_for_month(org: Organization, year: int, month: int) -> CarbonBalance:
+    qs = CarbonEvent.objects.filter(
+        organization=org,
+        status=CarbonEvent.STATUS_APPROVED,
+        event_date__year=year,
+        event_date__month=month,
+    )
+    # Avoid circular import for Sum; simple loop to sum
+    total_val = Decimal("0")
+    cnt = 0
+    for ev in qs.only("kgco2e"):
+        total_val += Decimal(ev.kgco2e)
+        cnt += 1
+    bal, _ = CarbonBalance.objects.get_or_create(organization=org, year=year, month=month)
+    bal.events_count = cnt
+    bal.approved_kgco2e = total_val.quantize(Decimal("0.000001"))
+    bal.save(update_fields=["events_count", "approved_kgco2e", "updated_at"])
+    return bal
+
+
+def get_totals_for_org(org: Organization) -> dict[str, Decimal]:
+    """Convenience totals for dashboards."""
+    from django.utils.timezone import now
+
+    today = now().date()
+    y = today.year
+    m = today.month
+    bal = CarbonBalance.objects.filter(organization=org, year=y, month=m).first()
+    pending = CarbonEvent.objects.filter(organization=org, status=CarbonEvent.STATUS_PENDING).count()
+    return {
+        "pending_events": pending,
+        "approved_mtd": (bal.approved_kgco2e if bal else Decimal("0")),
+    }

recycle_core/signals.py

+from __future__ import annotations
+
+from django.db.models.signals import post_save
+from django.dispatch import receiver
+
+from .models import WeighLine
+from .services.carbon import create_event_for_line
+
+
+@receiver(post_save, sender=WeighLine)
+def weigh_line_saved(sender, instance: WeighLine, created: bool, **kwargs):
+    try:
+        create_event_for_line(instance)
+    except Exception:
+        # Fail silently to not block core operations
+        pass
+

recycle_core/templates/recycle_core/carbon_events_list.html

+{% extends 'admin_frontend/base.html' %}
+{% load i18n humanize %}
+{% block title %}{% trans "Carbon Events" %}{% endblock %}
+{% block content %}
+<div class="max-w-6xl mx-auto">
+  <h1 class="text-2xl font-semibold mb-4">{% trans "Carbon Events" %}</h1>
+  <div class="bg-white rounded shadow p-4 mb-4">
+    <form method="get" class="grid md:grid-cols-4 gap-3">
+      {{ filter.form.organization }}
+      {{ filter.form.status }}
+      {{ filter.form.event_date }}
+      <div>
+        <button class="px-3 py-2 rounded bg-blue-600 text-white">{% trans "Filter" %}</button>
+      </div>
+    </form>
+  </div>
+  <form method="post" class="bg-white rounded shadow">
+    {% csrf_token %}
+    <div class="p-3 flex items-center gap-2 border-b">
+      <select name="action" class="border rounded px-2 py-1">
+        <option value="">-- {% trans "Bulk action" %} --</option>
+        <option value="approve">{% trans "Approve" %}</option>
+        <option value="reject">{% trans "Reject" %}</option>
+      </select>
+      <button class="px-3 py-1 rounded bg-gray-800 text-white">{% trans "Apply" %}</button>
+    </div>
+    <div class="overflow-x-auto">
+      <table class="min-w-full text-sm">
+        <thead>
+          <tr class="text-left text-gray-600">
+            <th class="px-3 py-2"><input type="checkbox" onclick="document.querySelectorAll('input[name=\'ids\']').forEach(cb=>cb.checked=this.checked)"></th>
+            <th class="px-3 py-2">{% trans "Date" %}</th>
+            <th class="px-3 py-2">{% trans "Organization" %}</th>
+            <th class="px-3 py-2">{% trans "Ticket" %}</th>
+            <th class="px-3 py-2">{% trans "Material" %}</th>
+            <th class="px-3 py-2 text-right">{% trans "Qty" %}</th>
+            <th class="px-3 py-2">{% trans "Unit" %}</th>
+            <th class="px-3 py-2 text-right">{% trans "kgCO2e" %}</th>
+            <th class="px-3 py-2">{% trans "Status" %}</th>
+          </tr>
+        </thead>
+        <tbody>
+          {% for ev in events %}
+          <tr class="border-t">
+            <td class="px-3 py-2"><input type="checkbox" name="ids" value="{{ ev.id }}"></td>
+            <td class="px-3 py-2 whitespace-nowrap">{{ ev.event_date|date:"Y-m-d H:i" }}</td>
+            <td class="px-3 py-2">{{ ev.organization.name }}</td>
+            <td class="px-3 py-2">{% if ev.weigh_ticket %}{{ ev.weigh_ticket.ticket_number|default:ev.weigh_ticket.id }}{% else %}-{% endif %}</td>
+            <td class="px-3 py-2">{{ ev.material|default:"-" }}</td>
+            <td class="px-3 py-2 text-right">{{ ev.quantity|floatformat:2|intcomma }}</td>
+            <td class="px-3 py-2">{{ ev.unit }}</td>
+            <td class="px-3 py-2 text-right">{{ ev.kgco2e|floatformat:2|intcomma }}</td>
+            <td class="px-3 py-2">{{ ev.get_status_display }}</td>
+          </tr>
+          {% empty %}
+          <tr><td colspan="9" class="px-3 py-6 text-center text-gray-600">{% trans "No events found." %}</td></tr>
+          {% endfor %}
+        </tbody>
+      </table>
+    </div>
+    {% include 'admin_frontend/_pagination.html' %}
+  </form>
+</div>
+{% endblock %}

recycle_core/templates/recycle_core/emission_factor_form.html

+{% extends "admin_frontend/base.html" %}
+{% load breadcrumbs %}
+{% block title %}Edit Emission Factor{% endblock %}
+{% block content %}
+{% render_breadcrumbs breadcrumbs %}
+<div class="max-w-2xl mx-auto bg-white rounded shadow p-4">
+  <h1 class="text-xl font-semibold mb-3">Edit Emission Factor</h1>
+  <form method="post">
+    {% csrf_token %}
+    {% include 'admin_frontend/_form.html' with form=form submit_label='Save' %}
+  </form>
+  <div class="mt-3">
+    <a class="btn-outline" href="{{ cancel_url }}">Cancel</a>
+  </div>
+  
+</div>
+{% endblock %}
+

recycle_core/templates/recycle_core/emission_factors_list.html

+{% extends "admin_frontend/base.html" %}
+{% load crispy_forms_tags breadcrumbs %}
+{% block title %}Emission Factors{% endblock %}
+{% block content %}
+{% render_breadcrumbs breadcrumbs %}
+<div class="flex items-center justify-between mb-4">
+  <h1 class="text-2xl font-semibold">Emission Factors</h1>
+  <details class="relative">
+    <summary class="cursor-pointer px-3 py-2 bg-blue-600 text-white rounded">New Factor</summary>
+    <div class="absolute right-0 mt-2 bg-white shadow rounded p-4 w-96">
+      {% include 'admin_frontend/_form.html' with form=form submit_label='Create' %}
+    </div>
+  </details>
+  
+</div>
+
+<div class="bg-white rounded shadow p-4 mb-4">
+  <form method="get" class="space-y-3 flex gap-2">
+    {{ 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 'recycle_core:emission_factors_list' %}" class="btn-outline">Reset</a>
+    </div>
+  </form>
+</div>
+
+<div class="bg-white rounded shadow">
+  <div class="p-4 border-b">
+    <h2 class="font-medium">Factors</h2>
+  </div>
+  <div class="overflow-x-auto">
+    <table class="min-w-full">
+      <thead>
+        <tr class="text-left text-sm text-gray-600">
+          <th class="px-4 py-2">Organization</th>
+          <th class="px-4 py-2">Material</th>
+          <th class="px-4 py-2">Unit</th>
+          <th class="px-4 py-2">kgCO2e/unit</th>
+          <th class="px-4 py-2">Source</th>
+          <th class="px-4 py-2">Effective</th>
+          <th class="px-4 py-2">Actions</th>
+        </tr>
+      </thead>
+      <tbody class="divide-y">
+        {% for f in factors %}
+        <tr>
+          <td class="px-4 py-2">{{ f.organization.name }}</td>
+          <td class="px-4 py-2">{{ f.material.name }}</td>
+          <td class="px-4 py-2">{{ f.unit }}</td>
+          <td class="px-4 py-2">{{ f.kgco2e_per_unit }}</td>
+          <td class="px-4 py-2">{{ f.source|default:'-' }}</td>
+          <td class="px-4 py-2">{{ f.effective_from|date:'Y-m-d' }}{% if f.effective_to %} → {{ f.effective_to|date:'Y-m-d' }}{% endif %}</td>
+          <td class="px-4 py-2 space-x-2">
+            <a class="text-blue-600 hover:underline" href="{% url 'recycle_core:emission_factor_edit' f.id %}">Edit</a>
+            <form method="post" action="{% url 'recycle_core:emission_factor_delete' f.id %}" class="inline">
+              {% csrf_token %}
+              <button class="text-red-600 hover:underline" onclick="return confirm('Delete factor?')">Delete</button>
+            </form>
+          </td>
+        </tr>
+        {% empty %}
+        <tr>
+          <td class="px-4 py-4 text-gray-500" colspan="7">No factors.</td>
+        </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+  </div>
+  {% include 'admin_frontend/_pagination.html' %}
+</div>
+{% endblock %}
+

recycle_core/templates/recycle_core/invoice_detail.html

+{% extends "admin_frontend/base.html" %}
+{% load breadcrumbs humanize %}
+{% block title %}Invoice #{{ invoice.id }}{% endblock %}
+{% block content %}
+{% render_breadcrumbs breadcrumbs %}
+
+<div class="flex items-center justify-between mb-4">
+  <div class="flex items-center gap-3">
+    {% if invoice.pickup_id %}
+      <a class="btn-outline" href="{% url 'recycle_core:pickup_detail' invoice.pickup_id %}">Back to Pickup</a>
+    {% endif %}
+    <h1 class="text-2xl font-semibold">Invoice #{{ invoice.id }}</h1>
+  </div>
+  <div class="text-sm text-gray-600">Status: <span class="px-2 py-1 rounded bg-gray-100">{{ invoice.status }}</span></div>
+</div>
+
+<div class="grid grid-cols-1 md:grid-cols-10 gap-6">
+  <div class="bg-white rounded shadow p-4 md:col-span-4">
+    <h2 class="font-medium mb-2">Details</h2>
+    <dl class="grid grid-cols-3 gap-2 text-sm">
+      <dt class="text-gray-500">Organization</dt><dd class="col-span-2">{{ invoice.organization.name }}</dd>
+      <dt class="text-gray-500">Customer</dt><dd class="col-span-2">{{ invoice.customer.name }}</dd>
+      <dt class="text-gray-500">Issued</dt><dd class="col-span-2">{{ invoice.issued_at|default:"-" }}</dd>
+      <dt class="text-gray-500">Due</dt><dd class="col-span-2">{{ invoice.due_at|default:"-" }}</dd>
+      <dt class="text-gray-500">Currency</dt><dd class="col-span-2">{{ invoice.currency_code }}</dd>
+      <dt class="text-gray-500">Total</dt><dd class="col-span-2 text-right">{{ invoice.total_amount|floatformat:2|intcomma }} {{ invoice.currency_code }}</dd>
+      <dt class="text-gray-500">Paid</dt><dd class="col-span-2 text-right">{{ payments_total|floatformat:2|intcomma }} {{ invoice.currency_code }}</dd>
+      <dt class="text-gray-500">Balance</dt><dd class="col-span-2 text-right">{{ balance|floatformat:2|intcomma }} {{ invoice.currency_code }}</dd>
+    </dl>
+  </div>
+  <div class="bg-white rounded shadow p-4 md:col-span-6">
+    <h2 class="font-medium mb-2">Lines</h2>
+    <table class="min-w-full">
+      <thead>
+        <tr class="text-left text-sm text-gray-600">
+          <th class="px-2 py-1">Description</th>
+          <th class="px-2 py-1 text-right">Qty</th>
+          <th class="px-2 py-1 text-right">Unit</th>
+          <th class="px-2 py-1 text-right">Unit Price</th>
+          <th class="px-2 py-1 text-right">Line Total</th>
+        </tr>
+      </thead>
+      <tbody class="divide-y">
+        {% for line in invoice.lines.all %}
+        <tr>
+          <td class="px-2 py-1">{{ line.description|default:"-" }}</td>
+          <td class="px-2 py-1 text-right">{{ line.quantity|floatformat:3|intcomma }}</td>
+          <td class="px-2 py-1 text-right">{{ line.unit }}</td>
+          <td class="px-2 py-1 text-right">{{ line.unit_price|floatformat:2|intcomma }}</td>
+          <td class="px-2 py-1 text-right">{{ line.line_total|floatformat:2|intcomma }}</td>
+        </tr>
+        {% empty %}
+        <tr>
+          <td class="px-2 py-2 text-gray-500" colspan="5">No lines.</td>
+        </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+  </div>
+</div>
+
+<div class="mt-6 grid grid-cols-1 md:grid-cols-10 gap-6">
+  <div class="bg-white rounded shadow p-4 md:col-span-6">
+    <h2 class="font-medium mb-2">Payments</h2>
+    <table class="min-w-full">
+      <thead>
+        <tr class="text-left text-sm text-gray-600">
+          <th class="px-2 py-1">Amount</th>
+          <th class="px-2 py-1">Received At</th>
+          <th class="px-2 py-1">Reference</th>
+        </tr>
+      </thead>
+      <tbody class="divide-y">
+        {% for p in invoice.payments.all %}
+        <tr>
+          <td class="px-2 py-1">{{ p.amount|floatformat:2|intcomma }} {{ invoice.currency_code }}</td>
+          <td class="px-2 py-1">{{ p.received_at|default:"-" }}</td>
+          <td class="px-2 py-1">{{ p.reference|default:"-" }}</td>
+        </tr>
+        {% empty %}
+        <tr>
+          <td class="px-2 py-2 text-gray-500" colspan="3">No payments recorded.</td>
+        </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+  </div>
+  <div class="bg-white rounded shadow p-4 md:col-span-4">
+    <h2 class="font-medium mb-2">Add Payment</h2>
+    <form method="post" action="{% url 'billing:invoice_add_payment' invoice.id %}">
+      {% csrf_token %}
+      {% include 'admin_frontend/_form.html' with form=pay_form submit_label='Record Payment' %}
+    </form>
+  </div>
+  <div class="bg-white rounded shadow p-4 md:col-span-4">
+    <h2 class="font-medium mb-2">Update Status</h2>
+    <form method="post" action="{% url 'billing:invoice_set_status' invoice.id %}">
+      {% csrf_token %}
+      <div class="flex items-end gap-3">
+        <div>
+          <label class="block text-sm text-gray-600 mb-1">Status</label>
+          <select name="status" class="border rounded px-3 py-2">
+            {% for code,label in status_choices %}
+              <option value="{{ code }}" {% if invoice.status == code %}selected{% endif %}>{{ label }}</option>
+            {% endfor %}
+          </select>
+        </div>
+        <div>
+          <button class="px-3 py-2 rounded bg-gray-800 text-white">Update</button>
+        </div>
+      </div>
+    </form>
+  </div>
+</div>
+
+{% endblock %}

recycle_core/templates/recycle_core/invoices_list.html

     <tbody class="divide-y divide-gray-200">
       {% for inv in invoices %}
       <tr>
-        <td class="px-4 py-2">{{ inv.customer.name }}</td>
+        <td class="px-4 py-2"><a class="text-blue-700 hover:underline" href="{% url 'billing:invoice_detail' inv.id %}">{{ inv.customer.name }}</a></td>
         <td class="px-4 py-2">{{ inv.total_amount }} {{ inv.currency_code }}</td>
         <td class="px-4 py-2">{{ inv.payments_total|default:0 }} {{ inv.currency_code }}</td>
         <td class="px-4 py-2">{{ inv.balance }} {{ inv.currency_code }}</td>
                 </form>
               </div>
             </details>
+            <a class="btn-outline btn-xs" href="{% url 'billing:invoice_detail' inv.id %}">View</a>
           </div>
         </td>
       </tr>

recycle_core/templates/recycle_core/pickup_detail.html

 {% extends "admin_frontend/base.html" %}
-{% load breadcrumbs %}
+{% load breadcrumbs humanize %}
 {% block title %}Pickup #{{ pickup.id }}{% endblock %}
 {% block content %}
 {% render_breadcrumbs breadcrumbs %}
 <div class="flex items-center justify-between mb-4">
   <h1 class="text-2xl font-semibold">Pickup #{{ pickup.id }}</h1>
   <div class="flex items-center gap-2">
-    {% if pickup.weigh_ticket %}
-      <a class="btn-outline" href="{% url 'recycle_core:weigh_ticket_detail' pickup.weigh_ticket.id %}">View Weigh Ticket</a>
-      {% if perms.recycle_core.generate_invoice %}
+    {% if perms.recycle_core.create_weigh_ticket %}
+      <a class="px-3 py-2 rounded bg-blue-600 text-white" href="{% url 'recycle_core:pickup_create_weigh_ticket' pickup.id %}">Create Weigh Ticket</a>
+    {% endif %}
+    {% if perms.recycle_core.generate_invoice %}
       <form method="post" action="{% url 'recycle_core:pickup_generate_invoice' pickup.id %}">
         {% csrf_token %}
         <button class="px-3 py-2 rounded bg-blue-600 text-white">Generate Invoice</button>
       </form>
-      {% endif %}
-    {% else %}
-      {% if perms.recycle_core.create_weigh_ticket %}
-      <a class="px-3 py-2 rounded bg-blue-600 text-white" href="{% url 'recycle_core:pickup_create_weigh_ticket' pickup.id %}">Create Weigh Ticket</a>
-      {% endif %}
     {% endif %}
   </div>
   
 </div>
 
-<div class="grid grid-cols-1 md:grid-cols-2 gap-6">
+<div class="grid grid-cols-1 gap-6">
   <div class="bg-white rounded shadow p-4">
     <h2 class="font-medium mb-2">Details</h2>
     <dl class="grid grid-cols-3 gap-2 text-sm">
         {% endfor %}
       </tbody>
     </table>
+    <div class="mt-4 border-t pt-4">
+      <h3 class="font-medium mb-2">Add Item</h3>
+      <form method="post">
+        {% csrf_token %}
+        <input type="hidden" name="action" value="add_item">
+        <div class="grid grid-cols-1 md:grid-cols-4 gap-3 items-end">
+          <div>
+            <label class="block text-sm text-gray-600 mb-1">Material</label>
+            {{ add_item_form.material }}
+          </div>
+          <div>
+            <label class="block text-sm text-gray-600 mb-1">Est. Quantity</label>
+            {{ add_item_form.estimated_qty }}
+          </div>
+          <div>
+            <label class="block text-sm text-gray-600 mb-1">Unit</label>
+            {{ add_item_form.unit }}
+          </div>
+          <div>
+            <button class="px-3 py-2 rounded bg-blue-600 text-white">Add</button>
+          </div>
+        </div>
+      </form>
+    </div>
   </div>
 </div>
 
-<div class="mt-6 bg-white rounded shadow p-4">
+<div id="tickets" class="mt-6 bg-white rounded shadow p-4">
   <h2 class="font-medium mb-2">Weigh Tickets</h2>
-  <table class="min-w-full">
+  <div class="overflow-x-auto">
+  <table class="min-w-[1100px]">
     <thead>
       <tr class="text-left text-sm text-gray-600">
         <th class="px-2 py-1">Ticket</th>
         <th class="px-2 py-1">Recorded</th>
         <th class="px-2 py-1">Net</th>
+        <th class="px-2 py-1 text-right">Unit Price</th>
+        <th class="px-2 py-1 text-right">Total</th>
         <th class="px-2 py-1">Actions</th>
       </tr>
     </thead>
     <tbody class="divide-y">
-      {% if pickup.weigh_ticket %}
+      {% for t in pickup.weigh_tickets.all %}
         <tr>
-          <td class="px-2 py-1"><a class="text-blue-700 hover:underline" href="{% url 'recycle_core:weigh_ticket_detail' pickup.weigh_ticket.id %}">{{ pickup.weigh_ticket.ticket_number|default:pickup.weigh_ticket.id }}</a></td>
-          <td class="px-2 py-1">{{ pickup.weigh_ticket.recorded_at }}</td>
-          <td class="px-2 py-1">{{ pickup.weigh_ticket.net_weight }} {{ pickup.weigh_ticket.unit }}</td>
+          <td class="px-2 py-1"><a class="text-blue-700 hover:underline" href="{% url 'recycle_core:weigh_ticket_detail' t.id %}">{{ t.ticket_number|default:t.id }}</a></td>
+          <td class="px-2 py-1">{{ t.recorded_at }}</td>
+          <td class="px-2 py-1">{{ t.net_weight }} {{ t.unit }}</td>
+          <td class="px-2 py-1 text-right">{% if t.avg_unit %}{{ t.avg_unit|floatformat:2|intcomma }} {{ ticket_currency }}{% else %}-{% endif %}</td>
+          <td class="px-2 py-1 text-right">{% if t.total_value %}{{ t.total_value|floatformat:2|intcomma }} {{ ticket_currency }}{% else %}-{% endif %}</td>
           <td class="px-2 py-1">
             {% if perms.recycle_core.generate_invoice %}
-            <form method="post" action="{% url 'recycle_core:weigh_ticket_generate_invoice' pickup.weigh_ticket.id %}">
+            <form method="post" action="{% url 'recycle_core:weigh_ticket_generate_invoice' t.id %}">
               {% csrf_token %}
               <button class="btn-outline btn-xs">Generate Invoice</button>
             </form>
             {% endif %}
           </td>
         </tr>
-      {% else %}
+      {% empty %}
         <tr>
           <td colspan="4" class="px-2 py-2 text-gray-500">No weigh tickets yet.</td>
         </tr>
-      {% endif %}
+      {% endfor %}
     </tbody>
   </table>
+  </div>
 
-  {% if not pickup.weigh_ticket %}
-    <div class="mt-3">
+  <div class="mt-3">
+    {% if perms.recycle_core.create_weigh_ticket %}
       <a class="btn" href="{% url 'recycle_core:pickup_create_weigh_ticket' pickup.id %}">Create Weigh Ticket</a>
-    </div>
-  {% endif %}
+    {% endif %}
+  </div>
+</div>
+
+<div class="mt-6 bg-white rounded shadow p-4">
+  <h2 class="font-medium mb-2">Invoices</h2>
+  <div class="overflow-x-auto">
+  <table class="min-w-[1100px]">
+    <thead>
+      <tr class="text-left text-sm text-gray-600">
+        <th class="px-2 py-1">Invoice</th>
+        <th class="px-2 py-1">Customer</th>
+        <th class="px-2 py-1 text-right">Total</th>
+        <th class="px-2 py-1 text-right">Paid</th>
+        <th class="px-2 py-1 text-right">Balance</th>
+        <th class="px-2 py-1">Status</th>
+        <th class="px-2 py-1">Issued</th>
+        <th class="px-2 py-1">Actions</th>
+      </tr>
+    </thead>
+    <tbody class="divide-y">
+      {% for inv in invoices %}
+      <tr>
+        <td class="px-2 py-1"><a class="text-blue-700 hover:underline" href="{% url 'billing:invoice_detail' inv.id %}">#{{ inv.id }}</a></td>
+        <td class="px-2 py-1">{{ inv.customer.name }}</td>
+        <td class="px-2 py-1 text-right">{{ inv.total_amount|floatformat:2|intcomma }} {{ inv.currency_code }}</td>
+        <td class="px-2 py-1 text-right">{{ inv.payments_total|default:0|floatformat:2|intcomma }} {{ inv.currency_code }}</td>
+        <td class="px-2 py-1 text-right">{{ inv.balance|floatformat:2|intcomma }} {{ inv.currency_code }}</td>
+        <td class="px-2 py-1"><span class="px-2 py-1 rounded bg-gray-100 text-gray-700">{{ inv.status }}</span></td>
+        <td class="px-2 py-1">{{ inv.issued_at|default:"-" }}</td>
+        <td class="px-2 py-1">
+          <div class="flex items-center gap-2">
+            <a class="btn-outline btn-xs" href="{% url 'billing:invoice_detail' inv.id %}">View</a>
+            {% if inv.status == 'draft' %}
+            <form method="post" action="{% url 'recycle_core:pickup_regenerate_invoice' pickup.id %}">
+              {% csrf_token %}
+              <button class="btn btn-xs" onclick="return confirm('Regenerate draft invoice from current tickets?')">Regenerate</button>
+            </form>
+            {% endif %}
+          </div>
+        </td>
+      </tr>
+      {% empty %}
+      <tr>
+        <td class="px-2 py-2 text-gray-500" colspan="8">No invoices for this pickup.</td>
+      </tr>
+      {% endfor %}
+    </tbody>
+  </table>
+  </div>
 </div>
 
 {% endblock %}

recycle_core/templates/recycle_core/pickups_list.html

               <button class="btn btn-xs">Update</button>
             </form>
             {% endif %}
-            {% if p.weigh_ticket %}
-              {% if perms.recycle_core.generate_invoice %}
-              <form method="post" action="{% url 'recycle_core:pickup_generate_invoice' p.id %}">
-                {% csrf_token %}
-                <button class="btn btn-xs">Generate Invoice</button>
-              </form>
-              {% endif %}
-              <a class="btn-outline btn-xs" href="{% url 'recycle_core:weigh_ticket_detail' p.weigh_ticket.id %}">View Ticket</a>
-            {% else %}
-              {% if perms.recycle_core.create_weigh_ticket %}
-              <a class="btn btn-xs" href="{% url 'recycle_core:pickup_create_weigh_ticket' p.id %}">Create Weigh Ticket</a>
-              {% endif %}
+            {% if perms.recycle_core.generate_invoice %}
+            <form method="post" action="{% url 'recycle_core:pickup_generate_invoice' p.id %}">
+              {% csrf_token %}
+              <button class="btn btn-xs">Generate Invoice</button>
+            </form>
+            {% endif %}
+            {% if perms.recycle_core.create_weigh_ticket %}
+            <a class="btn btn-xs" href="{% url 'recycle_core:pickup_create_weigh_ticket' p.id %}">Create Weigh Ticket</a>
             {% endif %}
+            {% with count=p.weigh_tickets.count %}
+              {% if count %}
+                <span class="text-xs text-gray-600">{{ count }} ticket{{ count|pluralize }}</span>
+                <a class="btn-outline btn-xs" href="{% url 'recycle_core:pickup_detail' p.id %}#tickets">View</a>
+              {% endif %}
+            {% endwith %}
           </div>
         </td>
       </tr>

recycle_core/templates/recycle_core/user_form.html

         {% endif %}
       </div>
     {% endif %}
+    {% if form_extras %}
+    <div class="mt-4">
+      <h3 class="text-sm font-semibold mb-2">Contact & Address</h3>
+      {{ form_extras|crispy }}
+    </div>
+    {% endif %}
     {% if form_photo %}
     <div class="mt-4">
       <h3 class="text-sm font-semibold mb-2">Profile Photo</h3>

recycle_core/templates/recycle_core/weigh_ticket_detail.html

 {% extends "admin_frontend/base.html" %}
-{% load breadcrumbs %}
+{% load breadcrumbs widget_tweaks humanize %}
 {% block title %}Weigh Ticket {{ ticket.ticket_number|default:ticket.id }}{% endblock %}
 {% block content %}
 {% render_breadcrumbs breadcrumbs %}
       <button class="px-3 py-2 rounded bg-blue-600 text-white">Generate Invoice</button>
     </form>
     {% endif %}
+    <form method="post" action="{% url 'recycle_core:weigh_ticket_recalc_carbon' ticket.id %}">
+      {% csrf_token %}
+      <button class="px-3 py-2 rounded bg-gray-700 text-white">Recalculate Carbon</button>
+    </form>
   </div>
 </div>
 
-<div class="grid grid-cols-1 md:grid-cols-2 gap-6 mb-6">
-  <div class="bg-white rounded shadow p-4">
+<div class="grid grid-cols-1 md:grid-cols-10 gap-6 mb-6">
+  <div class="bg-white rounded shadow p-4 md:col-span-3">
     <h2 class="font-medium mb-2">Details</h2>
     <dl class="grid grid-cols-3 gap-2 text-sm">
       <dt class="text-gray-500">Pickup</dt><dd class="col-span-2"><a class="text-blue-700 hover:underline" href="{% url 'recycle_core:pickup_detail' ticket.pickup.id %}">#{{ ticket.pickup.id }}</a></dd>
       <dt class="text-gray-500">Customer</dt><dd class="col-span-2">{{ ticket.pickup.customer.name }}</dd>
       <dt class="text-gray-500">Recorded</dt><dd class="col-span-2">{{ ticket.recorded_at }}</dd>
-      <dt class="text-gray-500">Gross</dt><dd class="col-span-2">{{ ticket.gross_weight }} {{ ticket.unit }}</dd>
-      <dt class="text-gray-500">Tare</dt><dd class="col-span-2">{{ ticket.tare_weight }} {{ ticket.unit }}</dd>
-      <dt class="text-gray-500">Net</dt><dd class="col-span-2">{{ ticket.net_weight }} {{ ticket.unit }}</dd>
+      <dt class="text-gray-500">Gross</dt><dd class="col-span-2 text-right">{{ ticket.gross_weight|floatformat:3|intcomma }} {{ ticket.unit }}</dd>
+      <dt class="text-gray-500">Tare</dt><dd class="col-span-2 text-right">{{ ticket.tare_weight|floatformat:3|intcomma }} {{ ticket.unit }}</dd>
+      <dt class="text-gray-500">Net</dt><dd class="col-span-2 text-right">{{ ticket.net_weight|floatformat:3|intcomma }} {{ ticket.unit }}</dd>
+      <dt class="text-gray-500">Finalized</dt><dd class="col-span-2">{% if is_finalized %}Yes{% else %}No{% endif %}</dd>
     </dl>
+    {% if not is_finalized %}
+    <div class="mt-4 space-y-2">
+      {% if allow_adjust_net %}
+      <form method="post">
+        {% csrf_token %}
+        <input type="hidden" name="action" value="adjust_net_to_lines">
+        <button class="px-3 py-2 rounded bg-gray-800 text-white w-full">Adjust Net to Lines</button>
+      </form>
+      {% endif %}
+      {% if allow_residual %}
+      <form method="post">
+        {% csrf_token %}
+        <input type="hidden" name="action" value="add_residual_line">
+        <button class="px-3 py-2 rounded bg-gray-700 text-white w-full">Add Residual Line</button>
+      </form>
+      {% endif %}
+      <form method="post">
+        {% csrf_token %}
+        <input type="hidden" name="action" value="finalize_ticket">
+        <button class="px-3 py-2 rounded bg-blue-600 text-white w-full">Finalize Ticket</button>
+      </form>
+    </div>
+    {% endif %}
+    {% if perms.recycle_core.edit_weigh_ticket and not is_finalized %}
+      <div class="mt-6 border-t pt-4">
+        <button type="button" class="px-3 py-2 rounded bg-emerald-600 text-white w-full" onclick="document.getElementById('edit-weights-modal').classList.remove('hidden')">Edit Weights</button>
+      </div>
+      <!-- Modal -->
+      <div id="edit-weights-modal" class="hidden fixed inset-0 z-50">
+        <div class="absolute inset-0 bg-black/50" onclick="document.getElementById('edit-weights-modal').classList.add('hidden')"></div>
+        <div class="relative max-w-md w-full mx-auto mt-20 bg-white rounded shadow p-4">
+          <div class="flex items-center justify-between mb-2">
+            <h3 class="font-medium">Edit Weights</h3>
+            <button type="button" class="text-gray-600 hover:text-gray-800" onclick="document.getElementById('edit-weights-modal').classList.add('hidden')">✕</button>
+          </div>
+          <form method="post" class="grid grid-cols-1 gap-3">
+            {% csrf_token %}
+            <input type="hidden" name="action" value="edit_weights">
+            {% if weights_form.non_field_errors %}
+              <div class="text-red-700 text-sm">{{ weights_form.non_field_errors }}</div>
+            {% endif %}
+            <div>
+              <label class="block text-sm text-gray-600 mb-1">Gross</label>
+              {{ weights_form.gross_weight|attr:"class:w-full max-w-full text-right" }}
+              {% if weights_form.gross_weight.errors %}
+                <div class="text-red-700 text-xs mt-1">{{ weights_form.gross_weight.errors|striptags }}</div>
+              {% endif %}
+            </div>
+            <div>
+              <label class="block text-sm text-gray-600 mb-1">Tare</label>
+              {{ weights_form.tare_weight|attr:"class:w-full max-w-full text-right" }}
+              {% if weights_form.tare_weight.errors %}
+                <div class="text-red-700 text-xs mt-1">{{ weights_form.tare_weight.errors|striptags }}</div>
+              {% endif %}
+            </div>
+            <div>
+              <label class="block text-sm text-gray-600 mb-1">Unit</label>
+              {% if lines %}
+                <div title="Cannot change unit while lines exist">
+                  {{ weights_form.unit|attr:"class:w-full max-w-full"|attr:"disabled:disabled" }}
+                  <input type="hidden" name="unit" value="{{ weights_form.unit.value|default:ticket.unit }}" />
+                </div>
+              {% else %}
+                  {{ weights_form.unit|attr:"class:w-full max-w-full" }}
+              {% endif %}
+              {% if weights_form.unit.errors %}
+                <div class="text-red-700 text-xs mt-1">{{ weights_form.unit.errors|striptags }}</div>
+              {% endif %}
+            </div>
+            <div class="flex items-center justify-end gap-2 pt-1">
+              <button type="button" class="px-3 py-2 rounded border border-gray-300 text-gray-700" onclick="document.getElementById('edit-weights-modal').classList.add('hidden')">Cancel</button>
+              <button class="px-3 py-2 rounded bg-emerald-600 text-white">Save</button>
+            </div>
+          </form>
+        </div>
+      </div>
+    {% endif %}
   </div>
-  <div class="bg-white rounded shadow p-4">
+  <div class="bg-white rounded shadow p-4 md:col-span-7">
     <h2 class="font-medium mb-2">Lines</h2>
+    <div class="text-sm mb-3">
+      <div>
+        <span class="text-gray-600">Net Weight:</span>
+        <span class="font-medium">{{ ticket.net_weight }} {{ ticket.unit }}</span>
+      </div>
+      <div>
+        <span class="text-gray-600">Sum of Lines ({{ ticket.unit }}):</span>
+        <span class="font-medium">{{ lines_sum }} {{ ticket.unit }}</span>
+        {% if has_unconvertible %}
+          <span class="ml-2 text-xs text-amber-700">Includes unconverted items (different units)</span>
+        {% endif %}
+      </div>
+      <div>
+        <span class="text-gray-600">Difference:</span>
+        <span class="font-medium {% if lines_delta != 0 %}text-red-700{% endif %}">{{ lines_delta }} {{ ticket.unit }}</span>
+      </div>
+    </div>
     <table class="min-w-full">
       <thead>
         <tr class="text-left text-sm text-gray-600">
           <th class="px-2 py-1">Material</th>
-          <th class="px-2 py-1">Qty</th>
+          <th class="px-2 py-1 text-right">Qty</th>
           <th class="px-2 py-1">Unit</th>
+          <th class="px-2 py-1">Actions</th>
         </tr>
       </thead>
       <tbody class="divide-y">
         {% for line in lines %}
           <tr>
-            <td class="px-2 py-1">{{ line.material.name }}</td>
-            <td class="px-2 py-1">{{ line.quantity }}</td>
-            <td class="px-2 py-1">{{ line.unit }}</td>
+            <form method="post">
+              {% csrf_token %}
+              <input type="hidden" name="action" value="edit">
+              <input type="hidden" name="line_id" value="{{ line.id }}">
+              <td class="px-2 py-1">{{ line.form.material|attr:"class:w-full max-w-full" }}</td>
+              <td class="px-2 py-1 text-right">{{ line.form.quantity|attr:"class:w-full max-w-full text-right" }}</td>
+              <td class="px-2 py-1">{{ line.form.unit|attr:"class:w-full max-w-full" }}</td>
+              <td class="px-2 py-1">
+                <button class="px-2 py-1 rounded bg-blue-600 text-white text-sm">Save</button>
+                <button form="del-line-{{ line.id }}" class="px-2 py-1 rounded bg-red-600 text-white text-sm" onclick="return confirm('Delete this line?')">Delete</button>
+              </td>
+            </form>
+            <form id="del-line-{{ line.id }}" method="post" class="hidden">
+              {% csrf_token %}
+              <input type="hidden" name="action" value="delete">
+              <input type="hidden" name="line_id" value="{{ line.id }}">
+            </form>
           </tr>
         {% empty %}
           <tr>
         {% endfor %}
       </tbody>
     </table>
+    <div class="mt-4 border-t pt-4">
+      <h3 class="font-medium mb-2">Add Line</h3>
+      <form method="post">
+        {% csrf_token %}
+        <input type="hidden" name="action" value="add">
+        <div class="grid grid-cols-1 md:grid-cols-4 gap-4 md:gap-6 items-end">
+          <div>
+            <label class="block text-sm text-gray-600 mb-1">Material</label>
+            {{ add_line_form.material|attr:"class:w-full max-w-full" }}
+          </div>
+          <div>
+            <label class="block text-sm text-gray-600 mb-1">Quantity</label>
+            {{ add_line_form.quantity|attr:"class:w-full max-w-full text-right" }}
+          </div>
+          <div>
+            <label class="block text-sm text-gray-600 mb-1">Unit</label>
+            {{ add_line_form.unit|attr:"class:w-full max-w-full" }}
+          </div>
+          <div>
+            <button class="px-3 py-2 rounded bg-blue-600 text-white">Add</button>
+          </div>
+        </div>
+      </form>
+    </div>
   </div>
 </div>
 

recycle_core/urls.py

     path("pickups/<int:pk>/assign/", views.pickup_assign, name="pickup_assign"),
     path("pickups/<int:pk>/set-status/", views.pickup_set_status, name="pickup_set_status"),
     path("pickups/<int:pk>/generate-invoice/", views.pickup_generate_invoice, name="pickup_generate_invoice"),
+    path("pickups/<int:pk>/regenerate-invoice/", views.pickup_regenerate_invoice, name="pickup_regenerate_invoice"),
     path("pickups/<int:pk>/create-weigh-ticket/", views.pickup_create_weigh_ticket, name="pickup_create_weigh_ticket"),
     path("pickups/<int:pk>/", views.pickup_detail, name="pickup_detail"),
 
     path("weigh-tickets/", views.weigh_tickets_list, name="weigh_tickets_list"),
     path("weigh-tickets/<int:pk>/", views.weigh_ticket_detail, name="weigh_ticket_detail"),
     path("weigh-tickets/<int:pk>/generate-invoice/", views.weigh_ticket_generate_invoice, name="weigh_ticket_generate_invoice"),
+    path("weigh-tickets/<int:pk>/recalc-carbon/", views.weigh_ticket_recalc_carbon, name="weigh_ticket_recalc_carbon"),
 
 
     path("documents/", views.documents_list, name="documents_list"),
     path("services/<int:pk>/delete/", views.service_delete, name="service_delete"),
     path("services/<int:pk>/toggle-enabled/", views.service_toggle_enabled, name="service_toggle_enabled"),
     path("services/reorder/", views.services_reorder, name="services_reorder"),
+
+    # Carbon approvals
+    path("carbon-events/", views.carbon_events_list, name="carbon_events_list"),
+
+    # Emission factors
+    path("emission-factors/", views.emission_factors_list, name="emission_factors_list"),
+    path("emission-factors/<int:pk>/edit/", views.emission_factor_edit, name="emission_factor_edit"),
+    path("emission-factors/<int:pk>/delete/", views.emission_factor_delete, name="emission_factor_delete"),
 ]

recycle_core/views.py

     ProvidedService,
     Customer,
     CustomerSite,
+    PickupItem,
+    PriceList,
+    PriceListItem,
     PickupOrder,
     WeighTicket,
     WeighLine,
     ScrapBid,
     Document,
     AuditLog,
+    CarbonEvent,
+    CarbonBalance,
+    MaterialEmissionFactor,
 )
 from .forms import (
     MaterialForm,
     DocumentForm,
     ProvidedServiceForm,
     WeighTicketForm,
+    WeighLineForm,
+    WeighTicketWeightsForm,
+    MaterialEmissionFactorForm,
+    PickupItemForm,
 )
-from .services.billing import generate_invoice_for_pickup
+from .services.billing import generate_invoice_for_pickup, regenerate_invoice_for_pickup
+from billing.models import Invoice
+from .services import carbon as carbon_svc
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.auth import get_user_model
 from django.http import HttpResponse, JsonResponse
         "is_active": user.is_active,
     })
     form_photo = UserProfilePhotoForm(request.POST or None, request.FILES or None, instance=profile) if profile else None
-    print(form_photo)
+    # Extra contact/address fields on the profile
+    from django.forms import modelform_factory
+    ExtraForm = modelform_factory(UserProfile, fields=(
+        "phone",
+        "job_title",
+        "department",
+        "preferred_language",
+        "address_line1",
+        "address_line2",
+        "city",
+        "state",
+        "postal_code",
+        "country",
+    ))
+    form_extras = ExtraForm(request.POST or None, instance=profile) if profile else None
     if request.method == "POST":
         ok_main = form.is_valid()
         ok_photo = True if form_photo is None else form_photo.is_valid()
-        if ok_main and ok_photo:
+        ok_extras = True if form_extras is None else form_extras.is_valid()
+        if ok_main and ok_photo and ok_extras:
             user.email = form.cleaned_data.get("email") or ""
             user.first_name = form.cleaned_data.get("first_name") or ""
             user.last_name = form.cleaned_data.get("last_name") or ""
             if form_photo is not None:
                 form_photo.instance = profile
                 form_photo.save()
+            if form_extras is not None:
+                form_extras.instance = profile
+                form_extras.save()
             messages.success(request, f"User '{user.username}' updated.")
             next_url = request.POST.get("next") or request.GET.get("next")
             if next_url:
                 return redirect(next_url)
             return redirect("recycle_core:org_users_list")
         messages.error(request, "Please correct the errors below.")
-    print(f"fp = {form_photo}")
-    return render(request, "recycle_core/user_form.html", {"nav": _nav_items(), "form": form, "form_photo": form_photo, "item": user, "creating": False, "cancel_url": reverse("recycle_core:org_users_list")})
+    return render(request, "recycle_core/user_form.html", {"nav": _nav_items(), "form": form, "form_photo": form_photo, "form_extras": form_extras, "item": user, "creating": False, "cancel_url": reverse("recycle_core:org_users_list")})
 
 
 @owner_required
         PickupOrder.objects.select_related("organization", "customer", "site", "assigned_driver"), pk=pk
     )
     items = pickup.items.select_related("material").all()
+    add_item_form = None
+    if request.method == "POST":
+        action = request.POST.get("action")
+        if action == "add_item":
+            add_item_form = PickupItemForm(request.POST, organization=pickup.organization)
+            if add_item_form.is_valid():
+                PickupItem.objects.create(
+                    pickup=pickup,
+                    material=add_item_form.cleaned_data["material"],
+                    estimated_qty=add_item_form.cleaned_data.get("estimated_qty"),
+                    unit=add_item_form.cleaned_data["unit"],
+                )
+                messages.success(request, "Pickup item added.")
+                return redirect("recycle_core:pickup_detail", pk=pickup.id)
+            else:
+                messages.error(request, "Please correct the item form errors.")
+    if add_item_form is None:
+        add_item_form = PickupItemForm(organization=pickup.organization)
+    # Invoices associated with this pickup (with payment totals/balance)
+    inv_qs = (
+        Invoice.objects.select_related("customer")
+        .filter(pickup=pickup)
+        .annotate(
+            payments_total=Coalesce(
+                Sum("payments__amount"),
+                Value(Decimal("0.00")),
+                output_field=DecimalField(max_digits=14, decimal_places=2),
+            )
+        )
+        .annotate(
+            balance=ExpressionWrapper(
+                F("total_amount") - F("payments_total"),
+                output_field=DecimalField(max_digits=14, decimal_places=2),
+            )
+        )
+        .order_by("-issued_at", "-id")
+    )
+
+    # Compute per-ticket pricing summary (unit price avg and total)
+    # Attach pricing summaries on each ticket
+    price_list = pickup.customer.price_list or PriceList.objects.filter(organization=pickup.organization).order_by("id").first()
+    currency_code = getattr(price_list, "currency_code", None) or pickup.organization.currency_code
+    for t in pickup.weigh_tickets.all():
+        total = Decimal("0.00")
+        for ln in t.lines.all():
+            pli = (
+                PriceListItem.objects.filter(
+                    price_list=price_list, material_id=ln.material_id, unit=ln.unit, direction=PriceListItem.DIRECTION_SELL
+                ).first()
+                if price_list
+                else None
+            )
+            if pli and pli.unit_price and Decimal(pli.unit_price) > 0:
+                total += (Decimal(ln.quantity) * Decimal(pli.unit_price)).quantize(Decimal("0.01"))
+        avg_unit = None
+        try:
+            if total > 0 and t.net_weight:
+                avg_unit = (total / Decimal(t.net_weight)).quantize(Decimal("0.01"))
+        except Exception:
+            avg_unit = None
+        t.total_value = total
+        t.avg_unit = avg_unit
+
     context = {
         "nav": _nav_items(),
         "pickup": pickup,
         "items": items,
+        "add_item_form": add_item_form,
+        "invoices": list(inv_qs),
+        "ticket_currency": currency_code,
     }
     return render(request, "recycle_core/pickup_detail.html", context)
 
 @permissions_required('recycle_core.create_weigh_ticket', message="You are not allowed to create weigh tickets.")
 def pickup_create_weigh_ticket(request, pk: int):
     pickup = get_object_or_404(PickupOrder.objects.select_related("customer", "organization"), pk=pk)
-    if hasattr(pickup, "weigh_ticket"):
-        messages.info(request, "Weigh ticket already exists for this pickup.")
-        return redirect("recycle_core:weigh_ticket_detail", pk=pickup.weigh_ticket.id)
 
     if request.method == "POST":
         form = WeighTicketForm(request.POST)
 def pickup_generate_invoice(request, pk: int):
     pickup = get_object_or_404(PickupOrder, pk=pk)
     try:
-        if not hasattr(pickup, "weigh_ticket"):
-            messages.error(request, "Pickup has no weigh ticket.")
-            return redirect("recycle_core:pickups_list")
+        if not pickup.weigh_tickets.exists():
+            messages.error(request, "Pickup has no weigh tickets.")
+            return redirect("recycle_core:pickup_detail", pk=pickup.id)
         invoice = generate_invoice_for_pickup(pickup)
         messages.success(request, f"Invoice #{invoice.id} generated.")
     except Exception as e:
         messages.error(request, f"Failed to generate invoice: {e}")
-    return redirect("recycle_core:pickups_list")
+    return redirect("recycle_core:pickup_detail", pk=pickup.id)
+
+
+@staff_member_required
+@permissions_required('recycle_core.generate_invoice', message="You are not allowed to generate invoices.")
+@require_POST
+def pickup_regenerate_invoice(request, pk: int):
+    pickup = get_object_or_404(PickupOrder, pk=pk)
+    try:
+        inv = regenerate_invoice_for_pickup(pickup)
+        messages.success(request, f"Invoice #{inv.id} regenerated from current tickets.")
+    except Exception as e:
+        messages.error(request, f"Failed to regenerate invoice: {e}")
+    return redirect("recycle_core:pickup_detail", pk=pickup.id)
 
 
 # Scrap Listings UI ----------------------------------------------------------
 @staff_member_required
 @breadcrumbs(label="Ticket Detail", parent="re_tickets")
 def weigh_ticket_detail(request, pk: int):
-    ticket = get_object_or_404(WeighTicket.objects.select_related("pickup", "pickup__customer"), pk=pk)
+    ticket = get_object_or_404(WeighTicket.objects.select_related("pickup", "pickup__customer", "pickup__organization"), pk=pk)
     lines = WeighLine.objects.select_related("material").filter(ticket=ticket)
+    # Add WeighLine inline form
+    add_line_form = None
+    weights_form = None
+    if request.method == "POST":
+        action = request.POST.get("action", "add")
+        org = ticket.pickup.organization
+        if action == "add":
+            add_line_form = WeighLineForm(request.POST, organization=org)
+            if add_line_form.is_valid():
+                WeighLine.objects.create(
+                    ticket=ticket,
+                    material=add_line_form.cleaned_data["material"],
+                    quantity=add_line_form.cleaned_data["quantity"],
+                    unit=add_line_form.cleaned_data["unit"],
+                )
+                messages.success(request, "Weigh line added.")
+                return redirect("recycle_core:weigh_ticket_detail", pk=ticket.id)
+            else:
+                messages.error(request, "Please correct the line form errors.")
+        elif action == "edit":
+            line_id = request.POST.get("line_id")
+            line = get_object_or_404(WeighLine, pk=line_id, ticket=ticket)
+            form = WeighLineForm(request.POST, organization=org)
+            if form.is_valid():
+                line.material = form.cleaned_data["material"]
+                line.quantity = form.cleaned_data["quantity"]
+                line.unit = form.cleaned_data["unit"]
+                line.save()
+                messages.success(request, f"Line #{line.id} updated.")
+                return redirect("recycle_core:weigh_ticket_detail", pk=ticket.id)
+            else:
+                messages.error(request, "Please correct the line form errors.")
+        elif action == "delete":
+            line_id = request.POST.get("line_id")
+            line = get_object_or_404(WeighLine, pk=line_id, ticket=ticket)
+            try:
+                # Also remove any linked carbon event(s)
+                CarbonEvent.objects.filter(weigh_line=line).delete()
+            except Exception:
+                pass
+            line.delete()
+            messages.success(request, "Weigh line deleted.")
+            return redirect("recycle_core:weigh_ticket_detail", pk=ticket.id)
+        elif action == "adjust_net_to_lines":
+            if not org.allow_adjust_net_to_lines:
+                messages.error(request, "Policy does not allow adjusting net to lines.")
+                return redirect("recycle_core:weigh_ticket_detail", pk=ticket.id)
+            # Recalculate sum in ticket unit (computed below again for display)
+            LB_TO_KG = Decimal("0.45359237")
+            def _to_ticket_unit(qty: Decimal, from_unit: str, to_unit: str) -> Decimal:
+                if from_unit == to_unit:
+                    return qty
+                if from_unit == 'lb' and to_unit == 'kg':
+                    return (qty * LB_TO_KG).quantize(Decimal('0.000'))
+                if from_unit == 'kg' and to_unit == 'lb':
+                    return (qty / LB_TO_KG).quantize(Decimal('0.000'))
+                return Decimal('0')
+            total_lines = Decimal('0.000')
+            for ln in lines:
+                if ln.unit in ('kg', 'lb') and ticket.unit in ('kg', 'lb'):
+                    total_lines += _to_ticket_unit(Decimal(ln.quantity), ln.unit, ticket.unit)
+            ticket.net_weight = total_lines
+            ticket.save(update_fields=["net_weight", "updated_at"])
+            messages.success(request, "Net weight adjusted to sum of lines.")
+            return redirect("recycle_core:weigh_ticket_detail", pk=ticket.id)
+        elif action == "add_residual_line":
+            if not org.allow_add_residual_line:
+                messages.error(request, "Policy does not allow adding residual line.")
+                return redirect("recycle_core:weigh_ticket_detail", pk=ticket.id)
+            # Compute residual quantity = net - sum(lines in ticket unit)
+            LB_TO_KG = Decimal("0.45359237")
+            def _to_ticket_unit(qty: Decimal, from_unit: str, to_unit: str) -> Decimal:
+                if from_unit == to_unit:
+                    return qty
+                if from_unit == 'lb' and to_unit == 'kg':
+                    return (qty * LB_TO_KG).quantize(Decimal('0.000'))
+                if from_unit == 'kg' and to_unit == 'lb':
+                    return (qty / LB_TO_KG).quantize(Decimal('0.000'))
+                return Decimal('0')
+            sum_lines = Decimal('0.000')
+            for ln in lines:
+                if ln.unit in ('kg', 'lb') and ticket.unit in ('kg', 'lb'):
+                    sum_lines += _to_ticket_unit(Decimal(ln.quantity), ln.unit, ticket.unit)
+            resid = (Decimal(ticket.net_weight) - sum_lines).quantize(Decimal('0.000'))
+            if resid == 0:
+                messages.info(request, "No residual difference to add.")
+                return redirect("recycle_core:weigh_ticket_detail", pk=ticket.id)
+            # Ensure residual material exists for the org
+            residual_name = "Residual"
+            residual = Material.objects.filter(organization=org, name=residual_name).first()
+            if not residual:
+                residual = Material.objects.create(
+                    organization=org,
+                    category="Mixed",
+                    name=residual_name,
+                    default_unit=ticket.unit,
+                )
+            WeighLine.objects.create(ticket=ticket, material=residual, quantity=resid, unit=ticket.unit)
+            messages.success(request, f"Residual line of {resid} {ticket.unit} added.")
+            return redirect("recycle_core:weigh_ticket_detail", pk=ticket.id)
+        elif action == "finalize_ticket":
+            # Validate tolerance and finalize
+            LB_TO_KG = Decimal("0.45359237")
+            def _to_kg(qty: Decimal, unit: str) -> Decimal:
+                if unit == 'kg':
+                    return qty
+                if unit == 'lb':
+                    return (qty * LB_TO_KG).quantize(Decimal('0.000'))
+                return Decimal('0')
+            # compute delta in kg
+            sum_lines_ticket = Decimal('0.000')
+            for ln in lines:
+                if ln.unit in ('kg', 'lb') and ticket.unit in ('kg', 'lb'):
+                    # convert line to ticket unit
+                    if ln.unit == ticket.unit:
+                        sum_lines_ticket += Decimal(ln.quantity)
+                    else:
+                        sum_lines_ticket += (Decimal(ln.quantity) * (LB_TO_KG if ln.unit=='lb' and ticket.unit=='kg' else Decimal('1')/LB_TO_KG)).quantize(Decimal('0.000'))
+            delta_ticket = (Decimal(ticket.net_weight) - sum_lines_ticket)
+            delta_kg = _to_kg(delta_ticket, ticket.unit)
+            net_kg = _to_kg(Decimal(ticket.net_weight), ticket.unit)
+            abs_tol_kg = org.ticket_tolerance_abs_kg
+            pct_tol_kg = (net_kg * (org.ticket_tolerance_pct / Decimal('100'))).quantize(Decimal('0.000')) if net_kg else Decimal('0.000')
+            tol_kg = abs_tol_kg if abs_tol_kg >= pct_tol_kg else pct_tol_kg
+            if delta_kg.copy_abs() > tol_kg:
+                messages.error(request, f"Cannot finalize: difference {delta_kg} kg exceeds tolerance {tol_kg} kg.")
+                return redirect("recycle_core:weigh_ticket_detail", pk=ticket.id)
+            ticket.is_finalized = True
+            ticket.finalized_by = request.user
+            from django.utils import timezone as djtz
+            ticket.finalized_at = djtz.now()
+            ticket.save(update_fields=["is_finalized", "finalized_by", "finalized_at", "updated_at"])
+            messages.success(request, "Ticket finalized.")
+            return redirect("recycle_core:weigh_ticket_detail", pk=ticket.id)
+        elif action == "edit_weights":
+            # Permission and state checks
+            if not request.user.has_perm('recycle_core.edit_weigh_ticket'):
+                messages.error(request, "You are not allowed to edit weights.")
+                return redirect("recycle_core:weigh_ticket_detail", pk=ticket.id)
+            if ticket.is_finalized:
+                messages.error(request, "Ticket is finalized and cannot be edited.")
+                return redirect("recycle_core:weigh_ticket_detail", pk=ticket.id)
+            wform = WeighTicketWeightsForm(request.POST)
+            if wform.is_valid():
+                gross = wform.cleaned_data['gross_weight']
+                tare = wform.cleaned_data['tare_weight']
+                unit = wform.cleaned_data['unit']
+                # Disallow unit change if lines exist
+                if unit != ticket.unit and lines.exists():
+                    messages.error(request, "Cannot change unit when lines exist. Remove lines first or keep unit.")
+                    return redirect("recycle_core:weigh_ticket_detail", pk=ticket.id)
+                old = {
+                    'gross': str(ticket.gross_weight),
+                    'tare': str(ticket.tare_weight),
+                    'net': str(ticket.net_weight),
+                    'unit': ticket.unit,
+                }
+                ticket.gross_weight = gross
+                ticket.tare_weight = tare
+                ticket.net_weight = (Decimal(gross) - Decimal(tare)).quantize(Decimal('0.000'))
+                ticket.unit = unit
+                ticket.save(update_fields=["gross_weight", "tare_weight", "net_weight", "unit", "updated_at"])
+                try:
+                    from .services.audit import log_action
+                    log_action(
+                        organization=org,
+                        user=request.user,
+                        action="weigh_ticket.update_weights",
+                        obj=ticket,
+                        metadata={"before": old, "after": {"gross": str(gross), "tare": str(tare), "net": str(ticket.net_weight), "unit": unit}},
+                    )
+                except Exception:
+                    pass
+                messages.success(request, "Weights updated.")
+                return redirect("recycle_core:weigh_ticket_detail", pk=ticket.id)
+            else:
+                messages.error(request, "Please correct the weights form errors.")
+                weights_form = wform  # keep field errors for rendering
+    else:
+        add_line_form = WeighLineForm(organization=ticket.pickup.organization, initial={"unit": ticket.unit})
     ct = ContentType.objects.get_for_model(WeighTicket)
     docs = Document.objects.filter(content_type=ct, object_id=ticket.id)
+    # Forms for editing existing lines (attach to each line)
+    for ln in lines:
+        ln.form = WeighLineForm(
+            organization=ticket.pickup.organization,
+            initial={"material": ln.material_id, "quantity": ln.quantity, "unit": ln.unit},
+        )
+
+    # Compute lines total converted to ticket unit and delta to net weight
+    LB_TO_KG = Decimal("0.45359237")
+    def _to_ticket_unit(qty: Decimal, from_unit: str, to_unit: str) -> Decimal:
+        if from_unit == to_unit:
+            return qty
+        if from_unit == 'lb' and to_unit == 'kg':
+            return (qty * LB_TO_KG).quantize(Decimal('0.000'))
+        if from_unit == 'kg' and to_unit == 'lb':
+            return (qty / LB_TO_KG).quantize(Decimal('0.000'))
+        # pcs or unknown: cannot convert; return 0 so we don't skew sums
+        return Decimal('0')
+
+    sum_in_ticket_unit = Decimal('0.000')
+    has_unconvertible = False
+    for ln in lines:
+        if ln.unit in ('kg', 'lb') and ticket.unit in ('kg', 'lb'):
+            sum_in_ticket_unit += _to_ticket_unit(Decimal(ln.quantity), ln.unit, ticket.unit)
+        else:
+            # pcs or mixed with pcs — flag as unconvertible
+            if ln.unit != ticket.unit:
+                has_unconvertible = True
+            else:
+                # same unit (e.g., pcs) — include as-is
+                sum_in_ticket_unit += Decimal(ln.quantity)
+    try:
+        net = Decimal(ticket.net_weight)
+    except Exception:
+        net = Decimal('0.000')
+    delta = (net - sum_in_ticket_unit).quantize(Decimal('0.000'))
+
+    # Prepare weights edit form (pre-filled) when not coming from a failed POST
+    if weights_form is None:
+        weights_form = WeighTicketWeightsForm(initial={
+            'gross_weight': ticket.gross_weight,
+            'tare_weight': ticket.tare_weight,
+            'unit': ticket.unit,
+        })
+
     context = {
         "nav": _nav_items(),
         "ticket": ticket,
         "lines": lines,
         "generate_url": reverse("recycle_core:weigh_ticket_generate_invoice", args=[ticket.id]),
+        "add_line_form": add_line_form,
+        "weights_form": weights_form,
         "documents": docs,
         "ct_id": ct.id,
+        "lines_sum": sum_in_ticket_unit,
+        "lines_delta": delta,
+        "has_unconvertible": has_unconvertible,
+        "allow_adjust_net": ticket.pickup.organization.allow_adjust_net_to_lines,
+        "allow_residual": ticket.pickup.organization.allow_add_residual_line,
+        "is_finalized": ticket.is_finalized,
     }
     return render(request, "recycle_core/weigh_ticket_detail.html", context)
 
         messages.success(request, f"Invoice #{invoice.id} generated from ticket {ticket.ticket_number or ticket.id}.")
     except Exception as e:
         messages.error(request, f"Failed to generate invoice: {e}")
-    return redirect("recycle_core:weigh_tickets_list")
+    return redirect("recycle_core:pickup_detail", pk=ticket.pickup_id)
+
+
+@staff_member_required
+@require_POST
+def weigh_ticket_recalc_carbon(request, pk: int):
+    ticket = get_object_or_404(WeighTicket.objects.select_related("pickup", "pickup__organization"), pk=pk)
+    try:
+        events = carbon_svc.calculate_events_for_ticket(ticket)
+        messages.success(request, f"Recalculated carbon events: {len(events)} event(s).")
+    except Exception as e:
+        messages.error(request, f"Failed to recalculate carbon events: {e}")
+    return redirect("recycle_core:weigh_ticket_detail", pk=ticket.id)
 
 
 # Billing-related views moved to billing/views.py
             log.metadata,
         ])
     return response
+
+
+# Carbon approvals queue -----------------------------------------------------
+
+
+@staff_member_required
+@public_route(label="Carbon Approvals", order=65, icon="check-circle")
+@breadcrumbs(label="Carbon Events", name="re_carbon_events")
+def carbon_events_list(request):
+    class CarbonFilter(filters.FilterSet):
+        organization = filters.ModelChoiceFilter(queryset=Organization.objects.all())
+        status = filters.ChoiceFilter(field_name="status", choices=CarbonEvent.STATUS_CHOICES)
+        event_date = filters.DateFromToRangeFilter(field_name="event_date", label="Event between")
+
+        class Meta:
+            model = CarbonEvent
+            fields = ["organization", "status", "event_date"]
+
+    base_qs = CarbonEvent.objects.select_related("organization", "weigh_ticket", "material").order_by("-event_date")
+    c_filter = CarbonFilter(request.GET, queryset=base_qs)
+    qs = c_filter.qs
+    org = getattr(request, "org", None)
+    if org is not None:
+        qs = qs.filter(organization=org)
+
+    if request.method == "POST":
+        action = request.POST.get("action")
+        ids = request.POST.getlist("ids")
+        sel = list(qs.filter(id__in=ids))
+        if action == "approve":
+            n_total = 0
+            for ev in sel:
+                n_total += carbon_svc.approve_events(ev.organization, [ev], approver=request.user)
+            messages.success(request, f"Approved {n_total} event(s).")
+            return redirect("recycle_core:carbon_events_list")
+        elif action == "reject":
+            from django.utils import timezone
+            now = timezone.now()
+            for ev in sel:
+                ev.status = CarbonEvent.STATUS_REJECTED
+                ev.approved_by = request.user
+                ev.approved_at = now
+                ev.save(update_fields=["status", "approved_by", "approved_at", "updated_at"])
+            messages.success(request, f"Rejected {len(sel)} event(s).")
+            return redirect("recycle_core:carbon_events_list")
+        else:
+            messages.error(request, "Invalid action.")
+
+    paginator = Paginator(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(),
+        "events": page_obj.object_list,
+        "page_obj": page_obj,
+        "filter": c_filter,
+    }
+    return render(request, "recycle_core/carbon_events_list.html", context)
+
+
+# Emission Factors -----------------------------------------------------------
+
+
+@staff_member_required
+@public_route(label="Emission Factors", order=62, icon="bolt")
+@breadcrumbs(label="Emission Factors", name="re_factors")
+def emission_factors_list(request):
+    class FactorFilter(filters.FilterSet):
+        organization = filters.ModelChoiceFilter(queryset=Organization.objects.all())
+        material = filters.ModelChoiceFilter(queryset=Material.objects.all())
+        unit = filters.ChoiceFilter(choices=Material.UNIT_CHOICES)
+        effective_from = filters.DateFromToRangeFilter(field_name="effective_from", label="Effective from")
+
+        class Meta:
+            model = MaterialEmissionFactor
+            fields = ["organization", "material", "unit", "effective_from"]
+
+    form = MaterialEmissionFactorForm(request.POST or None)
+    # Scope org choices
+    if getattr(request, "org", None) is not None:
+        try:
+            form.fields["organization"].queryset = Organization.objects.filter(pk=request.org.pk)
+            form.fields["material"].queryset = Material.objects.filter(organization=request.org)
+        except Exception:
+            pass
+    if request.method == "POST":
+        if form.is_valid():
+            obj = form.save(commit=False)
+            if getattr(request, "org", None) is not None:
+                obj.organization = request.org
+            obj.save()
+            messages.success(request, "Emission factor created.")
+            return redirect("recycle_core:emission_factors_list")
+        else:
+            messages.error(request, "Please correct the errors below.")
+
+    base_qs = MaterialEmissionFactor.objects.select_related("organization", "material").order_by("organization_id", "material_id", "-effective_from", "-id")
+    f_filter = FactorFilter(request.GET, queryset=base_qs)
+    qs = f_filter.qs
+    if getattr(request, "org", None) is not None:
+        qs = qs.filter(organization=request.org)
+
+    paginator = Paginator(qs, 15)
+    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(),
+        "factors": page_obj.object_list,
+        "page_obj": page_obj,
+        "filter": f_filter,
+        "form": form,
+    }
+    return render(request, "recycle_core/emission_factors_list.html", context)
+
+
+@staff_member_required
+@breadcrumbs(label="Edit Factor", parent="re_factors")
+def emission_factor_edit(request, pk: int):
+    item = get_object_or_404(MaterialEmissionFactor.objects.select_related("organization", "material"), pk=pk)
+    if request.method == "POST":
+        form = MaterialEmissionFactorForm(request.POST, instance=item)
+        # Scope choices
+        if getattr(request, "org", None) is not None:
+            try:
+                form.fields["organization"].queryset = Organization.objects.filter(pk=request.org.pk)
+                form.fields["material"].queryset = Material.objects.filter(organization=request.org)
+            except Exception:
+                pass
+        if form.is_valid():
+            inst = form.save(commit=False)
+            if getattr(request, "org", None) is not None:
+                inst.organization = request.org
+            inst.save()
+            messages.success(request, "Emission factor updated.")
+            return redirect("recycle_core:emission_factors_list")
+        else:
+            messages.error(request, "Please correct the errors below.")
+    else:
+        form = MaterialEmissionFactorForm(instance=item)
+        if getattr(request, "org", None) is not None:
+            try:
+                form.fields["organization"].queryset = Organization.objects.filter(pk=request.org.pk)
+                form.fields["material"].queryset = Material.objects.filter(organization=request.org)
+            except Exception:
+                pass
+    return render(request, "recycle_core/emission_factor_form.html", {"nav": _nav_items(), "item": item, "form": form, "cancel_url": reverse("recycle_core:emission_factors_list")})
+
+
+@staff_member_required
+@require_POST
+def emission_factor_delete(request, pk: int):
+    item = get_object_or_404(MaterialEmissionFactor, pk=pk)
+    item.delete()
+    messages.success(request, "Emission factor deleted.")
+    return redirect("recycle_core:emission_factors_list")
 @staff_member_required
 @public_route(label="Provided Services", order=15, icon="sparkles")
 @breadcrumbs(label="Provided Services", name="rc_services")