From 227b4932e51e51639bc1e6ea3ea533c1cfba9382 Mon Sep 17 00:00:00 2001 From: Faheed Date: Wed, 24 Sep 2025 13:13:59 +0300 Subject: [PATCH] new chnages: --- templates/groups/group_list.html | 133 ++++++++++----------- templates/sales/invoices/invoice_list.html | 109 +++++++++-------- 2 files changed, 125 insertions(+), 117 deletions(-) diff --git a/templates/groups/group_list.html b/templates/groups/group_list.html index 7e7ad146..b858b3b6 100644 --- a/templates/groups/group_list.html +++ b/templates/groups/group_list.html @@ -2,78 +2,71 @@ {% load i18n %} {% load custom_filters %} {% load render_table from django_tables2 %} + {% block title %} {% trans "Groups" %} {% endblock title %} + {% block content %} -
-
- {% if groups or request.GET.q %} -
-
- {% trans "Groups" %} -
-
- - - {% trans "Add Group" %} - - - {% trans "Back to Staffs" %} - -
-
-
- -
-
- - - - - - - - - - - {% for group in groups %} - - - - - - - {% endfor %} - -
{% trans 'name'|capfirst %}{% trans 'total Users'|capfirst %}{% trans 'total permission'|capfirst %} - {% trans 'actions'|capfirst %} -
{{ group.name }} - {{ group.users.count }} - - {{ group.permissions.count }} - - - - {% trans 'view Permissions'|capfirst %} - -
-
-
- {% if page_obj.paginator.num_pages > 1 %} -
-
{% include 'partials/pagination.html' %}
-
- {% endif %} +
+ {% if groups or request.GET.q %} +
+

+ + {% trans "Groups" %} +

+
+ + {% trans "Add New Group" %} + + + {% trans "Back to Staffs" %} +
- {% else %} - {% url "group_create" request.dealer.slug as create_group_url %} - {% include "empty-illustration-page.html" with value="group" url=create_group_url %} - {% endif %} -
-
-{% endblock %} + +
+
+
+ + + + + + + + + + + {% for group in groups %} + + + + + + + {% endfor %} + +
{% trans 'Name'|capfirst %}{% trans 'Total Users'|capfirst %}{% trans 'Total Permissions'|capfirst %}{% trans 'Actions'|capfirst %}
{{ group.name }} + {{ group.users.count }} + + {{ group.permissions.count }} + + + {% trans 'View' %} + +
+
+
+ {% if page_obj.paginator.num_pages > 1 %} +
{% include 'partials/pagination.html' %}
+ {% endif %} +
+ {% else %} + {% url "group_create" request.dealer.slug as create_group_url %} + {% include "empty-illustration-page.html" with value="group" url=create_group_url %} + {% endif %} + +{% endblock %} \ No newline at end of file diff --git a/templates/sales/invoices/invoice_list.html b/templates/sales/invoices/invoice_list.html index 8f674b6f..f3eb4ae1 100644 --- a/templates/sales/invoices/invoice_list.html +++ b/templates/sales/invoices/invoice_list.html @@ -4,69 +4,80 @@ {{ _("Invoices") }} {% endblock title %} {% block content %} +
{% if invoices or request.GET.q %} -
-
-
-
-

- {% trans "Invoices" %} -

-
+
+
+ +
+
+

+ {% trans "Invoices" %} + +

+

+ {% trans "Manage and track all your customer invoices." %} +

- {% comment %}
-
{% include 'partials/search_box.html' %}
-
{% endcomment %}
-
- - - - - - - - - + + {% comment %} +
+ {% include 'partials/search_box.html' %} +
+ {% endcomment %} + +
+
{% trans "Invoice Number" %}{% trans "Customer" %}{% trans "Status" %}{% trans "Status Date" %}{% trans "Created" %}{% trans "Actions" %}
+ + + + + + + + - + {% for invoice in invoices %} - - - - + + + - - - + {% empty %} - + {% endfor %}
{% trans "Invoice Number" %}{% trans "Customer" %}{% trans "Status" %}{% trans "Status Date" %}{% trans "Created" %}{% trans "Actions" %}
{{ invoice.invoice_number }}{{ invoice.customer }} +
{{ invoice.invoice_number }}{{ invoice.customer }} {% if invoice.is_past_due %} - {% trans "Past Due" %} + {% trans "Past Due" %} {% elif invoice.is_approved %} - {% trans "Approved" %} + {% trans "Approved" %} {% elif invoice.is_canceled %} - {% trans "Canceled" %} + {% trans "Canceled" %} {% elif invoice.is_draft %} - {% trans "Draft" %} + {% trans "Draft" %} {% elif invoice.is_review %} - {% trans "In Review" %} + {% trans "In Review" %} {% elif invoice.is_paid %} - {% trans "Paid" %} + {% trans "Paid" %} {% endif %} + {% if invoice.invoice_status == "in_review" %} - {{ invoice.date_in_review }} + {{ invoice.date_in_review|date:"M d, Y"|default:"N/A" }} {% elif invoice.invoice_status == "approved" %} - {{ invoice.date_approved }} + {{ invoice.date_approved|date:"M d, Y"|default:"N/A" }} {% elif invoice.invoice_status == "canceled" %} - {{ invoice.date_canceled }} + {{ invoice.date_canceled|date:"M d, Y"|default:"N/A" }} {% elif invoice.invoice_status == "draft" %} - {{ invoice.date_draft }} + {{ invoice.date_draft|date:"M d, Y"|default:"N/A" }} {% elif invoice.invoice_status == "paid" %} - {{ invoice.date_paid }} + {{ invoice.date_paid|date:"M d, Y"|default:"N/A" }} {% endif %} {{ invoice.created }} + + {{ invoice.created|date:"M d, Y" }} + + class="btn btn-sm btn-primary"> {% trans "View" %} @@ -74,20 +85,24 @@
{% trans "No Invoice Found" %}{% trans "No invoices found." %}
+ {% if page_obj.paginator.num_pages > 1 %} -
-
{% include 'partials/pagination.html' %}
+
+ {% include 'partials/pagination.html' %}
{% endif %} +
+
{% else %} - {% url 'estimate_create' request.dealer.slug as url %} - {% include "empty-illustration-page.html" with value=_("invoice") url=url %} + {% url 'estimate_create' request.dealer.slug as create_url %} + {% include "empty-illustration-page.html" with title=_("No Invoices Yet") subtitle=_("Looks like you haven't created any invoices. Start by creating a new invoice or quotation.") url=create_url button_text=_("Create First Invoice") %} {% endif %} -{% endblock %} +
+{% endblock %} \ No newline at end of file