controller

Dockerfile

@@ -8,9 +8,12 @@ ENV PYTHONUNBUFFERED 1
 # Set work directory
 WORKDIR /app
 
-# Install Node.js and npm
+# Install system dependencies: Node.js/npm and Graphviz toolchain for ER diagrams
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends nodejs npm \
+    && apt-get install -y --no-install-recommends \
+        nodejs npm \
+        graphviz libgraphviz-dev \
+        build-essential pkg-config \
     && rm -rf /var/lib/apt/lists/*
 
 # Install dependencies

ecoloop/settings.py

@@ -85,7 +85,7 @@ INSTALLED_APPS = [
 ]
 if DEBUG:
     # Add django_browser_reload only in DEBUG mode
-    INSTALLED_APPS += ['django_browser_reload']
+    INSTALLED_APPS += ['django_browser_reload', 'django_extensions']
 
 
 TAILWIND_APP_NAME = 'theme'

er.dot

@@ -0,0 +1,672 @@
+digraph model_graph {
+  // Dotfile by Django-Extensions graph_models
+  // Created: 2025-09-22 14:07
+  // Cli Options: orgs recycle_core --group-models --disable-fields
+
+  fontname = "Roboto"
+  fontsize = 8
+  splines  = true
+  rankdir = "TB"
+  
+
+  node [
+    fontname = "Roboto"
+    fontsize = 8
+    shape = "plaintext"
+  ]
+
+  edge [
+    fontname = "Roboto"
+    fontsize = 8
+  ]
+
+  // Labels
+  subgraph cluster_orgs {
+    label=<
+          <TABLE BORDER="0" CELLBORDER="0" CELLSPACING="0">
+          <TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER">
+          <FONT FACE="Roboto" COLOR="Black" POINT-SIZE="10">
+          <B>orgs</B>
+          </FONT>
+          </TD></TR>
+          </TABLE>
+          >
+    color=olivedrab4
+    style="rounded"
+  
+    orgs_models_TimestampedModel [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      TimestampedModel
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+  
+    orgs_models_Organization [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      Organization<BR/>&lt;<FONT FACE="Roboto"><I>TimestampedModel</I></FONT>&gt;
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+  
+    orgs_models_OrganizationSite [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      OrganizationSite
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+  
+    orgs_models_UserProfile [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      UserProfile<BR/>&lt;<FONT FACE="Roboto"><I>TimestampedModel</I></FONT>&gt;
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+
+  }
+  subgraph cluster_recycle_core {
+    label=<
+          <TABLE BORDER="0" CELLBORDER="0" CELLSPACING="0">
+          <TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER">
+          <FONT FACE="Roboto" COLOR="Black" POINT-SIZE="10">
+          <B>recycle_core</B>
+          </FONT>
+          </TD></TR>
+          </TABLE>
+          >
+    color=olivedrab4
+    style="rounded"
+  
+    recycle_core_models_TimestampedModel [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      TimestampedModel
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+  
+    recycle_core_models_MaterialCategory [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      MaterialCategory<BR/>&lt;<FONT FACE="Roboto"><I>TimestampedModel</I></FONT>&gt;
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+  
+    recycle_core_models_ProvidedService [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      ProvidedService<BR/>&lt;<FONT FACE="Roboto"><I>TimestampedModel</I></FONT>&gt;
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+  
+    recycle_core_models_Material [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      Material<BR/>&lt;<FONT FACE="Roboto"><I>TimestampedModel</I></FONT>&gt;
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+  
+    recycle_core_models_MaterialImage [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      MaterialImage<BR/>&lt;<FONT FACE="Roboto"><I>TimestampedModel</I></FONT>&gt;
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+  
+    recycle_core_models_PriceList [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      PriceList<BR/>&lt;<FONT FACE="Roboto"><I>TimestampedModel</I></FONT>&gt;
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+  
+    recycle_core_models_PriceListItem [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      PriceListItem<BR/>&lt;<FONT FACE="Roboto"><I>TimestampedModel</I></FONT>&gt;
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+  
+    recycle_core_models_Customer [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      Customer<BR/>&lt;<FONT FACE="Roboto"><I>TimestampedModel</I></FONT>&gt;
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+  
+    recycle_core_models_CustomerSite [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      CustomerSite<BR/>&lt;<FONT FACE="Roboto"><I>TimestampedModel</I></FONT>&gt;
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+  
+    recycle_core_models_ServiceAgreement [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      ServiceAgreement<BR/>&lt;<FONT FACE="Roboto"><I>TimestampedModel</I></FONT>&gt;
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+  
+    recycle_core_models_PickupOrder [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      PickupOrder<BR/>&lt;<FONT FACE="Roboto"><I>TimestampedModel</I></FONT>&gt;
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+  
+    recycle_core_models_PickupItem [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      PickupItem<BR/>&lt;<FONT FACE="Roboto"><I>TimestampedModel</I></FONT>&gt;
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+  
+    recycle_core_models_WeighTicket [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      WeighTicket<BR/>&lt;<FONT FACE="Roboto"><I>TimestampedModel</I></FONT>&gt;
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+  
+    recycle_core_models_WeighLine [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      WeighLine<BR/>&lt;<FONT FACE="Roboto"><I>TimestampedModel</I></FONT>&gt;
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+  
+    recycle_core_models_Invoice [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      Invoice<BR/>&lt;<FONT FACE="Roboto"><I>TimestampedModel</I></FONT>&gt;
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+  
+    recycle_core_models_InvoiceLine [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      InvoiceLine<BR/>&lt;<FONT FACE="Roboto"><I>TimestampedModel</I></FONT>&gt;
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+  
+    recycle_core_models_Payment [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      Payment<BR/>&lt;<FONT FACE="Roboto"><I>TimestampedModel</I></FONT>&gt;
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+  
+    recycle_core_models_Payout [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      Payout<BR/>&lt;<FONT FACE="Roboto"><I>TimestampedModel</I></FONT>&gt;
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+  
+    recycle_core_models_Document [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      Document<BR/>&lt;<FONT FACE="Roboto"><I>TimestampedModel</I></FONT>&gt;
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+  
+    recycle_core_models_AuditLog [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      AuditLog<BR/>&lt;<FONT FACE="Roboto"><I>TimestampedModel</I></FONT>&gt;
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+  
+    recycle_core_models_ScrapListing [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      ScrapListing<BR/>&lt;<FONT FACE="Roboto"><I>TimestampedModel</I></FONT>&gt;
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+  
+    recycle_core_models_ScrapListingItem [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      ScrapListingItem<BR/>&lt;<FONT FACE="Roboto"><I>TimestampedModel</I></FONT>&gt;
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+  
+    recycle_core_models_ScrapBid [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      ScrapBid<BR/>&lt;<FONT FACE="Roboto"><I>TimestampedModel</I></FONT>&gt;
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+  
+    recycle_core_models_ScrapAward [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      ScrapAward<BR/>&lt;<FONT FACE="Roboto"><I>TimestampedModel</I></FONT>&gt;
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+  
+    recycle_core_models_ScrapListingInvite [label=<
+      <TABLE BGCOLOR="white" BORDER="1" CELLBORDER="0" CELLSPACING="0">
+      <TR><TD COLSPAN="2" CELLPADDING="5" ALIGN="CENTER" BGCOLOR="#1b563f">
+      <FONT FACE="Roboto" COLOR="white" POINT-SIZE="10"><B>
+      ScrapListingInvite<BR/>&lt;<FONT FACE="Roboto"><I>TimestampedModel</I></FONT>&gt;
+      </B></FONT></TD></TR>
+    
+      </TABLE>
+      >]
+
+  }
+
+
+  // Relations
+
+  orgs_models_Organization -> orgs_models_TimestampedModel
+  [label=" abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
+
+  orgs_models_OrganizationSite -> orgs_models_Organization
+  [label=" organization (sites)"] [arrowhead=none, arrowtail=dot, dir=both];
+  django_contrib_sites_models_Site [label=<
+  <TABLE BGCOLOR="white" BORDER="0" CELLBORDER="0" CELLSPACING="0">
+  <TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="#1b563f">
+  <FONT FACE="Roboto" POINT-SIZE="12" COLOR="white">Site</FONT>
+  </TD></TR>
+  </TABLE>
+  >]
+  orgs_models_OrganizationSite -> django_contrib_sites_models_Site
+  [label=" site (organization_site)"] [arrowhead=none, arrowtail=none, dir=both];
+  django_contrib_auth_models_User [label=<
+  <TABLE BGCOLOR="white" BORDER="0" CELLBORDER="0" CELLSPACING="0">
+  <TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="#1b563f">
+  <FONT FACE="Roboto" POINT-SIZE="12" COLOR="white">User</FONT>
+  </TD></TR>
+  </TABLE>
+  >]
+  orgs_models_UserProfile -> django_contrib_auth_models_User
+  [label=" user (recycle_profile)"] [arrowhead=none, arrowtail=none, dir=both];
+
+  orgs_models_UserProfile -> orgs_models_Organization
+  [label=" organization (users)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  orgs_models_UserProfile -> orgs_models_TimestampedModel
+  [label=" abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
+
+
+  recycle_core_models_MaterialCategory -> orgs_models_Organization
+  [label=" organization (material_categories)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_MaterialCategory -> recycle_core_models_TimestampedModel
+  [label=" abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
+
+  recycle_core_models_ProvidedService -> orgs_models_Organization
+  [label=" organization (services)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_ProvidedService -> recycle_core_models_TimestampedModel
+  [label=" abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
+
+  recycle_core_models_Material -> orgs_models_Organization
+  [label=" organization (materials)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_Material -> recycle_core_models_TimestampedModel
+  [label=" abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
+
+  recycle_core_models_MaterialImage -> recycle_core_models_Material
+  [label=" material (images)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_MaterialImage -> recycle_core_models_TimestampedModel
+  [label=" abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
+
+  recycle_core_models_PriceList -> orgs_models_Organization
+  [label=" organization (price_lists)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_PriceList -> recycle_core_models_TimestampedModel
+  [label=" abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
+
+  recycle_core_models_PriceListItem -> recycle_core_models_PriceList
+  [label=" price_list (items)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_PriceListItem -> recycle_core_models_Material
+  [label=" material (price_items)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_PriceListItem -> recycle_core_models_TimestampedModel
+  [label=" abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
+
+  recycle_core_models_Customer -> orgs_models_Organization
+  [label=" organization (customers)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_Customer -> recycle_core_models_PriceList
+  [label=" price_list (customers)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_Customer -> recycle_core_models_TimestampedModel
+  [label=" abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
+
+  recycle_core_models_CustomerSite -> recycle_core_models_Customer
+  [label=" customer (sites)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_CustomerSite -> recycle_core_models_TimestampedModel
+  [label=" abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
+
+  recycle_core_models_ServiceAgreement -> recycle_core_models_Customer
+  [label=" customer (agreements)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_ServiceAgreement -> recycle_core_models_CustomerSite
+  [label=" site (agreements)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_ServiceAgreement -> recycle_core_models_PriceList
+  [label=" price_list (agreements)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_ServiceAgreement -> recycle_core_models_TimestampedModel
+  [label=" abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
+
+  recycle_core_models_PickupOrder -> orgs_models_Organization
+  [label=" organization (pickup_orders)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_PickupOrder -> recycle_core_models_Customer
+  [label=" customer (pickup_orders)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_PickupOrder -> recycle_core_models_CustomerSite
+  [label=" site (pickup_orders)"] [arrowhead=none, arrowtail=dot, dir=both];
+  django_contrib_auth_models_User [label=<
+  <TABLE BGCOLOR="white" BORDER="0" CELLBORDER="0" CELLSPACING="0">
+  <TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="#1b563f">
+  <FONT FACE="Roboto" POINT-SIZE="12" COLOR="white">User</FONT>
+  </TD></TR>
+  </TABLE>
+  >]
+  recycle_core_models_PickupOrder -> django_contrib_auth_models_User
+  [label=" assigned_driver (assigned_pickups)"] [arrowhead=none, arrowtail=dot, dir=both];
+  django_contrib_auth_models_User [label=<
+  <TABLE BGCOLOR="white" BORDER="0" CELLBORDER="0" CELLSPACING="0">
+  <TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="#1b563f">
+  <FONT FACE="Roboto" POINT-SIZE="12" COLOR="white">User</FONT>
+  </TD></TR>
+  </TABLE>
+  >]
+  recycle_core_models_PickupOrder -> django_contrib_auth_models_User
+  [label=" created_by (created_pickups)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_PickupOrder -> recycle_core_models_TimestampedModel
+  [label=" abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
+
+  recycle_core_models_PickupItem -> recycle_core_models_PickupOrder
+  [label=" pickup (items)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_PickupItem -> recycle_core_models_Material
+  [label=" material (pickupitem)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_PickupItem -> recycle_core_models_TimestampedModel
+  [label=" abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
+
+  recycle_core_models_WeighTicket -> recycle_core_models_PickupOrder
+  [label=" pickup (weigh_ticket)"] [arrowhead=none, arrowtail=none, dir=both];
+  django_contrib_auth_models_User [label=<
+  <TABLE BGCOLOR="white" BORDER="0" CELLBORDER="0" CELLSPACING="0">
+  <TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="#1b563f">
+  <FONT FACE="Roboto" POINT-SIZE="12" COLOR="white">User</FONT>
+  </TD></TR>
+  </TABLE>
+  >]
+  recycle_core_models_WeighTicket -> django_contrib_auth_models_User
+  [label=" recorded_by (weigh_tickets)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_WeighTicket -> recycle_core_models_TimestampedModel
+  [label=" abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
+
+  recycle_core_models_WeighLine -> recycle_core_models_WeighTicket
+  [label=" ticket (lines)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_WeighLine -> recycle_core_models_Material
+  [label=" material (weighline)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_WeighLine -> recycle_core_models_TimestampedModel
+  [label=" abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
+
+  recycle_core_models_Invoice -> orgs_models_Organization
+  [label=" organization (invoices)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_Invoice -> recycle_core_models_Customer
+  [label=" customer (invoices)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_Invoice -> recycle_core_models_PickupOrder
+  [label=" pickup (invoices)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_Invoice -> recycle_core_models_TimestampedModel
+  [label=" abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
+
+  recycle_core_models_InvoiceLine -> recycle_core_models_Invoice
+  [label=" invoice (lines)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_InvoiceLine -> recycle_core_models_Material
+  [label=" material (invoiceline)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_InvoiceLine -> recycle_core_models_TimestampedModel
+  [label=" abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
+
+  recycle_core_models_Payment -> recycle_core_models_Invoice
+  [label=" invoice (payments)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_Payment -> recycle_core_models_TimestampedModel
+  [label=" abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
+
+  recycle_core_models_Payout -> orgs_models_Organization
+  [label=" organization (payouts)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_Payout -> recycle_core_models_Customer
+  [label=" customer (payouts)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_Payout -> recycle_core_models_PickupOrder
+  [label=" pickup (payouts)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_Payout -> recycle_core_models_TimestampedModel
+  [label=" abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
+
+  recycle_core_models_Document -> orgs_models_Organization
+  [label=" organization (documents)"] [arrowhead=none, arrowtail=dot, dir=both];
+  django_contrib_contenttypes_models_ContentType [label=<
+  <TABLE BGCOLOR="white" BORDER="0" CELLBORDER="0" CELLSPACING="0">
+  <TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="#1b563f">
+  <FONT FACE="Roboto" POINT-SIZE="12" COLOR="white">ContentType</FONT>
+  </TD></TR>
+  </TABLE>
+  >]
+  recycle_core_models_Document -> django_contrib_contenttypes_models_ContentType
+  [label=" content_type (document)"] [arrowhead=none, arrowtail=dot, dir=both];
+  django_contrib_auth_models_User [label=<
+  <TABLE BGCOLOR="white" BORDER="0" CELLBORDER="0" CELLSPACING="0">
+  <TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="#1b563f">
+  <FONT FACE="Roboto" POINT-SIZE="12" COLOR="white">User</FONT>
+  </TD></TR>
+  </TABLE>
+  >]
+  recycle_core_models_Document -> django_contrib_auth_models_User
+  [label=" uploaded_by (document)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_Document -> recycle_core_models_TimestampedModel
+  [label=" abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
+
+  recycle_core_models_AuditLog -> orgs_models_Organization
+  [label=" organization (audit_logs)"] [arrowhead=none, arrowtail=dot, dir=both];
+  django_contrib_auth_models_User [label=<
+  <TABLE BGCOLOR="white" BORDER="0" CELLBORDER="0" CELLSPACING="0">
+  <TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="#1b563f">
+  <FONT FACE="Roboto" POINT-SIZE="12" COLOR="white">User</FONT>
+  </TD></TR>
+  </TABLE>
+  >]
+  recycle_core_models_AuditLog -> django_contrib_auth_models_User
+  [label=" user (auditlog)"] [arrowhead=none, arrowtail=dot, dir=both];
+  django_contrib_contenttypes_models_ContentType [label=<
+  <TABLE BGCOLOR="white" BORDER="0" CELLBORDER="0" CELLSPACING="0">
+  <TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="#1b563f">
+  <FONT FACE="Roboto" POINT-SIZE="12" COLOR="white">ContentType</FONT>
+  </TD></TR>
+  </TABLE>
+  >]
+  recycle_core_models_AuditLog -> django_contrib_contenttypes_models_ContentType
+  [label=" content_type (auditlog)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_AuditLog -> recycle_core_models_TimestampedModel
+  [label=" abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
+
+  recycle_core_models_ScrapListing -> orgs_models_Organization
+  [label=" organization (scrap_listings)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_ScrapListing -> recycle_core_models_Customer
+  [label=" customer (scrap_listings)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_ScrapListing -> recycle_core_models_CustomerSite
+  [label=" site (scrap_listings)"] [arrowhead=none, arrowtail=dot, dir=both];
+  django_contrib_auth_models_User [label=<
+  <TABLE BGCOLOR="white" BORDER="0" CELLBORDER="0" CELLSPACING="0">
+  <TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="#1b563f">
+  <FONT FACE="Roboto" POINT-SIZE="12" COLOR="white">User</FONT>
+  </TD></TR>
+  </TABLE>
+  >]
+  recycle_core_models_ScrapListing -> django_contrib_auth_models_User
+  [label=" created_by (created_listings)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_ScrapListing -> recycle_core_models_TimestampedModel
+  [label=" abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
+
+  recycle_core_models_ScrapListingItem -> recycle_core_models_ScrapListing
+  [label=" listing (items)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_ScrapListingItem -> recycle_core_models_Material
+  [label=" material (scraplistingitem)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_ScrapListingItem -> recycle_core_models_TimestampedModel
+  [label=" abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
+
+  recycle_core_models_ScrapBid -> recycle_core_models_ScrapListing
+  [label=" listing (bids)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_ScrapBid -> orgs_models_Organization
+  [label=" bidder_org (bids)"] [arrowhead=none, arrowtail=dot, dir=both];
+  django_contrib_auth_models_User [label=<
+  <TABLE BGCOLOR="white" BORDER="0" CELLBORDER="0" CELLSPACING="0">
+  <TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="#1b563f">
+  <FONT FACE="Roboto" POINT-SIZE="12" COLOR="white">User</FONT>
+  </TD></TR>
+  </TABLE>
+  >]
+  recycle_core_models_ScrapBid -> django_contrib_auth_models_User
+  [label=" bidder_user (bids)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_ScrapBid -> recycle_core_models_TimestampedModel
+  [label=" abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
+
+  recycle_core_models_ScrapAward -> recycle_core_models_ScrapListing
+  [label=" listing (award)"] [arrowhead=none, arrowtail=none, dir=both];
+
+  recycle_core_models_ScrapAward -> recycle_core_models_ScrapBid
+  [label=" winning_bid (awards)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_ScrapAward -> recycle_core_models_PickupOrder
+  [label=" pickup (awards)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_ScrapAward -> recycle_core_models_TimestampedModel
+  [label=" abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
+
+  recycle_core_models_ScrapListingInvite -> recycle_core_models_ScrapListing
+  [label=" listing (invites)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_ScrapListingInvite -> orgs_models_Organization
+  [label=" invited_org (listing_invites)"] [arrowhead=none, arrowtail=dot, dir=both];
+  django_contrib_auth_models_User [label=<
+  <TABLE BGCOLOR="white" BORDER="0" CELLBORDER="0" CELLSPACING="0">
+  <TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="#1b563f">
+  <FONT FACE="Roboto" POINT-SIZE="12" COLOR="white">User</FONT>
+  </TD></TR>
+  </TABLE>
+  >]
+  recycle_core_models_ScrapListingInvite -> django_contrib_auth_models_User
+  [label=" invited_user (listing_invites)"] [arrowhead=none, arrowtail=dot, dir=both];
+
+  recycle_core_models_ScrapListingInvite -> recycle_core_models_TimestampedModel
+  [label=" abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
+
+
+}

public_frontend/forms.py

@@ -4,12 +4,16 @@ from django import forms
 
 
 class PickupRequestForm(forms.Form):
+    class MultiFileInput(forms.ClearableFileInput):
+        allow_multiple_selected = True
+
     name = forms.CharField(max_length=255)
     email = forms.EmailField(required=False)
     phone = forms.CharField(max_length=64, required=False)
     address = forms.CharField(widget=forms.Textarea)
     preferred_at = forms.DateTimeField(required=False, widget=forms.DateTimeInput(attrs={"type": "datetime-local"}))
     materials = forms.CharField(label="Materials/Notes", widget=forms.Textarea, required=False)
+    photos = forms.FileField(required=False, widget=MultiFileInput, help_text="Optional: upload photos of scrap")
 
 
 class ContactForm(forms.Form):
@@ -18,4 +22,3 @@ class ContactForm(forms.Form):
     phone = forms.CharField(max_length=64, required=False)
     subject = forms.CharField(max_length=255, required=False)
     message = forms.CharField(widget=forms.Textarea)
-

public_frontend/templates/public_frontend/home.html

@@ -76,7 +76,7 @@
   {# Pickup Request Section #}
   <section id="pickup-request">
     <h2 class="text-2xl font-semibold mb-3">Request a Pickup</h2>
-    <form method="post" action="{% url 'public_frontend:pickup_request' %}" class="bg-white rounded-lg shadow-md p-4 grid gap-4">
+    <form method="post" enctype="multipart/form-data" action="{% url 'public_frontend:pickup_request' %}" class="bg-white rounded-lg shadow-md p-4 grid gap-4">
       {% csrf_token %}
       <div>
         <label class="block text-sm font-medium mb-1">Name</label>
@@ -101,6 +101,10 @@
         <textarea name="materials" class="w-full border rounded px-3 py-2" rows="4">{{ pickup_form.materials.value|default:'' }}</textarea>
       </div>
       <div>
+        <label class="block text-sm font-medium mb-1">Photos (optional)</label>
+        <input type="file" name="photos" multiple accept="image/*" class="w-full border rounded px-3 py-2">
+      </div>
+      <div>
         <button class="btn-primary" type="submit">Submit Request</button>
       </div>
     </form>

public_frontend/templates/public_frontend/materials_list.html

@@ -14,7 +14,7 @@
       {% for m in materials %}
         <tr class="border-t">
           <td class="px-4 py-2">{{ m.name }}</td>
-          <td class="px-4 py-2">{{ m.category.name }}</td>
+          <td class="px-4 py-2">{{ m.get_category_display }}</td>
           <td class="px-4 py-2">{{ m.get_default_unit_display }}</td>
         </tr>
       {% empty %}
@@ -24,4 +24,3 @@
   </table>
   </div>
 {% endblock %}
-

public_frontend/templates/public_frontend/pickup_request.html

@@ -2,7 +2,7 @@
 {% block title %}Request Pickup{% endblock %}
 {% block content %}
 <h1 class="text-xl font-semibold mb-4">Request a Pickup</h1>
-<form method="post" class="bg-white rounded shadow p-4 grid gap-4">
+<form method="post" enctype="multipart/form-data" class="bg-white rounded shadow p-4 grid gap-4">
   {% csrf_token %}
   <div>
     <label class="block text-sm font-medium mb-1">Name</label>
@@ -35,9 +35,12 @@
     <textarea name="materials" class="w-full border rounded px-3 py-2" rows="4">{{ form.materials.value|default:'' }}</textarea>
   </div>
   <div>
+    <label class="block text-sm font-medium mb-1">Photos (optional)</label>
+    <input type="file" name="photos" multiple accept="image/*" class="w-full border rounded px-3 py-2">
+  </div>
+  <div>
     <button class="btn-primary" type="submit">Submit Request</button>
   </div>
 </form>
 <style>.btn-primary{background:#1d4ed8;color:white;padding:.5rem .75rem;border-radius:.375rem}</style>
 {% endblock %}
-

public_frontend/views.py

@@ -12,6 +12,10 @@ from cms.models import Post, PostCategory
 
 from .forms import PickupRequestForm, ContactForm
 from .models import Lead
+from recycle_core.controllers.pickup_request import (
+    PickupRequestController,
+    PickupRequestData,
+)
 
 
 def home(request):
@@ -98,30 +102,29 @@ def service_detail(request, pk: int):
 
 def pickup_request(request):
     org = getattr(request, "org", None)
-    form = PickupRequestForm(request.POST or None)
+    form = PickupRequestForm(request.POST or None, request.FILES or None)
     if request.method == "POST":
         if not org:
             messages.error(request, "Organization context missing.")
             return redirect("public_frontend:pickup_request")
         if form.is_valid():
-            # Store as a Lead for staff to process; PickupOrder requires customer/site
-            message = (
-                f"Pickup Request\n"
-                f"Address: {form.cleaned_data.get('address')}\n"
-                f"Preferred: {form.cleaned_data.get('preferred_at') or ''}\n"
-                f"Materials: {form.cleaned_data.get('materials') or ''}"
-            )
-            Lead.objects.create(
+            ctrl = PickupRequestController()
+            data = PickupRequestData(
                 organization=org,
-                name=form.cleaned_data.get('name'),
-                email=form.cleaned_data.get('email',''),
-                phone=form.cleaned_data.get('phone',''),
-                subject='Pickup Request',
-                message=message,
-                source='pickup_request',
+                name=form.cleaned_data.get("name"),
+                email=form.cleaned_data.get("email", ""),
+                phone=form.cleaned_data.get("phone", ""),
+                address=form.cleaned_data.get("address", ""),
+                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 [],
             )
-            messages.success(request, "Thanks! Your pickup request was submitted.")
-            return redirect("public_frontend:home")
+            result = ctrl.submit(data)
+            if result.ok:
+                messages.success(request, "Thanks! Your pickup request was submitted.")
+                return redirect("public_frontend:home")
+            else:
+                messages.error(request, result.error or "Unable to submit your request.")
         messages.error(request, "Please correct the errors below.")
     return render(request, "public_frontend/pickup_request.html", {"form": form, "org": org})
 

recycle_core/admin.py

@@ -39,9 +39,13 @@ class MaterialCategoryAdmin(OrgScopedAdmin):
 
 @admin.register(models.Material)
 class MaterialAdmin(OrgScopedAdmin):
-    list_display = ("name", "code", "category", "organization", "default_unit")
+    list_display = ("name", "code", "get_category_display", "organization", "default_unit")
     list_filter = ("default_unit", "category")
     search_fields = ("name", "code")
+    class MaterialImageInline(admin.TabularInline):
+        model = models.MaterialImage
+        extra = 1
+    inlines = [MaterialImageInline]
 
 
 @admin.register(models.PriceList)

recycle_core/controllers/__init__.py

@@ -0,0 +1,2 @@
+from __future__ import annotations
+

recycle_core/controllers/pickup_request.py

@@ -0,0 +1,80 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Iterable, List, Optional
+from django.contrib.contenttypes.models import ContentType
+from django.utils import timezone
+
+from orgs.models import Organization
+from recycle_core.models import Document
+
+
+@dataclass
+class PickupRequestData:
+    organization: Organization
+    name: str
+    email: str = ""
+    phone: str = ""
+    address: str = ""
+    materials: str = ""
+    preferred_at: Optional[timezone.datetime] = None
+    files: Optional[Iterable] = None  # iterable of UploadedFile
+
+
+@dataclass
+class PickupRequestResult:
+    ok: bool
+    lead_id: Optional[int] = None
+    error: Optional[str] = None
+    document_ids: List[int] = None
+
+
+class PickupRequestController:
+    """Application layer controller for the fast-path pickup request.
+
+    - Creates a Lead scoped to an Organization
+    - Stores any uploaded photos/documents as Document records attached to the Lead
+    """
+
+    def submit(self, data: PickupRequestData) -> PickupRequestResult:
+        from public_frontend.models import Lead  # import locally to avoid circular imports
+
+        try:
+            # Prepare message body for staff
+            message = (
+                f"Pickup Request\n"
+                f"Address: {data.address}\n"
+                f"Preferred: {data.preferred_at or ''}\n"
+                f"Materials: {data.materials or ''}"
+            )
+
+            lead = Lead.objects.create(
+                organization=data.organization,
+                name=data.name,
+                email=data.email or "",
+                phone=data.phone or "",
+                subject="Pickup Request",
+                message=message,
+                source="pickup_request",
+            )
+
+            # Attach uploaded files as Documents linked to the Lead
+            doc_ids: List[int] = []
+            if data.files:
+                ct = ContentType.objects.get_for_model(Lead)
+                for idx, f in enumerate(data.files):
+                    doc = Document.objects.create(
+                        organization=data.organization,
+                        file=f,
+                        kind="pickup_request",
+                        content_type=ct,
+                        object_id=lead.id,
+                        uploaded_by=None,
+                    )
+                    doc_ids.append(doc.id)
+
+            return PickupRequestResult(ok=True, lead_id=lead.id, document_ids=doc_ids)
+
+        except Exception as e:
+            return PickupRequestResult(ok=False, error=str(e), document_ids=[])
+

recycle_core/forms.py

@@ -1,4 +1,5 @@
 from django import forms
+from django.core.exceptions import ValidationError
 from django.contrib.auth import get_user_model
 from decimal import Decimal
 from django.utils import timezone
@@ -7,6 +8,7 @@ from django.contrib.contenttypes.models import ContentType
 from .models import (
     MaterialCategory,
     Material,
+    MaterialImage,
     ProvidedService,
     Customer,
     CustomerSite,
@@ -21,10 +23,58 @@ class MaterialCategoryForm(forms.ModelForm):
         fields = ["organization", "name"]
 
 
+class MultiFileInput(forms.ClearableFileInput):
+    allow_multiple_selected = True
+
+
+class MultiImageField(forms.Field):
+    widget = MultiFileInput
+
+    def __init__(self, *args, **kwargs):
+        kwargs.setdefault("required", False)
+        super().__init__(*args, **kwargs)
+
+    def to_python(self, data):
+        return data
+
+    def validate(self, value):
+        # Basic required check; skip per-file validation here
+        if self.required and not value:
+            raise ValidationError("This field is required.")
+
+
 class MaterialForm(forms.ModelForm):
+    images = MultiImageField(help_text="Upload one or more sample images (optional)")
+
     class Meta:
         model = Material
-        fields = ["organization", "category", "name", "code", "default_unit"]
+        fields = ["organization", "category", "name", "code", "default_unit", "images"]
+
+    def save(self, commit=True):
+        instance = super().save(commit=commit)
+        files = self.files.getlist("images") if hasattr(self, "files") else []
+        if commit and files:
+            # Instance has a PK; we can create images now
+            order_start = instance.images.count()
+            for i, f in enumerate(files):
+                MaterialImage.objects.create(material=instance, image=f, display_order=order_start + i)
+        else:
+            # Defer image saving until caller completes save
+            self._pending_images = files
+        return instance
+
+    def save_images(self, instance: Material | None = None):
+        """Persist any pending images after the Material has been saved."""
+        if not hasattr(self, "_pending_images"):
+            return
+        target = instance or getattr(self, "instance", None)
+        if not target or not getattr(target, "pk", None):
+            return
+        order_start = target.images.count()
+        for i, f in enumerate(self._pending_images or []):
+            MaterialImage.objects.create(material=target, image=f, display_order=order_start + i)
+        # Clear pending list
+        self._pending_images = []
 
 
 class CustomerForm(forms.ModelForm):

recycle_core/management/commands/seed_ecoloop.py

@@ -35,6 +35,7 @@ class Command(BaseCommand):
     def add_arguments(self, parser):
         parser.add_argument("--org", default="DEMO", help="Organization code/id/name to seed (default: DEMO)")
         parser.add_argument("--bidder-org", dest="bidder_org", default="REC1", help="Bidder org code/id/name (default: REC1)")
+        parser.add_argument("--reset", action="store_true", help="Delete existing data for the target orgs before seeding")
 
     def handle(self, *args, **options):
         now = timezone.now()
@@ -59,6 +60,70 @@ class Command(BaseCommand):
         org = _resolve_org(org_ident, default_name=("Ecoloop " + str(org_ident)))
         bidder_org = _resolve_org(bidder_ident, default_name="Recycler Co.")
 
+        # Optionally reset existing demo data (scoped to the selected orgs)
+        if options.get("reset"):
+            from recycle_core.models import (
+                ScrapAward,
+                ScrapBid,
+                ScrapListingInvite,
+                ScrapListingItem,
+                ScrapListing,
+                WeighLine,
+                WeighTicket,
+                PickupItem,
+                PickupOrder,
+                InvoiceLine,
+                Invoice,
+                Payment,
+                Payout,
+                ServiceAgreement,
+                CustomerSite,
+                Customer,
+                PriceListItem,
+                PriceList,
+                Material,
+                MaterialCategory,
+                ProvidedService,
+            )
+
+            def _wipe_for(o: Organization):
+                # Marketplace
+                ScrapAward.objects.filter(listing__organization=o).delete()
+                ScrapBid.objects.filter(listing__organization=o).delete()
+                ScrapListingInvite.objects.filter(listing__organization=o).delete()
+                ScrapListingItem.objects.filter(listing__organization=o).delete()
+                ScrapListing.objects.filter(organization=o).delete()
+
+                # Operations
+                WeighLine.objects.filter(ticket__pickup__organization=o).delete()
+                WeighTicket.objects.filter(pickup__organization=o).delete()
+                PickupItem.objects.filter(pickup__organization=o).delete()
+                PickupOrder.objects.filter(organization=o).delete()
+
+                # Billing
+                InvoiceLine.objects.filter(invoice__organization=o).delete()
+                Payment.objects.filter(invoice__organization=o).delete()
+                Invoice.objects.filter(organization=o).delete()
+                Payout.objects.filter(organization=o).delete()
+
+                # Customers and agreements
+                ServiceAgreement.objects.filter(customer__organization=o).delete()
+                CustomerSite.objects.filter(customer__organization=o).delete()
+                Customer.objects.filter(organization=o).delete()
+
+                # Pricing
+                PriceListItem.objects.filter(price_list__organization=o).delete()
+                PriceList.objects.filter(organization=o).delete()
+
+                # Inventory and services
+                Material.objects.filter(organization=o).delete()
+                ProvidedService.objects.filter(organization=o).delete()
+                MaterialCategory.objects.filter(organization=o).delete()
+
+            _wipe_for(org)
+            _wipe_for(bidder_org)
+            self.stdout.write(self.style.WARNING("Existing data removed for selected orgs (reset)."))
+
         # Users
         manager = User.objects.filter(username="manager").first()
         if not manager:
@@ -80,10 +145,10 @@ class Command(BaseCommand):
         metals, _ = MaterialCategory.objects.get_or_create(organization=org, name="Metals")
         paper, _ = MaterialCategory.objects.get_or_create(organization=org, name="Paper")
 
-        pet, _ = Material.objects.get_or_create(organization=org, category=plastics, name="PET", defaults={"default_unit": Material.UNIT_KG})
-        hdpe, _ = Material.objects.get_or_create(organization=org, category=plastics, name="HDPE", defaults={"default_unit": Material.UNIT_KG})
-        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})
+        pet, _ = Material.objects.get_or_create(organization=org, category="Plastics", name="PET", defaults={"default_unit": Material.UNIT_KG})
+        hdpe, _ = Material.objects.get_or_create(organization=org, category="Plastics", name="HDPE", defaults={"default_unit": Material.UNIT_KG})
+        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})
 
         # Price list
         pl, _ = PriceList.objects.get_or_create(

recycle_core/migrations/0006_alter_materialcategory_name.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.24 on 2025-09-22 09:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('recycle_core', '0005_providedservice_is_enabled'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='materialcategory',
+            name='name',
+            field=models.CharField(choices=[('Plastics', 'Plastics'), ('Metals', 'Metals'), ('Paper', 'Paper'), ('Glass', 'Glass'), ('Electronics', 'Electronics'), ('Wood', 'Wood'), ('Rubber', 'Rubber'), ('Textiles', 'Textiles'), ('Organic', 'Organic'), ('Mixed', 'Mixed')], max_length=255),
+        ),
+    ]

recycle_core/migrations/0007_alter_material_category.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.24 on 2025-09-22 09:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('recycle_core', '0006_alter_materialcategory_name'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='material',
+            name='category',
+            field=models.CharField(choices=[('Plastics', 'Plastics'), ('Metals', 'Metals'), ('Paper', 'Paper'), ('Glass', 'Glass'), ('Electronics', 'Electronics'), ('Wood', 'Wood'), ('Rubber', 'Rubber'), ('Textiles', 'Textiles'), ('Organic', 'Organic'), ('Mixed', 'Mixed')], max_length=64),
+        ),
+    ]

recycle_core/migrations/0008_materialimage.py

@@ -0,0 +1,29 @@
+# Generated by Django 4.2.24 on 2025-09-22 09:28
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('recycle_core', '0007_alter_material_category'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='MaterialImage',
+            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)),
+                ('image', models.ImageField(upload_to='materials/%Y/%m/')),
+                ('caption', models.CharField(blank=True, max_length=255)),
+                ('display_order', models.PositiveIntegerField(default=0)),
+                ('material', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='images', to='recycle_core.material')),
+            ],
+            options={
+                'ordering': ['display_order', 'id'],
+            },
+        ),
+    ]

recycle_core/models.py

@@ -27,7 +27,20 @@ class TimestampedModel(models.Model):
 
 class MaterialCategory(TimestampedModel):
     organization = models.ForeignKey(Organization, on_delete=models.CASCADE, related_name="material_categories")
-    name = models.CharField(max_length=255)
+    # Limit to a curated, preset set of category names
+    CATEGORY_CHOICES = (
+        ("Plastics", "Plastics"),
+        ("Metals", "Metals"),
+        ("Paper", "Paper"),
+        ("Glass", "Glass"),
+        ("Electronics", "Electronics"),
+        ("Wood", "Wood"),
+        ("Rubber", "Rubber"),
+        ("Textiles", "Textiles"),
+        ("Organic", "Organic"),
+        ("Mixed", "Mixed"),
+    )
+    name = models.CharField(max_length=255, choices=CATEGORY_CHOICES)
 
     class Meta:
         unique_together = ("organization", "name")
@@ -81,7 +94,9 @@ class ProvidedService(TimestampedModel):
 
 class Material(TimestampedModel):
     organization = models.ForeignKey(Organization, on_delete=models.CASCADE, related_name="materials")
-    category = models.ForeignKey(MaterialCategory, on_delete=models.PROTECT, related_name="materials")
+    # Preset category choices (no FK)
+    CATEGORY_CHOICES = MaterialCategory.CATEGORY_CHOICES
+    category = models.CharField(max_length=64, choices=CATEGORY_CHOICES)
     name = models.CharField(max_length=255)
     code = models.CharField(max_length=64, blank=True)
     # unit choices keep MVP simple; conversions out of scope for now
@@ -102,6 +117,19 @@ class Material(TimestampedModel):
         return self.name
 
 
+class MaterialImage(TimestampedModel):
+    material = models.ForeignKey(Material, on_delete=models.CASCADE, related_name="images")
+    image = models.ImageField(upload_to="materials/%Y/%m/")
+    caption = models.CharField(max_length=255, blank=True)
+    display_order = models.PositiveIntegerField(default=0)
+
+    class Meta:
+        ordering = ["display_order", "id"]
+
+    def __str__(self) -> str:
+        return self.caption or f"MaterialImage #{self.id}"
+
+
 class PriceList(TimestampedModel):
     organization = models.ForeignKey(Organization, on_delete=models.CASCADE, related_name="price_lists")
     name = models.CharField(max_length=255)

recycle_core/templates/recycle_core/material_form.html

@@ -5,7 +5,28 @@
 {% render_breadcrumbs breadcrumbs %}
 <div class="bg-white rounded shadow p-4">
   <h1 class="text-xl font-semibold mb-4">Edit Material</h1>
-  <form method="post">
+
+  {% if item %}
+  {% with imgs=item.images.all %}
+  {% if imgs %}
+  <div class="mb-4">
+    <h2 class="text-lg font-medium mb-2">Existing Images</h2>
+    <div class="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 gap-3">
+      {% for im in imgs %}
+        <div class="border rounded p-2 bg-white flex flex-col items-center gap-2">
+          <img src="{{ im.image.url }}" alt="{{ im.caption|default:'Material image' }}" class="w-28 h-28 object-cover rounded" />
+          {% if im.caption %}
+            <div class="text-xs text-gray-600 text-center">{{ im.caption }}</div>
+          {% endif %}
+        </div>
+      {% endfor %}
+    </div>
+  </div>
+  {% endif %}
+  {% endwith %}
+  {% endif %}
+
+  <form method="post" enctype="multipart/form-data">
     {% csrf_token %}
     {{ form|crispy }}
     <div class="mt-3 flex gap-2">

recycle_core/templates/recycle_core/materials_list.html

@@ -54,7 +54,7 @@
         {% for m in materials %}
           <tr>
             <td class="px-4 py-2">{{ m.organization.name }}</td>
-            <td class="px-4 py-2">{{ m.category.name }}</td>
+            <td class="px-4 py-2">{{ m.get_category_display }}</td>
             <td class="px-4 py-2">{{ m.name }}</td>
             <td class="px-4 py-2">{{ m.code }}</td>
             <td class="px-4 py-2">{{ m.get_default_unit_display }}</td>

recycle_core/tests.py

@@ -1,3 +1,66 @@
 from django.test import TestCase
+from django.core.files.uploadedfile import SimpleUploadedFile
 
-# Create your tests here.
+from orgs.models import Organization
+from public_frontend.models import Lead
+from .models import Document
+from .controllers.pickup_request import PickupRequestController, PickupRequestData
+
+
+class PickupRequestControllerTests(TestCase):
+    def setUp(self) -> None:
+        self.org = Organization.objects.create(name="Test Org", code="TEST")
+        self.ctrl = PickupRequestController()
+
+    def test_submit_without_files_creates_lead_only(self):
+        data = PickupRequestData(
+            organization=self.org,
+            name="Alice",
+            email="alice@example.com",
+            phone="+1 555 0000",
+            address="123 Road",
+            materials="PET bottles",
+            preferred_at=None,
+            files=[],
+        )
+
+        result = self.ctrl.submit(data)
+        self.assertTrue(result.ok)
+        self.assertIsNotNone(result.lead_id)
+        self.assertEqual(result.document_ids, [])
+
+        lead = Lead.objects.get(pk=result.lead_id)
+        self.assertEqual(lead.organization, self.org)
+        self.assertEqual(lead.name, "Alice")
+        self.assertEqual(lead.subject, "Pickup Request")
+        self.assertEqual(lead.source, "pickup_request")
+
+        self.assertEqual(Document.objects.filter(object_id=lead.id).count(), 0)
+
+    def test_submit_with_files_creates_documents(self):
+        file1 = SimpleUploadedFile("photo1.jpg", b"fakejpegdata1", content_type="image/jpeg")
+        file2 = SimpleUploadedFile("photo2.jpg", b"fakejpegdata2", content_type="image/jpeg")
+
+        data = PickupRequestData(
+            organization=self.org,
+            name="Bob",
+            email="bob@example.com",
+            phone="+1 555 1111",
+            address="456 Avenue",
+            materials="Aluminum cans",
+            preferred_at=None,
+            files=[file1, file2],
+        )
+
+        result = self.ctrl.submit(data)
+        self.assertTrue(result.ok)
+        self.assertIsNotNone(result.lead_id)
+        self.assertEqual(len(result.document_ids), 2)
+
+        lead = Lead.objects.get(pk=result.lead_id)
+        docs = Document.objects.filter(object_id=lead.id).order_by("id")
+        self.assertEqual(docs.count(), 2)
+        for d in docs:
+            self.assertEqual(d.organization, self.org)
+            self.assertEqual(d.kind, "pickup_request")
+            self.assertEqual(d.content_object, lead)

recycle_core/views.py

@@ -72,7 +72,7 @@ def owner_required(view_func):
 @breadcrumbs(label="Materials", name="re_materials")
 def materials_list(request):
     # Create forms
-    mat_form = MaterialForm(request.POST or None)
+    mat_form = MaterialForm(request.POST or None, request.FILES or None)
     cat_form = MaterialCategoryForm(request.POST or None)
 
     # Restrict organization choices in forms to current org
@@ -91,6 +91,11 @@ def materials_list(request):
                 if getattr(request, "org", None) is not None:
                     obj.organization = request.org
                 obj.save()
+                # Save any uploaded images deferred by the form
+                try:
+                    mat_form.save_images(instance=obj)
+                except Exception:
+                    pass
                 messages.success(request, "Material created.")
                 return redirect("recycle_core:materials_list")
             else:
@@ -109,14 +114,14 @@ def materials_list(request):
     # Filters via django-filter to match list pattern
     class MaterialFilter(filters.FilterSet):
         organization = filters.ModelChoiceFilter(queryset=Organization.objects.all())
-        category = filters.ModelChoiceFilter(queryset=MaterialCategory.objects.all())
+        category = filters.ChoiceFilter(choices=Material.CATEGORY_CHOICES)
         name = filters.CharFilter(field_name="name", lookup_expr="icontains")
 
         class Meta:
             model = Material
             fields = ["organization", "category", "name"]
 
-    base_mats = Material.objects.select_related("organization", "category").order_by("organization_id", "name")
+    base_mats = Material.objects.select_related("organization").order_by("organization_id", "name")
     mat_filter = MaterialFilter(request.GET, queryset=base_mats)
     mats = mat_filter.qs
     # Scope to current organization if present
@@ -248,7 +253,7 @@ def org_user_delete(request, pk: int):
 def material_edit(request, pk: int):
     item = get_object_or_404(Material, pk=pk)
     if request.method == "POST":
-        form = MaterialForm(request.POST, instance=item)
+        form = MaterialForm(request.POST, request.FILES, instance=item)
         if form.is_valid():
             form.save()
             messages.success(request, "Material updated.")

requirements.txt

@@ -14,4 +14,8 @@ django-browser-reload
 django-allauth[socialaccount]
 django-markdownfield
 django-mptt
+django-extensions
+# Choose one of these for graph_models rendering
+# pygraphviz is preferred; alternatively install pydotplus and graphviz
+pygraphviz
 django-npm

seq.txt

@@ -0,0 +1,59 @@
+@startuml
+title Request Pickup (Fast Path)
+actor "Factory Officer" as FO
+participant "Public Site (FE)" as Web
+participant "Backend (Django)" as API
+actor "Staff (Web Admin)" as Staff
+actor Driver
+participant "Weigh Station" as Scale
+participant Billing
+
+FO -> Web: Open "Sell Scrap" (Request Pickup)
+Web --> FO: Show form (materials, qty, photos, address, time)
+FO -> Web: Submit form (+photos)
+Web -> API: POST /pickup-request
+API -> API: Create Lead (org, details)
+API --> Staff: Notify (inbox/email)
+Staff -> API: Create/attach Customer + Site
+Staff -> API: Create PickupOrder (status=requested)
+Staff -> API: Schedule + Assign Driver
+API --> FO: Confirmation (schedule)
+Driver -> FO: Arrive and collect
+Driver -> Scale: Weigh materials
+Scale -> API: Record WeighTicket + lines
+API -> Billing: Generate Invoice or Payout
+Billing --> FO: Invoice/Payout issued
+FO -> Billing: Pay / Receive funds
+API -> API: Mark Pickup completed
+@enduml
+
+@startuml
+title Get Bids (Marketplace Path)
+actor "Factory Officer" as FO
+participant "Public Site (FE)" as Web
+participant "Backend (Django)" as API
+actor "Staff (Web Admin)" as Staff
+actor "Recycler(s)" as Rec
+actor Driver
+participant "Weigh Station" as Scale
+participant Billing
+
+FO -> Web: "Sell Scrap" → Get Bids
+Web --> FO: Listing form (title, materials, qty, photos, reserve, ends)
+FO -> Web: Submit request
+Web -> API: POST listing-request
+API -> API: Create Draft ScrapListing (or Lead: listing_request)
+Staff -> API: Review + Publish (public or invite-only)
+API --> Rec: Listing visible / invites sent
+Rec -> API: Place Bid(s)
+Staff -> API: Close listing at end time
+Staff -> API: Award winning bid
+API -> API: Create PickupOrder from award
+Driver -> FO: Collect materials
+Driver -> Scale: Weigh materials
+Scale -> API: Record WeighTicket + lines
+API -> Billing: Generate Invoice or Payout
+Billing --> FO: Invoice/Payout issued
+API -> API: Mark Pickup completed
+@enduml
+