diff --git a/inventory/models.py b/inventory/models.py index e3700eb9..a5af10d4 100644 --- a/inventory/models.py +++ b/inventory/models.py @@ -2945,7 +2945,7 @@ class CustomGroup(models.Model): "customgroup", "saleorder", "payment", - "staff", + # "staff", "schedule", "activity", "opportunity", @@ -3028,7 +3028,7 @@ class CustomGroup(models.Model): allowed_models=[ "saleorder", # "payment", - "staff", + # "staff", "schedule", "activity", "lead", diff --git a/inventory/views.py b/inventory/views.py index f87b5c89..91cbe155 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -2198,7 +2198,7 @@ class DealerUpdateView( def get_success_url(self): return reverse("dealer_detail", kwargs={"slug": self.object.slug}) -class StaffDetailView(LoginRequiredMixin, DetailView): +class StaffDetailView(LoginRequiredMixin,DetailView): """ Represents a detailed view for a Dealer model. @@ -2645,9 +2645,14 @@ def vendorDetailView(request, dealer_slug, slug): :return: An HttpResponse object containing the rendered vendor detail page. :rtype: HttpResponse """ - vendor = get_object_or_404(models.Vendor, slug=slug) + dealer = get_object_or_404(models.Dealer, slug=dealer_slug) + vendor = get_object_or_404(models.Vendor, slug=slug,dealer=dealer) + vendor_bills=BillModel.objects.filter(vendor=vendor.vendor_model) + paginator=Paginator(vendor_bills,20) + page_number = request.GET.get("page") + page_obj=paginator.get_page(page_number) return render( - request, template_name="vendors/view_vendor.html", context={"vendor": vendor} + request, template_name="vendors/view_vendor.html", context={"vendor": vendor,"vendor_bills":page_obj} ) diff --git a/templates/bill/includes/card_bill.html b/templates/bill/includes/card_bill.html index 077b07e9..61492476 100644 --- a/templates/bill/includes/card_bill.html +++ b/templates/bill/includes/card_bill.html @@ -260,7 +260,7 @@ {% modal_action_v2 bill bill.get_mark_as_canceled_url bill.get_mark_as_canceled_message bill.get_mark_as_canceled_html_id %} {% endif %} - {% endif %} + {% endif %} diff --git a/templates/staff/staff_detail.html b/templates/staff/staff_detail.html index c8cba830..e1d423cb 100644 --- a/templates/staff/staff_detail.html +++ b/templates/staff/staff_detail.html @@ -11,12 +11,8 @@
-
@@ -49,9 +45,14 @@

{{ staff.get_local_name }}

-

{{staff.user.groups.name}}

+

+ {% trans 'Role' %}: + {% for group in staff.groups%} +  {{group}} + {% endfor %} +

{% trans 'Joined' %} {{ staff.created|timesince }} {% trans 'ago' %}

-
+
diff --git a/templates/users/user_detail.html b/templates/users/user_detail.html index cd3da0bf..a1a980e8 100644 --- a/templates/users/user_detail.html +++ b/templates/users/user_detail.html @@ -98,7 +98,7 @@ + href="{% url 'staff_password_reset' request.dealer.slug user_.pk %}"> {{ _("Reset Password") }} diff --git a/templates/vendors/view_vendor.html b/templates/vendors/view_vendor.html index 475bcd58..71fc867d 100644 --- a/templates/vendors/view_vendor.html +++ b/templates/vendors/view_vendor.html @@ -9,15 +9,38 @@

{% trans "Vendor Details" %}

-
+
+
{% if vendor.logo%}{% endif %}
+
-
    -
  • - {% trans "Name" %}: {{ vendor.get_local_name }} -
  • + +
    +
      +
    • + {% trans "Name" %}: {{ vendor.get_local_name }}
    • {% trans "Contact Person" %}: {{ vendor.contact_person }}
    • @@ -31,28 +54,53 @@ {% trans "Address" %}: {{ vendor.address }}
    +
- +
+
+ + + + + + + + + + + + + {% for bill in vendor_bills%} + + + + + + + + + + {% empty %} + + + + {% endfor %} + +
{{ _("Bill") |capfirst }}{{ _("Bill Status") |capfirst }}{{ _("Bill Amount Paid") |capfirst }}{{ _("Bill Amount Due") |capfirst }}
+ {{ bill.bill_number }} + {{ bill.bill_status }}{{ bill.amount_paid}}{{ bill.amount_due}}
{% trans "No Bills Found For the Vendor: {vendor.get_local_name}" %}
+
+
+
+ {% if is_paginated %} + {% include 'partials/pagination.html' %} + {% endif %} +
+
+ {% include 'modal/delete_modal.html' %} {% endblock %}