diff --git a/inventory/middleware.py b/inventory/middleware.py index cbd4c3a5..e5cb538e 100644 --- a/inventory/middleware.py +++ b/inventory/middleware.py @@ -169,8 +169,7 @@ class DealerSlugMiddleware: "/ar/help_center/", "/en/help_center/", ] - print("------------------------------------") - print(request.path in paths) + if request.path in paths: return None diff --git a/inventory/views.py b/inventory/views.py index e764eab1..29d145d1 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -690,6 +690,7 @@ def sales_dashboard(request,dealer_slug): created__date__gte=start_date, created__date__lte=end_date ) + total_leads=leads_filtered.count() # ---------------------------------------------------- @@ -747,6 +748,7 @@ def sales_dashboard(request,dealer_slug): 'total_new_cars_in_inventory': total_new_cars_in_inventory, 'total_used_cars_in_inventory': total_used_cars_in_inventory, 'aging_inventory_count': aging_inventory_count, + 'total_leads':total_leads } return render(request, 'dashboards/sales_dashboard.html', context) diff --git a/templates/dashboards/sales_dashboard.html b/templates/dashboards/sales_dashboard.html index 37b4f29c..d0d6469c 100644 --- a/templates/dashboards/sales_dashboard.html +++ b/templates/dashboards/sales_dashboard.html @@ -77,7 +77,7 @@
-
{% trans "Top Lead Sources" %}
+
{% trans "Top Lead Sources" %}    {% trans "Total Leads: " %}{{total_leads}}
diff --git a/templates/inventory/car_detail.html b/templates/inventory/car_detail.html index 48a09b87..61a0750f 100644 --- a/templates/inventory/car_detail.html +++ b/templates/inventory/car_detail.html @@ -269,6 +269,7 @@ + {% if perms.inventory.add_car%} {% if not car.get_transfer %} {% trans "Cannot Edit, Car in Transfer." %} {% endif %} + {% endif %} {% else %} + {% if perms.inventory.add_car%}

{% trans "No finance details available." %}

{% trans "Add" %} + {% endif %} {% endif %}
diff --git a/templates/ledger/reports/purchase_report.html b/templates/ledger/reports/purchase_report.html index d70c6cfd..d6f10e42 100644 --- a/templates/ledger/reports/purchase_report.html +++ b/templates/ledger/reports/purchase_report.html @@ -98,7 +98,6 @@ {% trans 'Status' %} {% trans 'PO Amount' %} {% trans 'Date Fulfilled' %} - {% trans 'Created By' %} {% trans 'Cars Purchased' %} {% trans 'Vendor' %} @@ -117,7 +116,6 @@ {% trans 'Not fulfilled' %} {% endif %} - {% firstof po.created_by.get_full_name 'staff' %} {{ po.po_quantity }} {{ po.vendors_str }} diff --git a/templates/sales/estimates/estimate_form.html b/templates/sales/estimates/estimate_form.html index 1d89088a..38801ce5 100644 --- a/templates/sales/estimates/estimate_form.html +++ b/templates/sales/estimates/estimate_form.html @@ -122,9 +122,9 @@
- {% if not items %} + {% if not items.car %} {% url "car_add" request.dealer.slug as create_car_url %} - {% include "message-illustration.html" with value1="Please add at least one car before creating a quotation." value2="Add car" message_image="images/logos/no-content-new.jpg" url=create_car_url %} + {% include "message-illustration.html" with value1="Please add at least one car or complete the car info before creating a quotation." value2="Add car" message_image="images/logos/no-content-new.jpg" url=create_car_url %} {% endif %}