admin/37733-vm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update30

Browse Source
This commit is contained in:
Flatlogic Bot 2026-01-24 07:09:03 +00:00
parent a36477ad32
commit 3c28f6ef41
4 changed files with 43 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/__pycache__/middleware.cpython-311.pyc
View File

Binary file not shown.

10
core/middleware.py
View File

@ -27,12 +27,19 @@ class SubscriptionMiddleware:
reverse('logout'), reverse('logout'),
reverse('login'), reverse('login'),
reverse('register'), reverse('register'),
reverse('verify_otp_registration'),
reverse('verify_otp_login'),
reverse('subscription_expired'), reverse('subscription_expired'),
reverse('renew_subscription'),
reverse('thawani_success'),
reverse('thawani_cancel'),
reverse('thawani_webhook'),
reverse('home'), reverse('home'),
'/admin/', '/admin/',
'/static/', '/static/',
'/media/', '/media/',
'/i18n/', '/i18n/',
'/receipt/', # Whitelist receipts so they can be viewed/printed
] ]
# Check if the current path starts with any whitelisted path # 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: if request.user.is_authenticated and not request.user.is_superuser:
try: try:
profile = request.user.profile profile = request.user.profile
# If they are an admin role (not superuser but ADMIN role in profile), maybe don't suspend? # Admins are exempted
# Usually admins are exempted.
if profile.role == 'ADMIN': if profile.role == 'ADMIN':
return self.get_response(request) return self.get_response(request)

77
core/templates/core/shipper_dashboard.html
View File

@ -16,74 +16,35 @@
{% block content %} {% block content %}
<div class="container py-5"> <div class="container py-5">
<div class="d-flex justify-content-between align-items-center mb-4">
<div class="row mb-4"> <div class="row mb-4">
<div class="col-md-3"> <div class="col-md-8">
<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>
<h2 class="mb-1">{% trans "Shipper Dashboard" %}</h2> <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> <p class="text-muted">{% trans "Manage your shipping offers and active shipments." %}</p>
<div class="row mb-4"> </div>
<div class="col-md-3"> <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 shadow-sm border-0 bg-primary text-white h-100">
<div class="card-body"> <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> <h4 class="mb-3">{% trans "Payments" %}</h4>
<a href="{% url 'financial_history' %}" class="btn btn-light btn-sm">{% trans "View History" %}</a> <a href="{% url 'financial_history' %}" class="btn btn-light btn-sm">{% trans "View History" %}</a>
</div> </div>
</div> </div>
</div> </div>
</div> <!-- Add more stats here if needed -->
</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>
</div> </div>
<!-- Active Offers --> <!-- Active Offers -->

74
core/templates/core/truck_owner_dashboard.html
View File

@ -17,73 +17,31 @@
{% block content %} {% block content %}
<div class="container py-5"> <div class="container py-5">
<div class="d-flex justify-content-between align-items-center mb-4">
<div class="row mb-4"> <div class="row mb-4">
<div class="col-md-3"> <div class="col-md-8">
<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>
<h2 class="mb-1">{% trans "Truck Owner Dashboard" %}</h2> <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> <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="col-md-4 d-flex justify-content-md-end align-items-center">
</div> <a href="{% url 'truck_register' %}" class="btn btn-success">
<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">
<i class="fa-solid fa-plus me-2"></i> {% trans "Add New Truck" %} <i class="fa-solid fa-plus me-2"></i> {% trans "Add New Truck" %}
</a> </a>
</div> </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 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 --> <!-- Incoming Offers Section -->
<div class="card shadow-sm border-0 mb-5"> <div class="card shadow-sm border-0 mb-5">
<div class="card-header bg-white py-3"> <div class="card-header bg-white py-3">