From 3c28f6ef4178c1ea1c6d2d75bf9f28dece724b0c Mon Sep 17 00:00:00 2001
From: Flatlogic Bot <support@flatlogic.com>
Date: Sat, 24 Jan 2026 07:09:03 +0000
Subject: [PATCH] update30

---
 core/__pycache__/middleware.cpython-311.pyc   | Bin 3238 -> 3605 bytes
 core/middleware.py                            |  10 ++-
 core/templates/core/shipper_dashboard.html    |  77 +++++-------------
 .../templates/core/truck_owner_dashboard.html |  74 ++++-------------
 4 files changed, 43 insertions(+), 118 deletions(-)

diff --git a/core/__pycache__/middleware.cpython-311.pyc b/core/__pycache__/middleware.cpython-311.pyc
index 6acfa1c4bd768d5ee44aaf70c54c18a68641b696..5a02852bc086d208655f5db205411d421cc279d0 100644
GIT binary patch
delta 648
zcmZ1`IaP*tIWI340}#x}FUkDAkvD>cO904Y2I9{zCg-zEp1h8QmyvDq0v2gTb}-2S
zCON?*7l_p7UdG74uo{RVAcZG|H-#^SKSdy2pq8lwWE2#1Fs3o42u@aDt!5OOJcl(K
zXf6kvC!_G>Ah!5=5x-k(Ir-`Nr6spmfplixEsmnp^vvRt)S_GBWvNA(X_fK$B?a*i
z!J@>H%>2At0!R`NO(MmmNyW)UnFS#E_|%Gm%%aqkTS7&td8y^`$a1&%OEMD66Z0~G
zqRGjr%EiUE_+TQ*iFwJXIS3WysYx06`Pq{nv1xHtaq1VPCZ_@|n9R-I&Zs+iGJ6Q4
z-sTtV9E^-+lRt8}GtQlC$*EVbdyz-)3Xk4h9^nfjY8QFbukfgY*;*HQw6E}JgV`Dv
zc{H!^XoA_Q7kSjK@Th^=Di?WFukfg%iBE9r^zZS%!6SNuM+{7g+~5)apeQKIb%8_j
zs|JIV>;;)f7@9nrQ(lFe)0uID_!gNfhF%{SK%5UuT)fVVH>4Ej=v<M~o521+SZeYE
z&aJYC#kE~D8ICZkfJjX)S1INr#<H%W%tu98U8N>(;&KsHW0m;8fKE*2=I&**nmm(R
dozZRbLGBHvT8uzdn8Zhr*cU7kMZ&<O0RRb_$jJZz

delta 347
zcmbO#vrLkAIWI340}y<5Dalmb$Q!}J#R=pw1Mz3O$@wgk<x<#E*i$%CIMX?6nMy$7
zP|(4c#+br2`4nq4Bll!Cw(QB*S@<U(V6$fAnf!+>o{@KQ47>E?MeJge|FLUMHsWYw
zRG++)BZN_XGan}hBcs7&aV~epkje2}dTLr1d9<(aXy4@#p5WH$-{XISNAw1d7?>3K
zAj~Dpb%8_jtJLIwT)JvJoX(6J#J9*?G4%St0OEXL;^uW`ydkAHN9T%^-URj!Yz!jO
zll{53${u3Ub{1hcq^ANT4~uZQureQ(lXYQWKElB2!a7-z$3;|uRpJ8!Ix)G5r<c)W
gG6%0Zqr+qa-VLTIj6hYG#7B_W7c3G*!oUCm05Bm}q5uE@

diff --git a/core/middleware.py b/core/middleware.py
index d5ee3ba..5cff17f 100644
--- a/core/middleware.py
+++ b/core/middleware.py
@@ -27,12 +27,19 @@ class SubscriptionMiddleware:
             reverse('logout'),
             reverse('login'),
             reverse('register'),
+            reverse('verify_otp_registration'),
+            reverse('verify_otp_login'),
             reverse('subscription_expired'),
+            reverse('renew_subscription'),
+            reverse('thawani_success'),
+            reverse('thawani_cancel'),
+            reverse('thawani_webhook'),
             reverse('home'),
             '/admin/',
             '/static/',
             '/media/',
             '/i18n/',
+            '/receipt/', # Whitelist receipts so they can be viewed/printed
         ]
         
         # Check if the current path starts with any whitelisted path
@@ -41,8 +48,7 @@ class SubscriptionMiddleware:
         if request.user.is_authenticated and not request.user.is_superuser:
             try:
                 profile = request.user.profile
-                # If they are an admin role (not superuser but ADMIN role in profile), maybe don't suspend?
-                # Usually admins are exempted.
+                # Admins are exempted
                 if profile.role == 'ADMIN':
                     return self.get_response(request)
 
diff --git a/core/templates/core/shipper_dashboard.html b/core/templates/core/shipper_dashboard.html
index e0ddd95..75738f9 100644
--- a/core/templates/core/shipper_dashboard.html
+++ b/core/templates/core/shipper_dashboard.html
@@ -16,74 +16,35 @@
 
 {% block content %}
 <div class="container py-5">
-    <div class="d-flex justify-content-between align-items-center mb-4">
     <div class="row mb-4">
-        <div class="col-md-3">
-            <div class="card shadow-sm border-0 bg-primary text-white h-100">
-                <div class="card-body">
-                    <h6 class="text-uppercase small">{% trans "Financials" %}</h6>
-                    <h4 class="mb-3">{% trans "Payments" %}</h4>
-                    <a href="{% url 'financial_history' %}" class="btn btn-light btn-sm">{% trans "View History" %}</a>
-                </div>
-            </div>
-        </div>
-    </div>
-        <div>
-    <div class="row mb-4">
-        <div class="col-md-3">
-            <div class="card shadow-sm border-0 bg-primary text-white h-100">
-                <div class="card-body">
-                    <h6 class="text-uppercase small">{% trans "Financials" %}</h6>
-                    <h4 class="mb-3">{% trans "Payments" %}</h4>
-                    <a href="{% url 'financial_history' %}" class="btn btn-light btn-sm">{% trans "View History" %}</a>
-                </div>
-            </div>
-        </div>
-    </div>
+        <div class="col-md-8">
             <h2 class="mb-1">{% trans "Shipper Dashboard" %}</h2>
-    <div class="row mb-4">
-        <div class="col-md-3">
-            <div class="card shadow-sm border-0 bg-primary text-white h-100">
-                <div class="card-body">
-                    <h6 class="text-uppercase small">{% trans "Financials" %}</h6>
-                    <h4 class="mb-3">{% trans "Payments" %}</h4>
-                    <a href="{% url 'financial_history' %}" class="btn btn-light btn-sm">{% trans "View History" %}</a>
-                </div>
-            </div>
-        </div>
-    </div>
             <p class="text-muted">{% trans "Manage your shipping offers and active shipments." %}</p>
-    <div class="row mb-4">
-        <div class="col-md-3">
+        </div>
+        <div class="col-md-4 d-flex justify-content-md-end align-items-center">
+            <div class="d-flex gap-2">
+                <a href="{% url 'post_shipment' %}" class="btn btn-success">
+                    <i class="fa-solid fa-plus me-2"></i> {% trans "Add A Bid" %}
+                </a>
+                <a href="{% url 'marketplace' %}" class="btn btn-primary">
+                    <i class="fa-solid fa-search me-2"></i> {% trans "Browse Trucks" %}
+                </a>
+            </div>
+        </div>
+    </div>
+
+    <!-- Stats and Quick Actions -->
+    <div class="row mb-5">
+        <div class="col-md-3 mb-3">
             <div class="card shadow-sm border-0 bg-primary text-white h-100">
                 <div class="card-body">
-                    <h6 class="text-uppercase small">{% trans "Financials" %}</h6>
+                    <h6 class="text-uppercase small opacity-75">{% trans "Financials" %}</h6>
                     <h4 class="mb-3">{% trans "Payments" %}</h4>
                     <a href="{% url 'financial_history' %}" class="btn btn-light btn-sm">{% trans "View History" %}</a>
                 </div>
             </div>
         </div>
-    </div>
-        </div>
-    <div class="row mb-4">
-        <div class="col-md-3">
-            <div class="card shadow-sm border-0 bg-primary text-white h-100">
-                <div class="card-body">
-                    <h6 class="text-uppercase small">{% trans "Financials" %}</h6>
-                    <h4 class="mb-3">{% trans "Payments" %}</h4>
-                    <a href="{% url 'financial_history' %}" class="btn btn-light btn-sm">{% trans "View History" %}</a>
-                </div>
-            </div>
-        </div>
-    </div>
-        <div class="d-flex gap-2">
-            <a href="{% url 'post_shipment' %}" class="btn btn-success btn-lg">
-                <i class="fa-solid fa-plus me-2"></i> {% trans "Add A Bid" %}
-            </a>
-            <a href="{% url 'marketplace' %}" class="btn btn-primary btn-lg">
-                <i class="fa-solid fa-search me-2"></i> {% trans "Browse Trucks" %}
-            </a>
-        </div>
+        <!-- Add more stats here if needed -->
     </div>
 
     <!-- Active Offers -->
diff --git a/core/templates/core/truck_owner_dashboard.html b/core/templates/core/truck_owner_dashboard.html
index fc33194..76f7ec5 100644
--- a/core/templates/core/truck_owner_dashboard.html
+++ b/core/templates/core/truck_owner_dashboard.html
@@ -17,73 +17,31 @@
 
 {% block content %}
 <div class="container py-5">
-    <div class="d-flex justify-content-between align-items-center mb-4">
     <div class="row mb-4">
-        <div class="col-md-3">
-            <div class="card shadow-sm border-0 bg-primary text-white h-100">
-                <div class="card-body">
-                    <h6 class="text-uppercase small">{% trans "Financials" %}</h6>
-                    <h4 class="mb-3">{% trans "Payments" %}</h4>
-                    <a href="{% url 'financial_history' %}" class="btn btn-light btn-sm">{% trans "View History" %}</a>
-                </div>
-            </div>
-        </div>
-    </div>
-        <div>
-    <div class="row mb-4">
-        <div class="col-md-3">
-            <div class="card shadow-sm border-0 bg-primary text-white h-100">
-                <div class="card-body">
-                    <h6 class="text-uppercase small">{% trans "Financials" %}</h6>
-                    <h4 class="mb-3">{% trans "Payments" %}</h4>
-                    <a href="{% url 'financial_history' %}" class="btn btn-light btn-sm">{% trans "View History" %}</a>
-                </div>
-            </div>
-        </div>
-    </div>
+        <div class="col-md-8">
             <h2 class="mb-1">{% trans "Truck Owner Dashboard" %}</h2>
-    <div class="row mb-4">
-        <div class="col-md-3">
-            <div class="card shadow-sm border-0 bg-primary text-white h-100">
-                <div class="card-body">
-                    <h6 class="text-uppercase small">{% trans "Financials" %}</h6>
-                    <h4 class="mb-3">{% trans "Payments" %}</h4>
-                    <a href="{% url 'financial_history' %}" class="btn btn-light btn-sm">{% trans "View History" %}</a>
-                </div>
-            </div>
-        </div>
-    </div>
             <p class="text-muted">{% trans "Manage your fleet and incoming shipping offers." %}</p>
-    <div class="row mb-4">
-        <div class="col-md-3">
-            <div class="card shadow-sm border-0 bg-primary text-white h-100">
-                <div class="card-body">
-                    <h6 class="text-uppercase small">{% trans "Financials" %}</h6>
-                    <h4 class="mb-3">{% trans "Payments" %}</h4>
-                    <a href="{% url 'financial_history' %}" class="btn btn-light btn-sm">{% trans "View History" %}</a>
-                </div>
-            </div>
         </div>
-    </div>
-        </div>
-    <div class="row mb-4">
-        <div class="col-md-3">
-            <div class="card shadow-sm border-0 bg-primary text-white h-100">
-                <div class="card-body">
-                    <h6 class="text-uppercase small">{% trans "Financials" %}</h6>
-                    <h4 class="mb-3">{% trans "Payments" %}</h4>
-                    <a href="{% url 'financial_history' %}" class="btn btn-light btn-sm">{% trans "View History" %}</a>
-                </div>
-            </div>
-        </div>
-    </div>
-        <div>
-            <a href="{% url 'truck_register' %}" class="btn btn-success btn-lg">
+        <div class="col-md-4 d-flex justify-content-md-end align-items-center">
+            <a href="{% url 'truck_register' %}" class="btn btn-success">
                 <i class="fa-solid fa-plus me-2"></i> {% trans "Add New Truck" %}
             </a>
         </div>
     </div>
 
+    <!-- Stats and Quick Actions -->
+    <div class="row mb-5">
+        <div class="col-md-3 mb-3">
+            <div class="card shadow-sm border-0 bg-primary text-white h-100">
+                <div class="card-body">
+                    <h6 class="text-uppercase small opacity-75">{% trans "Financials" %}</h6>
+                    <h4 class="mb-3">{% trans "Payments" %}</h4>
+                    <a href="{% url 'financial_history' %}" class="btn btn-light btn-sm">{% trans "View History" %}</a>
+                </div>
+            </div>
+        </div>
+    </div>
+
     <!-- Incoming Offers Section -->
     <div class="card shadow-sm border-0 mb-5">
         <div class="card-header bg-white py-3">