Merge branch 'main' of http://10.10.1.136:3000/ismail/haikal into frontend

inventory/views.py

@@ -2848,7 +2848,7 @@ class UserListView(LoginRequiredMixin, ListView):
 
     def get_queryset(self):
         query = self.request.GET.get("q")
-        dealer = get_user_type(self.request)
+        dealer = get_object_or_404(models.Dealer, slug=self.kwargs["dealer_slug"])
         staff = models.Staff.objects.filter(dealer=dealer, active=True).all()
         return apply_search_filters(staff, query)
 

templates/purchase_orders/po_upload_cars.html

@@ -22,10 +22,6 @@
       {% endif %}
     </div>
 
-
-
-
-
     <div class="table-responsive mt-3">
       <table class="table table-striped table-hover align-middle">
         <thead>
@@ -46,7 +42,7 @@
                 {% if item.item_model.additional_info.uploaded %}
                   <i data-feather="check-circle" class="text-success"></i>
                 {% else %}
-                  <a href="{% url 'upload_cars' item.pk %}" class="btn btn-sm btn-phoenix-primary">
+                  <a href="{% url 'upload_cars' request.dealer.slug item.pk %}" class="btn btn-sm btn-phoenix-primary">
                     <i data-feather="upload" class="me-2"></i>Upload Data
                   </a>
                 {% endif %}

templates/users/user_list.html

@@ -42,7 +42,7 @@
                                 <td class="align-middle white-space-nowrap ps-1">
                                     <div>
                                         <a class="fs-8 fw-bold" href="{% url 'user_detail' request.dealer.slug user.slug%}">{{ user.arabic_name }}</a>
-
+                                        {{user.dealer}}
                                     </div>
                                 </td>
                                 <td class="align-middle white-space-nowrap align-items-center">{{ user.email }}</td>