From a094518411a6053285e26e5f2bd9139fc863eb06 Mon Sep 17 00:00:00 2001
From: Flatlogic Bot <support@flatlogic.com>
Date: Mon, 26 Jan 2026 08:25:00 +0000
Subject: [PATCH] adding reports

---
 core/__pycache__/urls.cpython-311.pyc         | Bin 5078 -> 5177 bytes
 core/__pycache__/views.cpython-311.pyc        | Bin 44098 -> 44630 bytes
 .../admin/{dashboard.html => index.html}      |   8 +-
 core/templates/base.html                      |   3 +
 core/templates/core/index.html                |  21 +--
 core/templates/core/invoice.html              | 139 ++++++++++++------
 core/templates/core/parcel_label.html         | 110 ++++++++++----
 core/templates/core/track.html                | 110 ++++++++++++++
 .../dashboard_stats.cpython-311.pyc           | Bin 3343 -> 3346 bytes
 core/templatetags/dashboard_stats.py          |   6 +-
 core/urls.py                                  |   1 +
 core/views.py                                 |  28 ++--
 12 files changed, 316 insertions(+), 110 deletions(-)
 rename core/templates/admin/{dashboard.html => index.html} (97%)
 create mode 100644 core/templates/core/track.html

diff --git a/core/__pycache__/urls.cpython-311.pyc b/core/__pycache__/urls.cpython-311.pyc
index dde20564d6079a7ed3bb7445c35a49d2ffb2e60b..ff037fec917711758d344642a1befccb9a5239e4 100644
GIT binary patch
delta 852
zcmYk4&rcIU6vw;v^%v0X0wIA`erQrlu~tZ-0W1V+0V~C#1%*;tuw8Tkfvo(9Cou7V
z2V==_;NXFiZlZ}A5`&)n2Q)Lu!~^l9CvWRNV4R)W;M>gG@4WA4-n?w~o9|<*^Oe(C
zVPf&){Fd@z&)FcP-}^eOXil*Br)2Y@-|&nmOuw<dG@DGX*($}JkZvoaQzrk+(VVs2
zELzvq`TWx56AOPIJ$DS4g^LJR{S;5Ccqz9wujb`tbnF~&R|BlcN!6OVx}Yq}xlKjh
zQiDdxwJEF0!lT^k`dX>l&Z=q$3W?(tF(w7J9?qj@;(!oAUqv^|zr-NR^{!xl#C1lu
zn=Fo<*siB2@2_aR7{Ua?6vDd0Fe|u;9iD?p+8D-tw=kp#q$s5H$_RSmO0Y)6)z7jd
zU1fPf>T5F2^_H5REpF^@Ycm*n2=q|s(XT|%Td9$OU!>-91~?#;$ogUzt@Uan7&-}b
zQs~qN86{S?SPUwLeoOA{A;HkYr4!iU)9R?d_j4nLB!MJ_q&~udYh|ES^U}5<oXBG+
z5GYV6=y6V5FB5Ir5Di3eoK2V^kfD&#M>&xw69G-8!5AK$#o)>k$WqAaV;s4GK2>{c
zNv_AyccyQ0J%RpIyKR$P-$u<f9@`zRr_f-H`@%HW=~DaM<^%7GOPYeAn?N^(ZheN^
z8T7cu<Dca^Tb{&wxIulxc<ep~g@8gq(Q}-*Yg}&6b6pS+VP8t-n}vV3xQmnfvswd&
z5P=YdkbaNbi>EfN^Zh@?68D!+hotVnyM7E&0#OQ4{Q>t^%9Ax6T4+nxaRNh}K%7F{
euCH=p9X+k}*f+S|<daET#%8C|c+@ESHU9#f^9K+B

delta 682
zcmXw%F>Df17{|HxqgT-5ptP~&ick%qv{Gwg6DXyE(%LEr5l^9L5P_zrn35~dIF-pX
z>Y#Zhc5q-TiHoL_TQ>)ncgc&1U3GN0$;HKYuetZ~{`uv5zwgT%-q-0LLE%sk>=wF2
z|E|(~CrofxzXY!g4R3^Mg}fzHJbF1aKRA58QmxjTtuV^k&mH}?`3JcfWEFl{Rf%?@
zzd~;I<ZM&j-c%a(a!0A}s$p6`5j%BN*?dvnZZ%J<muXd<M;%Abew`vm&rT9yM}mtX
zm*}B+Nt~luV);s(q<kp)XnqsZG)JAwH1p0IG(R}w7h>XozG$)9x~cuix9#_P{St<#
z22lc0J!V`kp*QaFfp`o#T|Q<fIHqG;sJ}pFmygRBWDR5jvYw<vb1wgy(U&r{V1JB+
z7LUCcvKnLwWc3x!5LQiLx*s4jD>z-nP}87Bpr+qs#v1zRlK6GTx6nVzw;89AcSPbd
zjPIapl(UTQqRNP8FVFa%Io;PABU1}_DUBhcL54s^mzi<jG^7KWc*CEmkklYaAgMoK
zLg7@{_Z<X2hWiSJhz1b?5xvN+H_ZNvJ(&dJI90$<)L^bips1Ia^3YTQy*3H1;>;EX
zMFWL^qCaBBWA^+C<0r^5D)CjuHPmpA^L55s=(T%-R~SD<pC~_L+(6&m9{xFF75#Bb
U{0`%mF~`|9xO>LfYJ&cf{{<4u+yDRo

diff --git a/core/__pycache__/views.cpython-311.pyc b/core/__pycache__/views.cpython-311.pyc
index 107f061b39ed6dbee443d7494f476f2441fe7b80..8053aadf0b14a7cedec2ab8dcf35d790674ebe5d 100644
GIT binary patch
delta 6702
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

delta 6338
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
NGv9s1=}r*G{{XYU`(6M5

diff --git a/core/templates/admin/dashboard.html b/core/templates/admin/index.html
similarity index 97%
rename from core/templates/admin/dashboard.html
rename to core/templates/admin/index.html
index 8630e68..e6e7a52 100644
--- a/core/templates/admin/dashboard.html
+++ b/core/templates/admin/index.html
@@ -1,4 +1,4 @@
-{% extends "admin/index.html" %}
+{% extends "admin/base_site.html" %}
 {% load i18n static dashboard_stats %}
 
 {% block extrastyle %}
@@ -243,8 +243,10 @@
 
 </div>
 
-<!-- Standard Admin Index Content -->
-{{ block.super }}
+<!-- Standard Admin App List -->
+<div id="content-main">
+    {% include "admin/app_list.html" with app_list=app_list show_changelinks=True %}
+</div>
 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.9.4/Chart.min.js" integrity="sha512-d9xgZrVZpmmQlfonhQUvTR7lMPtO7NkZMkA0ABN3PHCbKA5nqylQ/yWlFAyY6hYgdF1Qh6nYiuADWwKB4C2WSw==" crossorigin="anonymous"></script>
 <script>
diff --git a/core/templates/base.html b/core/templates/base.html
index 904b19b..63881c0 100644
--- a/core/templates/base.html
+++ b/core/templates/base.html
@@ -80,6 +80,9 @@
             
             <div class="collapse navbar-collapse" id="navbarNav">
                 <ul class="navbar-nav ms-auto align-items-center">
+                    <li class="nav-item">
+                        <a class="nav-link px-3" href="{% url 'track' %}">{% trans "Track" %}</a>
+                    </li>
                     <li class="nav-item">
                         <a class="nav-link px-3" href="{% url 'index' %}#how-it-works">{% trans "How it Works" %}</a>
                     </li>
diff --git a/core/templates/core/index.html b/core/templates/core/index.html
index c204a19..f9a9518 100644
--- a/core/templates/core/index.html
+++ b/core/templates/core/index.html
@@ -17,30 +17,13 @@
             <div class="col-lg-5 offset-lg-1">
                 <div class="glass-card">
                     <h3 class="mb-4">{% trans "Track your Parcel" %}</h3>
-                    <form method="GET" action="{% url 'index' %}">
+                    <form method="GET" action="{% url 'track' %}">
                         <div class="input-group mb-3">
-                            <input type="text" name="tracking_id" class="form-control tracking-input" placeholder="{% trans 'Enter Tracking ID (e.g. 5A2B...)' %}" value="{{ tracking_id|default:'' }}">
+                            <input type="text" name="tracking_number" class="form-control tracking-input" placeholder="{% trans 'Enter Tracking ID (e.g. 5A2B...)' %}" value="{{ tracking_number|default:'' }}">
                             <button class="btn btn-masarx-primary px-4" type="submit">{% trans "Track" %}</button>
                         </div>
                     </form>
-                    
-                    {% if parcel %}
-                    <div class="mt-4 p-3 bg-white bg-opacity-10 rounded-3 text-start" dir="ltr">
-                        <div class="d-flex justify-content-between align-items-center mb-3">
-                            <span class="text-uppercase small opacity-75">{% trans "Status" %}</span>
-                            <span class="parcel-status-badge status-{{ parcel.status }}">{{ parcel.get_status_display }}</span>
-                        </div>
-                        <h5 class="mb-1">{{ parcel.description|truncatechars:30 }}</h5>
-                        <p class="small mb-0 opacity-75">{% trans "From" %}: {{ parcel.pickup_address }}</p>
-                        <p class="small mb-0 opacity-75">{% trans "To" %}: {{ parcel.delivery_address }}</p>
-                    </div>
-                    {% elif error %}
-                    <div class="mt-3 text-danger small">
-                        <i class="bi bi-exclamation-circle me-1"></i> {{ error }}
-                    </div>
-                    {% else %}
                     <p class="small opacity-50 mt-3 mb-0">{% trans "Enter your 10-character tracking ID to see live updates." %}</p>
-                    {% endif %}
                 </div>
             </div>
         </div>
diff --git a/core/templates/core/invoice.html b/core/templates/core/invoice.html
index 02fafc5..b79ab24 100644
--- a/core/templates/core/invoice.html
+++ b/core/templates/core/invoice.html
@@ -1,10 +1,10 @@
 {% load static %}
 {% load i18n %}
 <!DOCTYPE html>
-<html lang="{{ request.LANGUAGE_CODE }}" dir="{% if request.LANGUAGE_CODE == 'ar' %}rtl{% else %}ltr{% endif %}">
+<html lang="en" dir="ltr">
 <head>
     <meta charset="UTF-8">
-    <title>{% trans "Tax Invoice" %} - {{ parcel.tracking_number }}</title>
+    <title>Invoice {{ parcel.tracking_number }}</title>
     <style>
         @page {
             size: A4;
@@ -14,45 +14,59 @@
             font-family: sans-serif;
             font-size: 14px;
             color: #333;
-            line-height: 1.5;
+            line-height: 1.4;
         }
         .header {
             width: 100%;
-            margin-bottom: 40px;
-            overflow: hidden;
+            margin-bottom: 30px;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            border-bottom: 2px solid #eee;
+            padding-bottom: 20px;
         }
-        .logo {
-            float: {% if request.LANGUAGE_CODE == 'ar' %}right{% else %}left{% endif %};
-            width: 150px;
+        .logo-section {
+            width: 40%;
         }
         .company-info {
-            float: {% if request.LANGUAGE_CODE == 'ar' %}left{% else %}right{% endif %};
-            text-align: {% if request.LANGUAGE_CODE == 'ar' %}left{% else %}right{% endif %};
+            width: 50%;
+            text-align: right;
+            font-size: 12px;
         }
         .title {
-            clear: both;
             text-align: center;
             font-size: 24px;
             font-weight: bold;
             margin-bottom: 30px;
             text-transform: uppercase;
-            border-bottom: 2px solid #eee;
-            padding-bottom: 10px;
+            background-color: #f9f9f9;
+            padding: 10px;
+            border: 1px solid #eee;
         }
+        .title span.ar { display: block; font-size: 18px; font-weight: normal; margin-top: 5px; }
+        
         .details-grid {
-            display: table;
-            width: 100%;
+            display: flex;
+            justify-content: space-between;
             margin-bottom: 30px;
         }
         .details-col {
-            display: table-cell;
-            width: 50%;
-            vertical-align: top;
+            width: 48%;
+            background: #fdfdfd;
+            padding: 15px;
+            border: 1px solid #eee;
+            border-radius: 4px;
         }
         .label {
             font-weight: bold;
             color: #666;
-            margin-bottom: 2px;
+            margin-bottom: 5px;
+            font-size: 11px;
+            text-transform: uppercase;
+            border-bottom: 1px solid #ddd;
+            padding-bottom: 2px;
+            display: flex;
+            justify-content: space-between;
         }
         .value {
             margin-bottom: 10px;
@@ -63,22 +77,23 @@
             margin-bottom: 30px;
         }
         th, td {
-            padding: 10px;
+            padding: 12px;
             border-bottom: 1px solid #eee;
+            text-align: left;
         }
         th {
-            background-color: #f9f9f9;
-            text-align: {% if request.LANGUAGE_CODE == 'ar' %}right{% else %}left{% endif %};
+            background-color: #f5f5f5;
             font-weight: bold;
+            font-size: 12px;
         }
-        .text-right {
-            text-align: {% if request.LANGUAGE_CODE == 'ar' %}left{% else %}right{% endif %};
-        }
+        th span.ar { display: block; font-weight: normal; font-size: 11px; color: #555; }
+        .text-right { text-align: right; }
         .total-row td {
             font-weight: bold;
             font-size: 16px;
             border-top: 2px solid #333;
             border-bottom: none;
+            background-color: #f9f9f9;
         }
         .footer {
             margin-top: 50px;
@@ -98,14 +113,15 @@
         }
         .paid { color: #0f9d58; border: 1px solid #0f9d58; }
         .pending { color: #f4b400; border: 1px solid #f4b400; }
+        .ar-text { direction: rtl; unicode-bidi: embed; }
     </style>
 </head>
 <body>
 
     <div class="header">
-        <div class="logo">
+        <div class="logo-section">
             {% if logo_base64 %}
-                <img src="data:image/jpeg;base64,{{ logo_base64 }}" style="max-width: 100%; max-height: 80px;">
+                <img src="data:image/jpeg;base64,{{ logo_base64 }}" style="max-width: 200px; max-height: 80px;">
             {% else %}
                 <h2>{{ platform_profile.name }}</h2>
             {% endif %}
@@ -114,28 +130,41 @@
             <strong>{{ platform_profile.name }}</strong><br>
             {{ platform_profile.address|linebreaksbr }}<br>
             {% if platform_profile.vat_number %}
-                {% trans "VAT Number" %}: {{ platform_profile.vat_number }}<br>
+                VAT / الرقم الضريبي: {{ platform_profile.vat_number }}<br>
             {% endif %}
-            {{ platform_profile.phone_number }}
+            Tel: {{ platform_profile.phone_number }}
         </div>
     </div>
 
-    <div class="title">{% trans "Tax Invoice" %}</div>
+    <div class="title">
+        TAX INVOICE
+        <span class="ar ar-text">فاتورة ضريبية</span>
+    </div>
 
     <div class="details-grid">
         <div class="details-col">
-            <div class="label">{% trans "Invoice Details" %}</div>
+            <div class="label">
+                <span>INVOICE DETAILS</span>
+                <span class="ar-text">تفاصيل الفاتورة</span>
+            </div>
             <div class="value">
-                {% trans "Invoice No" %}: #{{ parcel.id }}<br>
-                {% trans "Date" %}: {{ parcel.created_at|date:"Y-m-d" }}<br>
-                {% trans "Status" %}: 
+                <strong>No / رقم:</strong> #{{ parcel.id }}<br>
+                <strong>Date / التاريخ:</strong> {{ parcel.created_at|date:"Y-m-d" }}<br>
+                <strong>Status / الحالة:</strong> 
                 <span class="status-badge {% if parcel.payment_status == 'paid' %}paid{% else %}pending{% endif %}">
-                    {{ parcel.get_payment_status_display }}
+                    {% if parcel.payment_status == 'paid' %}
+                        PAID / مدفوع
+                    {% else %}
+                        PENDING / غير مدفوع
+                    {% endif %}
                 </span>
             </div>
         </div>
-        <div class="details-col text-right">
-            <div class="label">{% trans "Bill To" %}</div>
+        <div class="details-col">
+            <div class="label">
+                <span>BILL TO (Shipper)</span>
+                <span class="ar-text">فاتورة إلى (الشاحن)</span>
+            </div>
             <div class="value">
                 <strong>{{ parcel.shipper.first_name }} {{ parcel.shipper.last_name }}</strong><br>
                 {{ parcel.shipper.profile.address }}<br>
@@ -148,15 +177,30 @@
     <table>
         <thead>
             <tr>
-                <th>{% trans "Description" %}</th>
-                <th>{% trans "Tracking Number" %}</th>
-                <th>{% trans "Weight" %}</th>
-                <th class="text-right">{% trans "Amount" %} (OMR)</th>
+                <th width="50%">
+                    Description
+                    <span class="ar ar-text">الوصف</span>
+                </th>
+                <th>
+                    Tracking No
+                    <span class="ar ar-text">رقم التتبع</span>
+                </th>
+                <th>
+                    Weight
+                    <span class="ar ar-text">الوزن</span>
+                </th>
+                <th class="text-right">
+                    Amount (OMR)
+                    <span class="ar ar-text">المبلغ</span>
+                </th>
             </tr>
         </thead>
         <tbody>
             <tr>
-                <td>{% trans "Delivery Service" %} - {{ parcel.description|truncatechars:50 }}</td>
+                <td>
+                    Delivery Service / خدمة توصيل<br>
+                    <small>{{ parcel.description|truncatechars:50 }}</small>
+                </td>
                 <td>{{ parcel.tracking_number }}</td>
                 <td>{{ parcel.weight }} kg</td>
                 <td class="text-right">{{ parcel.price }}</td>
@@ -164,18 +208,21 @@
         </tbody>
         <tfoot>
             <tr class="total-row">
-                <td colspan="3" class="text-right">{% trans "Total" %}</td>
+                <td colspan="3" class="text-right">
+                    TOTAL / الإجمالي
+                </td>
                 <td class="text-right">{{ parcel.price }} OMR</td>
             </tr>
         </tfoot>
     </table>
 
     <div class="footer">
-        <p>{% trans "Thank you for using" %} {{ platform_profile.name }}!</p>
+        <p>Thank you for using {{ platform_profile.name }}!</p>
+        <p class="ar-text">شكراً لاستخدامكم {{ platform_profile.name }}!</p>
         {% if platform_profile.registration_number %}
-            <p>{% trans "CR No" %}: {{ platform_profile.registration_number }}</p>
+            <p>CR No / السجل التجاري: {{ platform_profile.registration_number }}</p>
         {% endif %}
     </div>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/core/templates/core/parcel_label.html b/core/templates/core/parcel_label.html
index f48534e..40a0982 100644
--- a/core/templates/core/parcel_label.html
+++ b/core/templates/core/parcel_label.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 <!DOCTYPE html>
-<html lang="{{ LANGUAGE_CODE }}" dir="{{ LANGUAGE_BIDI|yesno:'rtl,ltr' }}">
+<html lang="en" dir="ltr">
 <head>
     <meta charset="utf-8">
     <title>Label {{ parcel.tracking_number }}</title>
@@ -10,20 +10,21 @@
             margin: 0;
         }
         body {
-            font-family: sans-serif;
+            font-family: sans-serif; /* WeasyPrint uses system fonts. Ensure Arabic font is available. */
             margin: 0;
             padding: 5mm;
             font-size: 12px;
+            color: #000;
         }
         .container {
             border: 2px solid #000;
-            height: 138mm; /* Adjusted slightly */
+            height: 138mm;
             display: flex;
             flex-direction: column;
         }
         .header {
             border-bottom: 2px solid #000;
-            padding: 10px;
+            padding: 5px;
             text-align: center;
             height: 20mm;
             display: flex;
@@ -36,16 +37,20 @@
             max-width: 80mm;
         }
         .big-code {
-            font-size: 24px;
+            font-size: 20px;
             font-weight: bold;
             text-align: center;
-            padding: 10px;
+            padding: 8px;
             border-bottom: 2px solid #000;
             background-color: #f0f0f0;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            gap: 10px;
         }
         .address-box {
             border-bottom: 1px solid #000;
-            padding: 10px;
+            padding: 8px;
             flex-grow: 1;
         }
         .main-info {
@@ -53,13 +58,14 @@
             border-bottom: 2px solid #000;
         }
         .section {
-            padding: 10px;
+            padding: 8px;
             flex: 1;
+            border-right: 1px solid #000;
+            text-align: center;
+        }
+        .section:last-child {
+            border-right: none;
         }
-        /* RTL support for border */
-        html[dir="ltr"] .section-right { border-left: 2px solid #000; }
-        html[dir="rtl"] .section-right { border-right: 2px solid #000; }
-
         .qr-code {
             text-align: center;
             padding: 10px;
@@ -78,67 +84,107 @@
         .footer {
             padding: 5px;
             text-align: center;
-            font-size: 10px;
+            font-size: 9px;
+        }
+        h3 { 
+            margin: 0 0 5px 0; 
+            font-size: 10px; 
+            text-transform: uppercase; 
+            color: #333; 
+            border-bottom: 1px dotted #ccc;
+            padding-bottom: 2px;
+            display: flex;
+            justify-content: space-between;
+        }
+        h3 span.ar { font-weight: normal; }
+        p { margin: 0 0 2px 0; line-height: 1.2; }
+        .bold { font-weight: bold; font-size: 13px; }
+        .dual-text {
+            display: flex;
+            flex-direction: row;
+            gap: 5px;
+        }
+        .ar-text {
+            font-family: sans-serif;
+            direction: rtl;
         }
-        h3 { margin: 0 0 5px 0; font-size: 10px; text-transform: uppercase; color: #555; }
-        p { margin: 0 0 2px 0; }
-        .bold { font-weight: bold; font-size: 14px; }
     </style>
 </head>
 <body>
     <div class="container">
+        <!-- Platform Header -->
         <div class="header">
             {% if logo_base64 %}
-                <img src="data:image/jpeg;base64,{{ logo_base64 }}" alt="MasarX">
+                <img src="data:image/jpeg;base64,{{ logo_base64 }}" alt="Logo">
             {% else %}
                 <h1>{{ platform_profile.name|default:"MASARX" }}</h1>
             {% endif %}
         </div>
 
+        <!-- Destination City Code -->
         <div class="big-code">
-            {{ parcel.delivery_city.name|upper }}
+            <span>{{ parcel.delivery_city.name_en|upper }}</span>
+            <span class="ar-text">/ {{ parcel.delivery_city.name_ar }}</span>
         </div>
 
+        <!-- Receiver Info -->
         <div class="address-box">
-            <h3>{% trans "TO (Receiver)" %}</h3>
+            <h3>
+                <span>TO (Receiver)</span>
+                <span class="ar-text">إلى (المستلم)</span>
+            </h3>
             <p class="bold">{{ parcel.receiver_name }}</p>
             <p>{{ parcel.delivery_address }}</p>
-            <p>{{ parcel.delivery_city.name }}, {{ parcel.delivery_governate.name }}</p>
-            <p>{{ parcel.delivery_country.name }}</p>
-            <p>{% trans "Tel" %}: {{ parcel.receiver_phone }}</p>
+            <p>
+                {{ parcel.delivery_city.name_en }} / <span class="ar-text">{{ parcel.delivery_city.name_ar }}</span>
+            </p>
+            <p>
+                {{ parcel.delivery_governate.name_en }} / <span class="ar-text">{{ parcel.delivery_governate.name_ar }}</span> - {{ parcel.delivery_country.name_en }}
+            </p>
+            <p><strong>Tel / هاتف:</strong> {{ parcel.receiver_phone }}</p>
         </div>
 
+        <!-- Sender Info -->
         <div class="address-box">
-            <h3>{% trans "FROM (Sender)" %}</h3>
+            <h3>
+                <span>FROM (Sender)</span>
+                <span class="ar-text">من (المرسل)</span>
+            </h3>
             <p class="bold">{{ parcel.shipper.get_full_name|default:parcel.shipper.username }}</p>
             <p>{{ parcel.pickup_address }}</p>
-            <p>{{ parcel.pickup_city.name }}, {{ parcel.pickup_governate.name }}</p>
-            <p>{% trans "Tel" %}: {{ parcel.shipper.profile.phone_number }}</p>
+            <p>
+                {{ parcel.pickup_city.name_en }} / <span class="ar-text">{{ parcel.pickup_city.name_ar }}</span>
+            </p>
+            <p><strong>Tel / هاتف:</strong> {{ parcel.shipper.profile.phone_number }}</p>
         </div>
 
+        <!-- Info Row: Date, Weight, Price -->
         <div class="main-info">
             <div class="section">
-                <h3>{% trans "Date" %}</h3>
+                <h3>Date / التاريخ</h3>
                 <p class="bold">{{ parcel.created_at|date:"Y-m-d" }}</p>
             </div>
-            <div class="section section-right">
-                <h3>{% trans "Weight" %}</h3>
+            <div class="section">
+                <h3>Weight / الوزن</h3>
                 <p class="bold">{{ parcel.weight }} KG</p>
             </div>
-            <div class="section section-right">
-                <h3>{% trans "Price" %}</h3>
+            <div class="section">
+                <h3>COD / الدفع</h3>
                 <p class="bold">{{ parcel.price }} OMR</p>
             </div>
         </div>
 
+        <!-- Tracking & QR -->
         <div class="qr-code">
             <img src="data:image/png;base64,{{ qr_code }}" alt="QR Code">
             <div class="tracking-number">{{ parcel.tracking_number }}</div>
         </div>
 
+        <!-- Footer -->
         <div class="footer">
-            {% trans "Thank you for shipping with us." %}
+            Thank you for shipping with us.<br>
+            <span class="ar-text">شكراً لاستخدامكم خدماتنا.</span>
         </div>
     </div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/core/templates/core/track.html b/core/templates/core/track.html
new file mode 100644
index 0000000..0dcae19
--- /dev/null
+++ b/core/templates/core/track.html
@@ -0,0 +1,110 @@
+{% extends 'base.html' %}
+{% load static i18n %}
+
+{% block title %}{% trans "Track Shipment" %} - MasarX{% endblock %}
+
+{% block content %}
+<div class="container py-5">
+    <div class="row justify-content-center">
+        <div class="col-lg-8">
+            <div class="card shadow-sm border-0 rounded-4">
+                <div class="card-body p-4 p-md-5">
+                    <h2 class="text-center mb-4">{% trans "Track Your Shipment" %}</h2>
+                    
+                    <!-- Search Form -->
+                    <form method="GET" action="{% url 'track' %}" class="mb-5">
+                        <div class="input-group input-group-lg">
+                            <input type="text" name="tracking_number" class="form-control border-end-0" placeholder="{% trans 'Enter Tracking ID (e.g. TRK123456789)' %}" value="{{ tracking_number|default:'' }}" required>
+                            <button class="btn btn-primary px-4" type="submit">
+                                <i class="bi bi-search me-2"></i>{% trans "Track" %}
+                            </button>
+                        </div>
+                    </form>
+
+                    {% if error %}
+                    <div class="alert alert-danger rounded-3" role="alert">
+                        <i class="bi bi-exclamation-triangle-fill me-2"></i> {{ error }}
+                    </div>
+                    {% endif %}
+
+                    {% if parcel %}
+                    <!-- Status Timeline -->
+                    <div class="mb-5">
+                        <h5 class="mb-4 text-muted">{% trans "Shipment Status" %}</h5>
+                        <div class="position-relative m-4">
+                            <div class="progress" style="height: 4px;">
+                                <div class="progress-bar {% if parcel.status == 'delivered' %}bg-success{% else %}bg-primary{% endif %}" role="progressbar" style="width: 
+                                    {% if parcel.status == 'pending' %}10%
+                                    {% elif parcel.status == 'picked_up' %}50%
+                                    {% elif parcel.status == 'in_transit' %}75%
+                                    {% elif parcel.status == 'delivered' %}100%
+                                    {% else %}0%{% endif %}
+                                " aria-valuenow="50" aria-valuemin="0" aria-valuemax="100"></div>
+                            </div>
+                            
+                            <!-- Steps -->
+                            <div class="position-absolute top-0 start-0 translate-middle btn btn-sm rounded-pill {% if parcel.status != 'cancelled' %}btn-primary{% else %}btn-secondary{% endif %}" style="width: 2rem; height:2rem;">1</div>
+                            <div class="position-absolute top-0 start-50 translate-middle btn btn-sm rounded-pill {% if parcel.status in 'picked_up,in_transit,delivered' %}btn-primary{% else %}btn-secondary{% endif %}" style="width: 2rem; height:2rem;">2</div>
+                            <div class="position-absolute top-0 start-100 translate-middle btn btn-sm rounded-pill {% if parcel.status == 'delivered' %}btn-success{% else %}btn-secondary{% endif %}" style="width: 2rem; height:2rem;">3</div>
+                            
+                            <!-- Labels -->
+                            <div class="d-flex justify-content-between mt-2">
+                                <small class="fw-bold">{% trans "Order Placed" %}</small>
+                                <small class="fw-bold">{% trans "On the Way" %}</small>
+                                <small class="fw-bold">{% trans "Delivered" %}</small>
+                            </div>
+                        </div>
+                    </div>
+
+                    <!-- Parcel Details Card -->
+                    <div class="bg-light p-4 rounded-3 border">
+                        <div class="row g-4">
+                            <div class="col-md-6">
+                                <h6 class="text-uppercase text-muted small mb-2">{% trans "Tracking Number" %}</h6>
+                                <p class="fw-bold fs-5 mb-0">{{ parcel.tracking_number }}</p>
+                            </div>
+                            <div class="col-md-6">
+                                <h6 class="text-uppercase text-muted small mb-2">{% trans "Current Status" %}</h6>
+                                <span class="badge {% if parcel.status == 'delivered' %}bg-success{% elif parcel.status == 'cancelled' %}bg-danger{% else %}bg-primary{% endif %} fs-6">
+                                    {{ parcel.get_status_display }}
+                                </span>
+                            </div>
+                            <div class="col-12"><hr class="my-1"></div>
+                            
+                            <!-- From / To (Public View: Only City/Governate) -->
+                            <div class="col-md-6">
+                                <h6 class="text-uppercase text-muted small mb-2">{% trans "From" %}</h6>
+                                <p class="mb-0 fw-medium">{{ parcel.pickup_city.name }}</p>
+                                <small class="text-muted">{{ parcel.pickup_governate.name }}</small>
+                            </div>
+                            <div class="col-md-6">
+                                <h6 class="text-uppercase text-muted small mb-2">{% trans "To" %}</h6>
+                                <p class="mb-0 fw-medium">{{ parcel.delivery_city.name }}</p>
+                                <small class="text-muted">{{ parcel.delivery_governate.name }}</small>
+                            </div>
+                            
+                            <div class="col-12"><hr class="my-1"></div>
+
+                            <div class="col-md-6">
+                                <h6 class="text-uppercase text-muted small mb-2">{% trans "Last Updated" %}</h6>
+                                <p class="mb-0">{{ parcel.updated_at|date:"d M Y, h:i A" }}</p>
+                            </div>
+                            <div class="col-md-6">
+                                <h6 class="text-uppercase text-muted small mb-2">{% trans "Description" %}</h6>
+                                <p class="mb-0">{{ parcel.description }}</p>
+                            </div>
+                        </div>
+                    </div>
+                    {% else %}
+                    <!-- Empty State / Instructions -->
+                    <div class="text-center text-muted py-5">
+                        <i class="bi bi-box-seam display-1 opacity-25"></i>
+                        <p class="mt-3">{% trans "Enter your tracking number above to see shipment details." %}</p>
+                    </div>
+                    {% endif %}
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/core/templatetags/__pycache__/dashboard_stats.cpython-311.pyc b/core/templatetags/__pycache__/dashboard_stats.cpython-311.pyc
index 03b1a63aa36cb821c2208c598cbe7bc9c0bf68f7..193eeb19b97d68696bc232fbab3079bb5e2ecd40 100644
GIT binary patch
delta 131
zcmeB|nk2=yoR^o20SKNbmuEg^-^h1>m4h=mu_!*jJa6-5*4d1VN}Kc9b(qAsFNkPe
z6tTG?Vsl-@>5_=kMG==PA}*6Ra<($^Og87*&dtoK{DA>TbZ|V~{FCbwqlzXY+Xn_9
X@sXK<N%RV%$Ok5v2w1pC4rnU?NA4wX

delta 128
zcmbOv)i1@joR^o20SJ!&EXzE|wvq1uD=S+{QD)iZYpk;w8Ra(@vFk92aa<75x+r3K
zMa1&Di2WrI`->uuS412qZ{ciZWSeZowVj)ZRrv!0km%sJyZH~-Cq@-jMz#+OK;k1a
U1C!_#Mv)IpFcGkDksQ!U0PZv-o&W#<

diff --git a/core/templatetags/dashboard_stats.py b/core/templatetags/dashboard_stats.py
index d61e43e..7b5bd21 100644
--- a/core/templatetags/dashboard_stats.py
+++ b/core/templatetags/dashboard_stats.py
@@ -12,7 +12,7 @@ register = template.Library()
 def get_dashboard_stats():
     # User Stats
     total_users = User.objects.count()
-    drivers_count = Profile.objects.filter(role='driver').count()
+    drivers_count = Profile.objects.filter(role='car_owner').count()
     shippers_count = Profile.objects.filter(role='shipper').count()
 
     # Parcel Stats
@@ -21,6 +21,9 @@ def get_dashboard_stats():
     pending_parcels = Parcel.objects.filter(status='pending').count()
     
     # Financials
+    # Summing price of delivered parcels (assuming delivered = revenue realized)
+    # If payments are enabled, we might want to check payment_status='paid' as well.
+    # For now, sticking to delivered as a safe proxy for completed business.
     total_revenue = Parcel.objects.filter(status='delivered').aggregate(Sum('price'))['price__sum'] or 0
     
     # Recent Activity
@@ -32,6 +35,7 @@ def get_dashboard_stats():
     
     daily_counts = []
     for date_str in dates:
+        # We'll use created_at__date lookup
         count = Parcel.objects.filter(created_at__date=date_str).count()
         daily_counts.append(count)
 
diff --git a/core/urls.py b/core/urls.py
index fd3ec0e..1a0424f 100644
--- a/core/urls.py
+++ b/core/urls.py
@@ -34,6 +34,7 @@ urlpatterns = [
     path('dashboard/', views.dashboard, name='dashboard'),
     path('scan-qr/', views.scan_qr_view, name='scan_qr'),
     path('shipment-request/', views.shipment_request, name='shipment_request'),
+    path('track/', views.track_parcel, name='track'),
     path('accept-parcel/<int:parcel_id>/', views.accept_parcel, name='accept_parcel'),
     path('update-status/<int:parcel_id>/', views.update_status, name='update_status'),
     path('rate-driver/<int:parcel_id>/', views.rate_driver, name='rate_driver'),
diff --git a/core/views.py b/core/views.py
index c9347b9..a33f5c2 100644
--- a/core/views.py
+++ b/core/views.py
@@ -35,14 +35,10 @@ from io import BytesIO
 import base64
 
 def index(request):
+    # If tracking_id is present, redirect to the new track view
     tracking_id = request.GET.get('tracking_id')
-    parcel = None
-    error = None
     if tracking_id:
-        try:
-            parcel = Parcel.objects.get(tracking_number=tracking_id)
-        except Parcel.DoesNotExist:
-            error = _("Parcel not found.")
+        return redirect(f"{reverse('track')}?tracking_number={tracking_id}")
     
     testimonials = Testimonial.objects.filter(is_active=True)
     
@@ -58,14 +54,28 @@ def index(request):
     ).order_by('-shipment_count')[:5]
     
     return render(request, 'core/index.html', {
-        'parcel': parcel,
-        'error': error,
-        'tracking_id': tracking_id,
         'testimonials': testimonials,
         'top_drivers': top_drivers,
         'top_shippers': top_shippers
     })
 
+def track_parcel(request):
+    tracking_number = request.GET.get('tracking_number')
+    parcel = None
+    error = None
+    
+    if tracking_number:
+        try:
+            parcel = Parcel.objects.get(tracking_number__iexact=tracking_number.strip())
+        except Parcel.DoesNotExist:
+            error = _("Parcel not found with this Tracking ID.")
+            
+    return render(request, 'core/track.html', {
+        'parcel': parcel,
+        'error': error,
+        'tracking_number': tracking_number
+    })
+
 def register(request):
     if request.method == 'POST':
         form = UserRegistrationForm(request.POST)