From 595ca7c1fe6ce1f9dc5d75fa8eff12ee90880737 Mon Sep 17 00:00:00 2001
From: Flatlogic Bot <support@flatlogic.com>
Date: Mon, 26 Jan 2026 08:06:46 +0000
Subject: [PATCH] adding invoice

---
 core/__pycache__/urls.cpython-311.pyc      | Bin 4305 -> 5078 bytes
 core/__pycache__/views.cpython-311.pyc     | Bin 37882 -> 44098 bytes
 core/templates/core/driver_dashboard.html  |   7 +-
 core/templates/core/invoice.html           | 181 ++++++++++++++++
 core/templates/core/scan_qr.html           | 240 +++++++++++++++++++++
 core/templates/core/shipper_dashboard.html |  23 +-
 core/urls.py                               |   5 +
 core/views.py                              | 134 ++++++++++++
 8 files changed, 586 insertions(+), 4 deletions(-)
 create mode 100644 core/templates/core/invoice.html
 create mode 100644 core/templates/core/scan_qr.html

diff --git a/core/__pycache__/urls.cpython-311.pyc b/core/__pycache__/urls.cpython-311.pyc
index 767dfd6355e9a8668fa46099e8c5b46921753927..dde20564d6079a7ed3bb7445c35a49d2ffb2e60b 100644
GIT binary patch
delta 1606
zcmZ{kOH3PA6ox(K*fH3~E-IvugolV@8{#?&0r3b<YzT=PYzVd!2oJ}>0~tbqjBRMU
zC`gqm)J753AeBWItXiwBsy;SdvhJd~Q(Z-sSCy*nuV__8UG+X@TB!|V&Hc~)&v))?
zW~_I-@CQC~yX!3U^0aR$J8p~RSJp8vrxE;q#a<2sq~-F2&svts#c|diu~u_Q=b2m*
zl9tk}SCM$`4=L#?OIC|4<vV3q@s!_d(;izp8S&i8%f1!zLdai2T5EVNCS*y-heEy*
z@{^E1g|q-KhzNNo<O3m}3;9vVv5+PkFBlZEU^~BUEOSz>S@D^>&)@md{%MWH@&&!c
zWl&R;x?p<w)Cp9YQvQFa%n8(8N(C&P2A9A0f9!rRKb^7!XTE!8dueTO6c%%9p{HuN
zdWuEar>ge8<2R{I`^Is)MOoWiR~F@P)w?XO$!e}BXAMhRu077bkz2{V9bT4;p^con
zD6fX{axtf@7Q)pAYG#F*HOzNgI9=Mv(_zelLNQk?QNCH&W{I$~tU#Ntdnt8kcburc
z>M~ZC-Bjc)?SgCUni`-RRfDYQVof(~s;&)neMwoBIi`k~<=K=~W$B&ldT~RzVMbrl
zK6XtyV>FcLU5MJWV^^ddhCJ4v!Lc*C+pwE?HhZvzz^{WJgP+vU)GyjCcd(AwXh`f9
zTdh`f`$owr)^*S>EjzO(@2^z`5%lTMhoO(uvSb}kqS`YD8GNn}4NoCR>5#&ZB2Jd~
zYCpJd+FxT~yVg)YVDDgIKpU@**n=#*tbJ79zum*aK{3(Uz0&@6WfsAJ4g(kl$Pi0j
z70H&p3~uyS6a@V`^ke8J!z>#ymT~q##;sS-Py#_xha`q1xyJI>B?AandU1E;D2pJY
zLk2^JM5Q55+)8366C;$cl2H@zR~m6}@aP<Z2^}UdOpqHK7-N7I@ia}6o7}i%R&-Tv
z;EOR7r+b>yVGhF_iF4vDlek!s@tdRQ_B?_G9TqSwklUOX=Ywu|np`BojU+cDZ__rJ
z;Kq~~W0xKqKHZHj#}JI@FoI!(q&Sc^Cuuuu#2vlp>NtXg4hakilHtT%li*J=^fd*d
zIz%x<$vqBC8*{WB_&y04ho9!BKg09)%>g<OGuStbMyC<X=rDs}hRkwe&Ln(?CF~zV
ziAM+&9TW@-ndig<Mrd?nPe_g%56zNSJk&)_<OQ)yUyA+tN;85U9eObI5SgbR{hR*J
zJEQRY3ZL<T_w_FFm>a9+jID<@+}`^=J%_jsaSU<tgaa!5OZGPRkOJ=&P5c!LEHPro
L$$si}`WgNWgx1{}

delta 841
zcmaiyUr19?9LIOBzloc=O`Vp1wq<T@YZ}yWY?cG371B)S8bqRw+BK$;viwsIq4W@Y
zh}bwjjOamn={`gWh4koC^mtDEiXlA+^%!CFkdOU#cME#zTt3`$zrXYQcYo)TS9JTH
zH#V9LwDMhRSx1Ax@TKzcXC2o!Khwsd&sUsu7w^W4@8ZlZx!C}bmaecJDQ=bxij;9G
zFmEYx7weNfRi%d%Yel&)_poQOo4qH#6ZRVNC(^`2;sx=6I3%3lW+TKrQ6P4R&xCAr
zGaqr8SSFqr-R7IlYo5$R(%?_LPS+mFY{B%EJuv@Z<@#UJ3C0_^G1pElu$PS&0(%Wh
zxy8BcEoF8!tE}bxr0-c*m0Wi2-t6M?QdJF*n(Jjj%S8PkZ6)GPxrRNqM32@QjHZo|
zd~-haXsWcv!7IRv;4QOn7Jp3{>X^&wIZbam(^*h9Z>s|wLIOevAx-6`&Qb~;AwD?C
zAt@k<kUXemdFw^V#y(mjQXR9~qLP_iwS_zCs>!+vE1T=;6o-g_2tuTi=2c7Ex*pK4
z_G2KrJIf&@Acc_nkM31l(Lb>3;4m&=9AR8P?^8W^@;r~<;E)lJLCENaURA+UBmB}d
zhZzAg2s4_2?Kau9miL?5uJ3CtQ>Az$z|X`u3=0@W7}i6$wpy{fpP!3!7!xptFs2){
zztOi%`jCJjgdt7OyGov?eQK6NSU?ydOe&)^TDrfj=Q|3i&1torLr_2vAy_SfRBZMB
z>rCUIkl4|?9pw-c5JQOR6*#wyc&z^|RWK@G6k+tBI%95flvdD1lbYa=5RgDf=q_FC
UO-r+FK?+&rjrz)yJ4;vOH_yKnZ2$lO

diff --git a/core/__pycache__/views.cpython-311.pyc b/core/__pycache__/views.cpython-311.pyc
index 4631679ec4bcb86a15e9ce060ccd314b04c50359..107f061b39ed6dbee443d7494f476f2441fe7b80 100644
GIT binary patch
delta 4773
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
NjagPD4dkD+{{z-8utER;

delta 270
zcmX?fgX!0DCiUgKyj%=G@J*&X^L-Wr!($K!2AH6X&w3lxb(z^xM1vVLjW!=*wy9*)
z-2A`h028Ca<OB6ujM|%D*LSlkYcds;0Cn8rNJ=bDjV~?Asp3y8D9Fi7PAtjH&(kkR
zNz<G>vt5&;id7HDR;t>3s@<EB(Ppw(rxDN~&rV~;$j!B#mzbC|Q#a39oW-QC$Otrz
zKQU7;CqFqcCq6MVKCvLP$Ovdhksna1$Q~rml$l>-3=(piY`Uz7O&cT;Ir-o+Dd9pO
o6Nng!udpyMd|+l|WV|u?<1(qu9Lra;@G<B!ihKYOMGZhD09^`Aa{vGU

diff --git a/core/templates/core/driver_dashboard.html b/core/templates/core/driver_dashboard.html
index 40ea4ec..1958d31 100644
--- a/core/templates/core/driver_dashboard.html
+++ b/core/templates/core/driver_dashboard.html
@@ -3,7 +3,12 @@
 
 {% block content %}
 <div class="container py-5">
-    <h1 class="mb-4">{% trans "Driver Dashboard" %}</h1>
+    <div class="d-flex justify-content-between align-items-center mb-4">
+        <h1 class="mb-0">{% trans "Driver Dashboard" %}</h1>
+        <a href="{% url 'scan_qr' %}" class="btn btn-primary rounded-pill px-4">
+            <i class="bi bi-qr-code-scan me-2"></i> {% trans "Scan Parcel" %}
+        </a>
+    </div>
 
     <ul class="nav nav-pills mb-4" id="pills-tab" role="tablist">
         <li class="nav-item" role="presentation">
diff --git a/core/templates/core/invoice.html b/core/templates/core/invoice.html
new file mode 100644
index 0000000..02fafc5
--- /dev/null
+++ b/core/templates/core/invoice.html
@@ -0,0 +1,181 @@
+{% load static %}
+{% load i18n %}
+<!DOCTYPE html>
+<html lang="{{ request.LANGUAGE_CODE }}" dir="{% if request.LANGUAGE_CODE == 'ar' %}rtl{% else %}ltr{% endif %}">
+<head>
+    <meta charset="UTF-8">
+    <title>{% trans "Tax Invoice" %} - {{ parcel.tracking_number }}</title>
+    <style>
+        @page {
+            size: A4;
+            margin: 2cm;
+        }
+        body {
+            font-family: sans-serif;
+            font-size: 14px;
+            color: #333;
+            line-height: 1.5;
+        }
+        .header {
+            width: 100%;
+            margin-bottom: 40px;
+            overflow: hidden;
+        }
+        .logo {
+            float: {% if request.LANGUAGE_CODE == 'ar' %}right{% else %}left{% endif %};
+            width: 150px;
+        }
+        .company-info {
+            float: {% if request.LANGUAGE_CODE == 'ar' %}left{% else %}right{% endif %};
+            text-align: {% if request.LANGUAGE_CODE == 'ar' %}left{% else %}right{% endif %};
+        }
+        .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;
+        }
+        .details-grid {
+            display: table;
+            width: 100%;
+            margin-bottom: 30px;
+        }
+        .details-col {
+            display: table-cell;
+            width: 50%;
+            vertical-align: top;
+        }
+        .label {
+            font-weight: bold;
+            color: #666;
+            margin-bottom: 2px;
+        }
+        .value {
+            margin-bottom: 10px;
+        }
+        table {
+            width: 100%;
+            border-collapse: collapse;
+            margin-bottom: 30px;
+        }
+        th, td {
+            padding: 10px;
+            border-bottom: 1px solid #eee;
+        }
+        th {
+            background-color: #f9f9f9;
+            text-align: {% if request.LANGUAGE_CODE == 'ar' %}right{% else %}left{% endif %};
+            font-weight: bold;
+        }
+        .text-right {
+            text-align: {% if request.LANGUAGE_CODE == 'ar' %}left{% else %}right{% endif %};
+        }
+        .total-row td {
+            font-weight: bold;
+            font-size: 16px;
+            border-top: 2px solid #333;
+            border-bottom: none;
+        }
+        .footer {
+            margin-top: 50px;
+            text-align: center;
+            font-size: 12px;
+            color: #888;
+            border-top: 1px solid #eee;
+            padding-top: 20px;
+        }
+        .status-badge {
+            display: inline-block;
+            padding: 4px 8px;
+            border-radius: 4px;
+            font-size: 12px;
+            font-weight: bold;
+            text-transform: uppercase;
+        }
+        .paid { color: #0f9d58; border: 1px solid #0f9d58; }
+        .pending { color: #f4b400; border: 1px solid #f4b400; }
+    </style>
+</head>
+<body>
+
+    <div class="header">
+        <div class="logo">
+            {% if logo_base64 %}
+                <img src="data:image/jpeg;base64,{{ logo_base64 }}" style="max-width: 100%; max-height: 80px;">
+            {% else %}
+                <h2>{{ platform_profile.name }}</h2>
+            {% endif %}
+        </div>
+        <div class="company-info">
+            <strong>{{ platform_profile.name }}</strong><br>
+            {{ platform_profile.address|linebreaksbr }}<br>
+            {% if platform_profile.vat_number %}
+                {% trans "VAT Number" %}: {{ platform_profile.vat_number }}<br>
+            {% endif %}
+            {{ platform_profile.phone_number }}
+        </div>
+    </div>
+
+    <div class="title">{% trans "Tax Invoice" %}</div>
+
+    <div class="details-grid">
+        <div class="details-col">
+            <div class="label">{% trans "Invoice Details" %}</div>
+            <div class="value">
+                {% trans "Invoice No" %}: #{{ parcel.id }}<br>
+                {% trans "Date" %}: {{ parcel.created_at|date:"Y-m-d" }}<br>
+                {% trans "Status" %}: 
+                <span class="status-badge {% if parcel.payment_status == 'paid' %}paid{% else %}pending{% endif %}">
+                    {{ parcel.get_payment_status_display }}
+                </span>
+            </div>
+        </div>
+        <div class="details-col text-right">
+            <div class="label">{% trans "Bill To" %}</div>
+            <div class="value">
+                <strong>{{ parcel.shipper.first_name }} {{ parcel.shipper.last_name }}</strong><br>
+                {{ parcel.shipper.profile.address }}<br>
+                {{ parcel.shipper.email }}<br>
+                {{ parcel.shipper.profile.phone_number }}
+            </div>
+        </div>
+    </div>
+
+    <table>
+        <thead>
+            <tr>
+                <th>{% trans "Description" %}</th>
+                <th>{% trans "Tracking Number" %}</th>
+                <th>{% trans "Weight" %}</th>
+                <th class="text-right">{% trans "Amount" %} (OMR)</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <td>{% trans "Delivery Service" %} - {{ parcel.description|truncatechars:50 }}</td>
+                <td>{{ parcel.tracking_number }}</td>
+                <td>{{ parcel.weight }} kg</td>
+                <td class="text-right">{{ parcel.price }}</td>
+            </tr>
+        </tbody>
+        <tfoot>
+            <tr class="total-row">
+                <td colspan="3" class="text-right">{% trans "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>
+        {% if platform_profile.registration_number %}
+            <p>{% trans "CR No" %}: {{ platform_profile.registration_number }}</p>
+        {% endif %}
+    </div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/core/templates/core/scan_qr.html b/core/templates/core/scan_qr.html
new file mode 100644
index 0000000..dcd8f93
--- /dev/null
+++ b/core/templates/core/scan_qr.html
@@ -0,0 +1,240 @@
+{% extends 'base.html' %}
+{% load i18n static %}
+
+{% block title %}masarX | {% trans "Scan Parcel" %}{% endblock %}
+
+{% block head %}
+<script src="https://unpkg.com/html5-qrcode" type="text/javascript"></script>
+<style>
+    #reader {
+        width: 100%;
+        border-radius: 15px;
+        overflow: hidden;
+    }
+    .scan-result-card {
+        display: none;
+        transition: all 0.3s ease;
+    }
+</style>
+{% endblock %}
+
+{% block content %}
+<div class="container py-5">
+    <div class="row justify-content-center">
+        <div class="col-lg-6">
+            <div class="d-flex justify-content-between align-items-center mb-4">
+                <h1 class="h3 mb-0">{% trans "Scan Parcel QR" %}</h1>
+                <a href="{% url 'dashboard' %}" class="btn btn-outline-secondary btn-sm">
+                    <i class="bi bi-arrow-left"></i> {% trans "Back to Dashboard" %}
+                </a>
+            </div>
+
+            <!-- Scanner Section -->
+            <div class="card border-0 shadow-sm rounded-4 mb-4">
+                <div class="card-body p-0">
+                    <div id="reader"></div>
+                </div>
+                <div class="card-footer bg-light text-center py-3">
+                    <p class="mb-0 text-muted small">{% trans "Point your camera at the Parcel Label QR Code" %}</p>
+                </div>
+            </div>
+
+            <!-- Manual Entry Section -->
+            <div class="text-center mb-4">
+                <p class="text-muted mb-2">{% trans "Or enter tracking number manually" %}</p>
+                <form id="manual-form" class="d-flex gap-2 justify-content-center">
+                    <input type="text" id="manual-input" class="form-control" placeholder="{% trans "e.g., TRK123456" %}" style="max-width: 200px;">
+                    <button type="submit" class="btn btn-primary">{% trans "Search" %}</button>
+                </form>
+            </div>
+
+            <!-- Result Section -->
+            <div id="scan-result" class="scan-result-card card border-0 shadow rounded-4 border-start border-5 border-primary">
+                <div class="card-body">
+                    <div class="d-flex justify-content-between align-items-start mb-3">
+                        <div>
+                            <span class="badge bg-primary mb-2" id="res-status-badge">Picked Up</span>
+                            <h4 class="card-title mb-0" id="res-tracking">#TRK-12345</h4>
+                        </div>
+                        <div class="text-end">
+                            <h5 class="text-primary fw-bold mb-0" id="res-price">5.000 OMR</h5>
+                            <small class="text-muted">{% trans "Price" %}</small>
+                        </div>
+                    </div>
+
+                    <div class="row g-3 mb-4">
+                        <div class="col-6">
+                            <small class="text-muted text-uppercase fw-bold">{% trans "From" %}</small>
+                            <div class="fw-bold" id="res-from">Muscat / Seeb</div>
+                        </div>
+                        <div class="col-6">
+                            <small class="text-muted text-uppercase fw-bold">{% trans "To" %}</small>
+                            <div class="fw-bold" id="res-to">Sohar / Liwa</div>
+                        </div>
+                        <div class="col-12">
+                            <small class="text-muted text-uppercase fw-bold">{% trans "Description" %}</small>
+                            <div id="res-desc">Box of electronics</div>
+                        </div>
+                    </div>
+
+                    <div id="action-buttons" class="d-grid gap-2">
+                        <!-- Dynamic Buttons -->
+                    </div>
+                </div>
+            </div>
+
+            <!-- Loading Spinner -->
+            <div id="loading" class="text-center py-4 d-none">
+                <div class="spinner-border text-primary" role="status">
+                    <span class="visually-hidden">Loading...</span>
+                </div>
+            </div>
+
+            <!-- Error Message -->
+            <div id="error-msg" class="alert alert-danger d-none mt-3" role="alert"></div>
+        </div>
+    </div>
+</div>
+
+<script>
+    document.addEventListener('DOMContentLoaded', function() {
+        const html5QrcodeScanner = new Html5QrcodeScanner(
+            "reader", { fps: 10, qrbox: {width: 250, height: 250} }
+        );
+
+        function onScanSuccess(decodedText, decodedResult) {
+            // Handle on success condition with the decoded text or result.
+            console.log(`Scan result: ${decodedText}`, decodedResult);
+            fetchParcelDetails(decodedText);
+            // Optional: Pause scanner
+            // html5QrcodeScanner.clear();
+        }
+
+        function onScanFailure(error) {
+            // handle scan failure, usually better to ignore and keep scanning.
+            // console.warn(`Code scan error = ${error}`);
+        }
+
+        html5QrcodeScanner.render(onScanSuccess, onScanFailure);
+
+        // Manual Search
+        document.getElementById('manual-form').addEventListener('submit', function(e) {
+            e.preventDefault();
+            const val = document.getElementById('manual-input').value.trim();
+            if (val) fetchParcelDetails(val);
+        });
+
+        function fetchParcelDetails(trackingNumber) {
+            const resultCard = document.getElementById('scan-result');
+            const loading = document.getElementById('loading');
+            const errorMsg = document.getElementById('error-msg');
+            
+            // UI Reset
+            resultCard.style.display = 'none';
+            errorMsg.classList.add('d-none');
+            loading.classList.remove('d-none');
+
+            // API Call
+            fetch(`{% url 'get_parcel_details' %}?tracking_number=${trackingNumber}`)
+                .then(response => response.json())
+                .then(data => {
+                    loading.classList.add('d-none');
+                    if (data.success) {
+                        renderParcel(data.parcel);
+                        resultCard.style.display = 'block';
+                        // Scroll to result
+                        resultCard.scrollIntoView({ behavior: 'smooth' });
+                    } else {
+                        errorMsg.textContent = data.error || '{% trans "Parcel not found" %}';
+                        errorMsg.classList.remove('d-none');
+                    }
+                })
+                .catch(err => {
+                    loading.classList.add('d-none');
+                    errorMsg.textContent = '{% trans "Network error. Please try again." %}';
+                    errorMsg.classList.remove('d-none');
+                });
+        }
+
+        function renderParcel(parcel) {
+            document.getElementById('res-tracking').textContent = parcel.tracking_number;
+            document.getElementById('res-status-badge').textContent = parcel.status_display;
+            document.getElementById('res-price').textContent = parcel.price + ' OMR';
+            document.getElementById('res-from').textContent = parcel.from;
+            document.getElementById('res-to').textContent = parcel.to;
+            document.getElementById('res-desc').textContent = parcel.description;
+
+            // Status Badge Color
+            const badge = document.getElementById('res-status-badge');
+            badge.className = 'badge mb-2 ' + (parcel.status === 'delivered' ? 'bg-success' : 'bg-primary');
+
+            // Action Buttons
+            const actionsDiv = document.getElementById('action-buttons');
+            actionsDiv.innerHTML = ''; // Clear previous
+
+            // Logic for buttons based on status
+            // Assuming current user is a driver (enforced by view)
+            
+            // Only show actions if I am the carrier OR if it's pending (and I can accept it)
+            // But usually this scanner is for the assigned driver.
+            
+            if (parcel.can_update) {
+                if (parcel.status === 'picked_up') {
+                    const btn = createBtn('{% trans "Mark as Delivered" %}', 'success', 'delivered', parcel.id);
+                    actionsDiv.appendChild(btn);
+                } else if (parcel.status === 'in_transit') {
+                     const btn = createBtn('{% trans "Mark as Delivered" %}', 'success', 'delivered', parcel.id);
+                    actionsDiv.appendChild(btn);
+                } else if (parcel.status === 'pending') {
+                    // Maybe allow accepting via scan?
+                    const btn = createBtn('{% trans "Accept Shipment" %}', 'primary', 'accept', parcel.id);
+                    actionsDiv.appendChild(btn);
+                }
+            }
+        }
+
+        function createBtn(text, color, action, id) {
+            const btn = document.createElement('button');
+            btn.className = `btn btn-${color} fw-bold py-2`;
+            btn.innerHTML = `<i class="bi bi-check-lg me-2"></i> ${text}`;
+            btn.onclick = function() {
+                updateStatus(id, action);
+            };
+            return btn;
+        }
+
+        function updateStatus(id, action) {
+            if(!confirm('{% trans "Are you sure?" %}')) return;
+
+            const actionsDiv = document.getElementById('action-buttons');
+            actionsDiv.style.opacity = '0.5';
+            actionsDiv.style.pointerEvents = 'none';
+
+            fetch('{% url "update_parcel_status_ajax" %}', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'X-CSRFToken': '{{ csrf_token }}'
+                },
+                body: JSON.stringify({
+                    parcel_id: id,
+                    action: action
+                })
+            })
+            .then(res => res.json())
+            .then(data => {
+                if(data.success) {
+                    // Refresh details
+                    fetchParcelDetails(document.getElementById('res-tracking').textContent);
+                } else {
+                    alert(data.error);
+                }
+            })
+            .finally(() => {
+                actionsDiv.style.opacity = '1';
+                actionsDiv.style.pointerEvents = 'auto';
+            });
+        }
+    });
+</script>
+{% endblock %}
diff --git a/core/templates/core/shipper_dashboard.html b/core/templates/core/shipper_dashboard.html
index b196631..fbcaf70 100644
--- a/core/templates/core/shipper_dashboard.html
+++ b/core/templates/core/shipper_dashboard.html
@@ -69,9 +69,16 @@
                                 {% endif %}
                             {% endif %}
                             
-                            <a href="{% url 'generate_parcel_label' parcel.id %}" class="btn btn-sm btn-outline-dark w-100 mb-3" target="_blank">
-                                <i class="fas fa-print me-1"></i> {% trans "Print Label" %}
-                            </a>
+                            <div class="d-flex gap-2 mb-3">
+                                <a href="{% url 'generate_parcel_label' parcel.id %}" class="btn btn-sm btn-outline-dark w-100" target="_blank">
+                                    <i class="fas fa-print me-1"></i> {% trans "Label" %}
+                                </a>
+                                {% if parcel.payment_status == 'paid' %}
+                                <a href="{% url 'generate_invoice' parcel.id %}" class="btn btn-sm btn-outline-secondary w-100" target="_blank">
+                                    <i class="fas fa-file-invoice me-1"></i> {% trans "Invoice" %}
+                                </a>
+                                {% endif %}
+                            </div>
 
                             <hr>
                             <p class="card-text small mb-0"><strong>{% trans "Receiver" %}:</strong> {{ parcel.receiver_name }}</p>
@@ -122,6 +129,11 @@
                                             <a href="{% url 'generate_parcel_label' parcel.id %}" class="btn btn-sm btn-outline-dark" target="_blank" title="{% trans 'Print Label' %}">
                                                 <i class="fas fa-print"></i>
                                             </a>
+                                            {% if parcel.payment_status == 'paid' %}
+                                            <a href="{% url 'generate_invoice' parcel.id %}" class="btn btn-sm btn-outline-secondary" target="_blank" title="{% trans 'Invoice' %}">
+                                                <i class="fas fa-file-invoice"></i>
+                                            </a>
+                                            {% endif %}
 
                                             {% if parcel.payment_status == 'pending' and payments_enabled %}
                                                 <a href="{% url 'initiate_payment' parcel.id %}" class="btn btn-sm btn-outline-primary flex-grow-1 flex-md-grow-0">
@@ -231,6 +243,11 @@
                                         <a href="{% url 'generate_parcel_label' parcel.id %}" class="btn btn-sm btn-outline-dark me-2" target="_blank" title="{% trans 'Print Label' %}">
                                             <i class="fas fa-print"></i>
                                         </a>
+                                        {% if parcel.payment_status == 'paid' %}
+                                        <a href="{% url 'generate_invoice' parcel.id %}" class="btn btn-sm btn-outline-secondary me-2" target="_blank" title="{% trans 'Invoice' %}">
+                                            <i class="fas fa-file-invoice"></i>
+                                        </a>
+                                        {% endif %}
                                         {% if parcel.status == 'delivered' and parcel.carrier %}
                                             {% if not rating %}
                                                 <a href="{% url 'rate_driver' parcel.id %}" class="btn btn-sm btn-outline-warning">
diff --git a/core/urls.py b/core/urls.py
index 9d33bd6..fd3ec0e 100644
--- a/core/urls.py
+++ b/core/urls.py
@@ -32,11 +32,13 @@ urlpatterns = [
     ), name='password_reset_complete'),
 
     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('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'),
     path('parcel/<int:parcel_id>/label/', views.generate_parcel_label, name='generate_parcel_label'),
+    path('parcel/<int:parcel_id>/invoice/', views.generate_invoice, name='generate_invoice'),
     path('initiate-payment/<int:parcel_id>/', views.initiate_payment, name='initiate_payment'),
     path('payment-success/', views.payment_success, name='payment_success'),
     path('payment-cancel/', views.payment_cancel, name='payment_cancel'),
@@ -45,6 +47,9 @@ urlpatterns = [
     path('ajax/get-governates/', views.get_governates, name='get_governates'),
     path('ajax/get-cities/', views.get_cities, name='get_cities'),
     path('ajax/chatbot/', views.chatbot, name='chatbot'),
+    path('ajax/get-parcel-details/', views.get_parcel_details, name='get_parcel_details'),
+    path('ajax/update-parcel-status/', views.update_parcel_status_ajax, name='update_parcel_status_ajax'),
+    
     path('privacy-policy/', views.privacy_policy, name='privacy_policy'),
     path('terms-conditions/', views.terms_conditions, name='terms_conditions'),
     path('contact/', views.contact, name='contact'),
diff --git a/core/views.py b/core/views.py
index 64e6b1a..c9347b9 100644
--- a/core/views.py
+++ b/core/views.py
@@ -705,3 +705,137 @@ def generate_parcel_label(request, parcel_id):
     response = HttpResponse(pdf_file, content_type='application/pdf')
     response['Content-Disposition'] = f'inline; filename="label_{parcel.tracking_number}.pdf"'
     return response
+
+@login_required
+def generate_invoice(request, parcel_id):
+    parcel = get_object_or_404(Parcel, id=parcel_id)
+    
+    # Security check: only shipper can view invoice (or admin)
+    if parcel.shipper != request.user and not request.user.is_staff:
+        messages.error(request, _("You are not authorized to view this invoice."))
+        return redirect('dashboard')
+
+    # Get Logo Base64
+    logo_base64 = None
+    platform_profile = PlatformProfile.objects.first()
+    if platform_profile and platform_profile.logo:
+        try:
+            with open(platform_profile.logo.path, "rb") as image_file:
+                logo_base64 = base64.b64encode(image_file.read()).decode()
+        except Exception:
+            pass
+
+    # Render Template
+    html_string = render_to_string('core/invoice.html', {
+        'parcel': parcel,
+        'logo_base64': logo_base64,
+        'platform_profile': platform_profile,
+        'request': request,
+    })
+
+    # Generate PDF
+    html = weasyprint.HTML(string=html_string, base_url=request.build_absolute_uri())
+    pdf_file = html.write_pdf()
+
+    response = HttpResponse(pdf_file, content_type='application/pdf')
+    response['Content-Disposition'] = f'inline; filename="invoice_{parcel.tracking_number}.pdf"'
+    return response
+
+@login_required
+def scan_qr_view(request):
+    """Renders the QR Scanner page for drivers."""
+    # Optional: Restrict to drivers only
+    # if request.user.profile.role != 'car_owner':
+    #     messages.error(request, _("Only drivers can access the scanner."))
+    #     return redirect('dashboard')
+    return render(request, 'core/scan_qr.html')
+
+@login_required
+def get_parcel_details(request):
+    """API to fetch parcel details by tracking number."""
+    tracking_number = request.GET.get('tracking_number')
+    if not tracking_number:
+        return JsonResponse({'success': False, 'error': _('Tracking number required')})
+        
+    try:
+        parcel = Parcel.objects.get(tracking_number__iexact=tracking_number.strip())
+        
+        # Check permissions: Is user the assigned driver? Or is it pending (for acceptance)?
+        is_driver = request.user.profile.role == 'car_owner'
+        is_assigned = parcel.carrier == request.user
+        
+        can_update = False
+        if is_driver:
+            if is_assigned:
+                can_update = True
+            elif parcel.status == 'pending':
+                # Check if payments are enabled and paid
+                platform_profile = PlatformProfile.objects.first()
+                payments_enabled = platform_profile.enable_payment if platform_profile else True
+                if not payments_enabled or parcel.payment_status == 'paid':
+                    can_update = True
+        
+        data = {
+            'success': True,
+            'parcel': {
+                'id': parcel.id,
+                'tracking_number': parcel.tracking_number,
+                'status': parcel.status,
+                'status_display': parcel.get_status_display(),
+                'price': float(parcel.price),
+                'from': f"{parcel.pickup_governate.name} / {parcel.pickup_city.name}",
+                'to': f"{parcel.delivery_governate.name} / {parcel.delivery_city.name}",
+                'description': parcel.description,
+                'can_update': can_update
+            }
+        }
+        return JsonResponse(data)
+    except Parcel.DoesNotExist:
+        return JsonResponse({'success': False, 'error': _('Parcel not found')})
+
+@login_required
+@require_POST
+def update_parcel_status_ajax(request):
+    """API to update parcel status from scanner."""
+    try:
+        data = json.loads(request.body)
+        parcel_id = data.get('parcel_id')
+        action = data.get('action')
+        
+        parcel = get_object_or_404(Parcel, id=parcel_id)
+        
+        # Logic for actions
+        if action == 'accept':
+            # Similar to accept_parcel view
+            if request.user.profile.role != 'car_owner':
+                return JsonResponse({'success': False, 'error': _('Only drivers can accept shipments')})
+                
+            if parcel.status != 'pending':
+                return JsonResponse({'success': False, 'error': _('Parcel is not available')})
+                
+            # Check payment status if enabled
+            platform_profile = PlatformProfile.objects.first()
+            payments_enabled = platform_profile.enable_payment if platform_profile else True
+            if payments_enabled and parcel.payment_status != 'paid':
+                 return JsonResponse({'success': False, 'error': _('Payment pending')})
+            
+            parcel.carrier = request.user
+            parcel.status = 'picked_up' # Or 'assigned'? Logic says 'picked_up' in accept_parcel
+            parcel.save()
+            notify_driver_assigned(parcel)
+            
+        elif action == 'delivered':
+             if parcel.carrier != request.user:
+                 return JsonResponse({'success': False, 'error': _('Not authorized')})
+             
+             parcel.status = 'delivered'
+             parcel.save()
+             notify_status_change(parcel)
+             
+        else:
+            return JsonResponse({'success': False, 'error': _('Invalid action')})
+            
+        return JsonResponse({'success': True})
+        
+    except Exception as e:
+        return JsonResponse({'success': False, 'error': str(e)})
\ No newline at end of file