diff --git a/core/__pycache__/urls.cpython-311.pyc b/core/__pycache__/urls.cpython-311.pyc index 767dfd6..dde2056 100644 Binary files a/core/__pycache__/urls.cpython-311.pyc and b/core/__pycache__/urls.cpython-311.pyc differ diff --git a/core/__pycache__/views.cpython-311.pyc b/core/__pycache__/views.cpython-311.pyc index 4631679..107f061 100644 Binary files a/core/__pycache__/views.cpython-311.pyc and b/core/__pycache__/views.cpython-311.pyc differ 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 %}
| {% trans "Description" %} | +{% trans "Tracking Number" %} | +{% trans "Weight" %} | +{% trans "Amount" %} (OMR) | +
|---|---|---|---|
| {% trans "Delivery Service" %} - {{ parcel.description|truncatechars:50 }} | +{{ parcel.tracking_number }} | +{{ parcel.weight }} kg | +{{ parcel.price }} | +
| {% trans "Total" %} | +{{ parcel.price }} OMR | +||
{% trans "Thank you for using" %} {{ platform_profile.name }}!
+ {% if platform_profile.registration_number %} +{% trans "CR No" %}: {{ platform_profile.registration_number }}
+ {% endif %} +{% trans "Point your camera at the Parcel Label QR Code" %}
+{% trans "Or enter tracking number manually" %}
+ +{% trans "Receiver" %}: {{ parcel.receiver_name }}
@@ -122,6 +129,11 @@ + {% if parcel.payment_status == 'paid' %} + + + + {% endif %} {% if parcel.payment_status == 'pending' and payments_enabled %} @@ -231,6 +243,11 @@ + {% if parcel.payment_status == 'paid' %} + + + + {% endif %} {% if parcel.status == 'delivered' and parcel.carrier %} {% if not rating %} 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/