From 533300b0edf186d7b8474741bfc27516c94f8b91 Mon Sep 17 00:00:00 2001 From: Faheedkhan Date: Wed, 2 Jul 2025 14:53:41 +0300 Subject: [PATCH] update --- inventory/models.py | 3 ++ inventory/views.py | 3 +- templates/groups/group_list.html | 3 +- templates/header.html | 13 +++-- templates/inventory/car_detail.html | 48 +++++++++++++------ templates/inventory/car_list_view.html | 4 ++ .../sales/estimates/estimate_detail.html | 2 +- 7 files changed, 56 insertions(+), 20 deletions(-) diff --git a/inventory/models.py b/inventory/models.py index e8da8f43..5b8b9726 100644 --- a/inventory/models.py +++ b/inventory/models.py @@ -1185,6 +1185,9 @@ class Staff(models.Model, LocalizedNameMixin): return self.staff_member.user @property + def groups(self): + return [x.customgroup for x in self.user.groups.all()] + @property def groups(self): return [x.customgroup for x in self.user.groups.all()] diff --git a/inventory/views.py b/inventory/views.py index 10df5a68..2a6d2c66 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -1145,6 +1145,7 @@ class CarListView(LoginRequiredMixin, PermissionRequiredMixin, ListView): @login_required +@permission_required("inventory.view_car") def inventory_stats_view(request, dealer_slug): """ Handle the inventory stats view for a dealer, displaying detailed information @@ -1161,7 +1162,7 @@ def inventory_stats_view(request, dealer_slug): "inventory/inventory_stats.html" template. :rtype: HttpResponse """ - + # Base queryset for cars belonging to the dealer cars = models.Car.objects.filter(dealer=request.dealer) diff --git a/templates/groups/group_list.html b/templates/groups/group_list.html index 4f4a011b..7dc70ca3 100644 --- a/templates/groups/group_list.html +++ b/templates/groups/group_list.html @@ -31,9 +31,10 @@ {% for group in groups %} + {{group.users}} {{ group.name }} - {{ group.users.count|subtract:1}} + {{ group.users.count}} {{ group.permissions.count }} {% endif %} -
  • + {% if perms.inventory.view_car%} +
  • {% trans 'Cars'|capfirst %} @@ -45,6 +46,8 @@
    • + {% endif %} + {% if perms.inventory.add_car %}
  • @@ -120,7 +123,7 @@ {% endif %} - {% if perms.django_ledger.view_customermodel %} + {% if perms.inventory.view_lead %}
    • + {% endif %} + {%if perms.inventory.view_opportunity %}
  • @@ -154,7 +159,7 @@
    • {% endif %} - {% if perms.django_ledger.view_customermodel %} + {% if perms.inventory.view_customer %}
  • @@ -163,6 +168,7 @@
    • {% endif %} + {% if perms.inventory.view_organization %}
  • @@ -171,6 +177,7 @@
    • + {% endif %} {% comment %}
  • diff --git a/templates/inventory/car_detail.html b/templates/inventory/car_detail.html index 8aeb3428..c4464d25 100644 --- a/templates/inventory/car_detail.html +++ b/templates/inventory/car_detail.html @@ -75,6 +75,7 @@
    {% endif %} + {% if perms.inventory.view_car %}
    @@ -242,7 +243,12 @@
    + + +
    + + {% if perms.inventory.view_carfinance%}

    {% trans 'Financial Details' %}

    @@ -283,27 +289,31 @@ {% trans "Total"|capfirst %} {{ car.finances.total_vat|floatformat:2 }} + {% if perms.inventory.change_carfinance%} {% if not car.get_transfer %} - {% trans "Edit" %} + {% trans "Edit" %} {% else %} {% trans "Cannot Edit, Car in Transfer." %} - {% endif %} + {% endif %} + + + {% endif %} {% else %} -

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

    - {% if perms.inventory.add_carfinance %} +

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

    + {% if perms.inventory.add_carfinance %} {% trans "Add" %} {% endif %} - - {% endif %}
    + {% endif %} + + {% if perms.inventory.view_carcolors %}

    {% trans 'Colors Details' %}

    @@ -332,7 +342,8 @@ style="background-color: rgb({{ car.colors.interior.rgb }})">
    - + + {% if perms.inventory.change_carcolors%} {% if not car.get_transfer %} @@ -343,8 +354,9 @@ {% endif %} + {% endif %} {% else %} - +

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

    @@ -352,7 +364,7 @@ {{ _("Add Color") }} {% endif %} - + {% endif %} @@ -360,7 +372,9 @@
    + {% endif %} {% if car.status != 'transfer' %} + {%if perms.inventory.view_carreservation%}

    {% trans 'Reservations Details' %}

    @@ -379,6 +393,7 @@ {{ reservation.reserved_by.dealer }} {{ reservation.reserved_until }} + {% if perms.inventory.change_carreservation %} {% if reservation.is_active %}
    @@ -402,27 +417,30 @@ {% trans "Expired" %} {% endif %} + {% endif %} {% endfor %} {% else %} + {% if perms.inventory.add_carreservation %} - {% if perms.inventory.change_carreservation %} - {% endif %} - - {% endif %} + {% endif %} + + + {% endif %}
    + {% endif %} {% endif %} {% if car.status == 'transfer' and car.get_transfer %} @@ -483,6 +501,7 @@ alt=""> {% endif %} + + {% endif %}