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

inventory/forms.py

@@ -1094,7 +1094,7 @@ class LeadForm(forms.ModelForm):
     # )
     id_car_make = forms.ModelChoiceField(
         label=_("Make"),
-        queryset=CarMake.objects.all(),
+        queryset=CarMake.objects.filter(is_sa_import=True),
         widget=forms.Select(
             attrs={
                 "hx-get": "",
@@ -1921,7 +1921,7 @@ class StaffTaskForm(forms.ModelForm):
 
 class ItemInventoryForm(forms.Form):
     make = forms.ModelChoiceField(
-        queryset=CarMake.objects.all(),
+        queryset=CarMake.objects.filter(is_sa_import=True),
         widget=forms.Select(attrs={"class": "form-control", "id": "make"}),
         label=_("Make"),
     )

inventory/views.py

@@ -1067,7 +1067,7 @@ class CarListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
     model = models.Car
     template_name = "inventory/car_list_view.html"
     context_object_name = "cars"
-    paginate_by = 30
+    paginate_by = 10
     permission_required = "inventory.view_car"
 
     def get_context_data(self, **kwargs):
@@ -9525,7 +9525,7 @@ def upload_cars(request, pk=None):
             if item:
                 item = ItemTransactionModel.objects.get(pk=pk)
                 data = [x.strip() for x in item.item_model.name.split("||")]
-                make = models.CarMake.objects.get(name=data[0])
+                make = models.CarMake.objects.filter(is_sa_import=True).get(name=data[0])
                 model = make.carmodel_set.get(name=data[1])
                 trim = models.CarTrim.objects.filter(
                     name=data[3], id_car_serie__id_car_model=model.id_car_model

templates/base.html

@@ -40,7 +40,6 @@
         <link href="{% static 'vendors/flatpickr/flatpickr.min.css' %}" rel="stylesheet">
         <link href="{% static 'css/custom.css' %}" rel="stylesheet">
         <link rel="stylesheet" href="https://unicons.iconscout.com/release/v4.0.8/css/line.css">
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/intro.js/7.2.0/introjs.css" integrity="sha512-4OzqLjfh1aJa7M33b5+h0CSx0Q3i9Qaxlrr1T/Z+Vz+9zs5A7GM3T3MFKXoreghi3iDOSbkPMXiMBhFO7UBW/g==" crossorigin="anonymous" referrerpolicy="no-referrer" />
         {% if LANGUAGE_CODE == 'ar' %}
             <link href="{% static 'css/theme-rtl.min.css' %}" type="text/css" rel="stylesheet" id="style-rtl">
             <link href="{% static 'css/user-rtl.min.css' %}" type="text/css" rel="stylesheet" id="user-style-rtl">
@@ -52,14 +51,7 @@
         <script src="{% static 'js/jquery.min.js' %}"></script>
         <script src="{% static 'js/echarts.js' %}"></script>
 
-<!--<style>
-    .btn{
-        padding-top: 4px;
-        padding-right: 16px;
-        padding-left: 16px;
-        padding-bottom: 4px;
-    }
-</style>-->
+
         {% block customCSS %}
 
         {% endblock %}
@@ -83,7 +75,7 @@
                 {% block body %}
                 {% endblock body%}
 
-                <div class="my-3"></div>
+
                 {% include 'footer.html' %}
             </div>
         </main>
@@ -99,11 +91,6 @@
         <script src="{% static 'vendors/anchorjs/anchor.min.js' %}"></script>
         <script src="{% static 'vendors/is/is.min.js' %}"></script>
         <script src="{% static 'vendors/fontawesome/all.min.js' %}"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/intro.js/7.2.0/intro.js" integrity="sha512-f26fxKZJiF0AjutUaQHNJ5KnXSisqyUQ3oyfaoen2apB1wLa5ccW3lmtaRe2jdP5kh4LF2gAHP9xQbx7wYhU5w==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-        <!-- Tour Manager -->
-        <script src="{% static 'js/tours/tour-manager.js' %}"></script>
-
-        <script src="{% static 'js/tours/help-button.js' %}"></script>
         <script src="{% static 'vendors/lodash/lodash.min.js' %}"></script>
         <script src="{% static 'vendors/list.js/list.min.js' %}"></script>
         <script src="{% static 'vendors/feather-icons/feather.min.js' %}"></script>

templates/csv_upload.html

@@ -167,7 +167,7 @@
                 <label for="csv_file" class="form-label">CSV File</label>
                 <input type="file" class="form-control" id="csv_file" name="csv_file" accept=".csv" required>
                 <div class="form-text">
-                    CSV should include columns: vin
+                    {{ _("CSV should include columns: vin")}}
                 </div>
             </div>
             <button type="submit" class="btn btn-primary">Upload</button>

templates/dashboards/manager.html

@@ -37,7 +37,7 @@
         </div>
         <div class="col-6 col-md-4 col-xxl-2 text-center border-translucent border-start-xxl border-end-xxl-0 border-bottom-xxl-0 border-end border-bottom pb-4 pb-xxl-0 ">
             <span class="uil fs-5 lh-1 uil-receipt-alt text-secondary"></span>
-            <a href="{% url 'order_list_view' %}"><h4 class="fs-6 pt-3">{{ purchase_orders }}</h4></a>
+            <a href="{% url 'purchase_order_list' %}"><h4 class="fs-6 pt-3">{{ purchase_orders }}</h4></a>
             <p class="fs-9 mb-0">{{ _("Purchase Orders")}}</p>
         </div>
     </div>

templates/footer.html

@@ -6,7 +6,7 @@
       <span class="fw-bold">Haikal</span>&nbsp;|&nbsp;<span class="fw-bold">هيكل</span>
 
     </div>
-    <div class="col-12 col-sm-auto text-center me-12">
+    <div class="col-12 col-sm-auto text-center">
       <span class="fw-light text-body-tertiary text-opacity-85">{{ _("Powered by")}} </span>
       <a class="mx-1 text-decoration-none text-body-highlight" href="https://tenhal.sa">
         <span>TENHAL</span>&nbsp;|&nbsp;<span>تنحل</span>

templates/inventory/car_detail.html

@@ -78,11 +78,16 @@
     <div class="row-fluid {% if car.status == 'sold' %}disabled{% endif %}">
         <div class="row g-3 justify-content-between">
             <div class="col-lg-12 col-xl-6">
-                <div class="card rounded shadow d-flex align-content-center {% if car.get_transfer %}disabled{% endif %}">
+                <div class="avatar avatar-5xl mb-3">
+                    <img class="rounded h-100 w-100" src="{% static 'images/cars/' %}{{ car.vin }}.png" alt="{{ car.vin }}" />
+                </div>
+                <div class="card mb-3 rounded shadow d-flex align-content-center {% if car.get_transfer %}disabled{% endif %}">
+
                     <p class="card-header rounded-top fw-bold">{% trans 'Car Details' %}</p>
                     <div class="card-body">
                         <div class="table-responsive scrollbar mb-3">
                             <table class="table table-sm fs-9 mb-0 overflow-hidden">
+
                                 <tr>
                                     <th>{% trans "VIN" %}</th>
                                     <td>{{ car.vin }}</td>

templates/inventory/car_list_table.html

@@ -19,3 +19,6 @@
         </div>
     </div>
 {% endblock %}
+
+
+

templates/inventory/car_list_view.html

@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load static i18n custom_filters humanize %}
-{%block title%} {%trans 'Stocks'%} {%endblock%}
+{%block title%} {%trans 'Inventory'%} {%endblock%}
 
 {% block customCSS %}
   <style>
@@ -23,11 +23,16 @@
     }
   </style>
 {% endblock customCSS %}
+
 {% block content %}
-  <div class="mb-9">
-    <div id="projectSummary">
-      <div class="row g-3 justify-content-between align-items-end mb-4">
+<div class="container-fluid" id="projectSummary">
+    <div class="row g-3 justify-content-between align-items-end mb-4">
         <div class="col-12 col-sm-auto">
+            <h2 class="text-body-emphasis fw-bold mb-0">{{ _("Inventory") }}</h2>
+        </div>
+    </div>
+    <div class="row g-3 justify-content-between align-items-end mb-2">
+        <div class="col-4 col-sm-auto">
           <ul
             class="nav nav-links mx-n2"
             hx-boost="true"
@@ -55,12 +60,22 @@
             </li>
             <li class="nav-item">
               <button hx-on:click="toggle_filter()" class="btn btn-sm btn-phoenix-primary px-2 py-1">
-                <span><span class="fa fa-filter me-1"></span>{{ _("Filter") }}</span><span class="fas fa-caret-down fs-9 ms-1 filter-icon"></span>
+                <span><span class="fa fa-filter me-1"></span>{{ _("Filter") }}</span>
+                  <span class="fas fa-caret-down fs-9 ms-1 filter-icon"></span>
               </button>
             </li>
           </ul>
         </div>
-        <div class="col-12 col-sm-auto">
+        <div class="col-4 col-sm-auto">
+            <form hx-boost="true" action="{% url 'bulk_update_car_price' %}" method="post" hx-include=".car-checkbox" class="update-price-form d-flex flex-row align-items-center ms-auto d-none" style="float: right;">
+                {% csrf_token %}
+                <div class="input-group">
+                    <input class="form-control" type="number" placeholder='{{ _("Price") }}' name="price" aria-label="Price" id="price" />
+                    <button class="btn btn-sm btn-phoenix-primary" type="submit">{{ _("Update") }}</button>
+                </div>
+            </form>
+        </div>
+        <div class="col-4 col-sm-auto">
           <div class="d-flex align-items-center">
             <div class="spinner-border mx-3 htmx-indicator" role="status">
               <span class="visually-hidden">Loading...</span>
@@ -87,7 +102,8 @@
             </div>
           </div>
         </div>
-      </div>
+    </div>
+    <div class="row">
       <div class="d-flex align-items-center d-none filter">
         <select
           hx-get="{% url 'car_list' %}"
@@ -149,17 +165,8 @@
           {{ _("Search") }}
         </button>
       </div>
-      <div class="row">
-        <form hx-boost="true" action="{% url 'bulk_update_car_price' %}" method="post" hx-include=".car-checkbox" class="update-price-form d-flex flex-row align-items-center ms-auto w-25 d-none" style="float: right;">
-          {% csrf_token %}
-          <div class="form-floating me-2">
-            <input class="form-control" type="number" placeholder='{{ _("Search") }}' name="price" aria-label="Price" id="price" />
-            <label for="price">{{ _("Price") }}</label>
-          </div>
-          <button class="btn btn-outline-primary" type="submit">{{ _("Search") }}</button>
-        </form>
-        <div class="table-responsive scrollbar transition">
-          <div class="d-flex flex-wrap align-items-center justify-content-between py-3 pe-0 fs-9">
+        <div class="table-responsive scrollbar">
+            <div class="d-flex flex-wrap align-items-center justify-content-between py-3 pe-0 fs-9">
             <div
               class="d-flex"
               hx-boost="true"
@@ -170,119 +177,121 @@
               hx-swap="innerHTML show:window:top"
               hx-indicator=".htmx-indicator"
               hx-on::before-request="on_before_request()"
-              hx-on::after-request="on_after_request()"></div>
-            <div class="w-100 list table-responsive" >
-              <div class="form-check">
-                <input class="form-check-input ms-4" type="checkbox" id="select-all" /> <span class="ms-1 text-body-tertiary">{{ _("Select All") }}</span>
-              </div>
-              {% for car in cars %}
-                <div class="card border mb-3 py-0 px-0" id="project-list-table-body">
-                  <div class="card-body">
-                    <div class="row align-items-center">
-                      <div class="col-auto">
-                        <div class="form-check">
-                          <input class="form-check-input car-checkbox" type="checkbox" name="car" value="{{ car.pk }}" id="car-{{car.pk}}" />
-                        </div>
-                      </div>
-                  <!-- Vehicle Image/Icon -->
-                      <div class="col-auto">
-                        <div class="avatar avatar-3xl">
-                          <img class="rounded-soft shadow shadow-lg" src="{% static 'images/cars/' %}{{ car.vin }}.png" alt="{{ car.vin }}" />
-                        </div>
-                      </div>
-                  <!-- Vehicle Details -->
-                      <div class="col">
-                        <div class="row">
-                      <!-- Make/Model/Specs -->
-                          <div class="col-md-4">
-                            <h5 class="text-body-emphasis fw-bold">{{ car.year }}</h5>
-                            <p class="text-body-emphasis fw-bold">
-                              <a href="{% url 'car_detail' car.slug %}" class="text-decoration-none text-body-emphasis">
-                                {{ car.id_car_make.get_local_name }}
-                              </a>
-                              <small>{{ car.id_car_model.get_local_name }}</small>
-                            </p>
-                            <small class="text-body-secondary" dir="ltr">
-                              {{ car.id_car_trim }}
-                            </small>
-                          </div>
-
-                      <!-- Color and Date -->
-                          <div class="col-md-3">
-                            <p class="text-body mb-1">
-                              {{ car.colors.exterior.get_local_name }}
-                            </p>
-                            <small class="text-body-secondary">
-                              {{ car.receiving_date|naturalday|capfirst }}
-                            </small>
-                          </div>
-
-                      <!-- Status Badge -->
-                          <div class="col-md-3">
-                            {% if car.status == "available" %}
-                              <span class="badge badge-phoenix fs-10 badge-phoenix-success text-uppercase px-3 py-2">{{ _("Available") }}</span>
-                            {% elif car.status == "reserved" %}
-                              <span class="badge badge-phoenix fs-10 badge-phoenix-warning text-uppercase px-3 py-2">{{ _("Reserved") }}</span>
-                            {% elif car.status == "sold" %}
-                              <span class="badge badge-phoenix fs-10 badge-phoenix-danger text-uppercase px-3 py-2">{{ _("Sold") }}</span>
-                            {% elif car.status == "transfer" %}
-                              <span class="badge badge-phoenix fs-10 badge-phoenix-info text-uppercase px-3 py-2">{{ _("Transfer") }}</span>
-                            {% endif %}
-                          </div>
-
-                      <!-- Ready Status -->
-                          <div class="col-md-2">
-                            <div class="d-flex align-items-center">
-                              <span class="fs-10 fw-light me-2">{{ _("Inventory Ready") }}</span>
-                              {% if car.ready %}
-                                <span class="badge bg-success rounded-circle p-1 me-2">
-                                  <span class="visually-hidden">Ready</span>
-                                </span>
-                                <span class="text-success fw-bold">{{ _("Yes") }}</span>
-                              {% else %}
-                                <span class="badge bg-danger rounded-circle p-1 me-2">
-                                  <span class="visually-hidden">Not Ready</span>
-                                </span>
-                                <span class="text-danger fw-bold">{{ _("No") }}</span>
-                              {% endif %}
+              hx-on::after-request="on_after_request()">
+            </div>
+                <table class="table fs-9 mb-0 border-top border-translucent">
+                    <thead>
+                    <tr>
+                        <th class="sort white-space-nowrap align-middle" scope="col">
+                            <div class="form-check">
+                                <input class="form-check-input" type="checkbox" id="select-all" />
+                            </div>
+                        </th>
+                        <th class="sort white-space-nowrap align-middle" scope="col">{{ _("VIN") }}</th>
+                        <th class="sort white-space-nowrap align-middle" scope="col" data-sort="make">{{ _("Make") }}</th>
+                        <th class="sort white-space-nowrap align-middle" scope="col" data-sort="model">{{ _("Model") }}</th>
+                        <th class="sort white-space-nowrap align-middle" scope="col" data-sort="year">{{ _("Year") }}</th>
+                        <th class="sort white-space-nowrap align-middle" scope="col">{{ _("Trim") }}</th>
+                        <th class="sort white-space-nowrap align-middle" scope="col">{{ _("Color") }}</th>
+                        <th class="sort white-space-nowrap align-middle" scope="col">{{ _("Date Received") }}</th>
+                        <th class="sort white-space-nowrap align-middle" scope="col" data-sort="car_status">{{ _("Status") }}</th>
+                        <th class="sort white-space-nowrap align-middle" scope="col">{{ _("Inventory Ready") }}</th>
+                        <th class="sort white-space-nowrap align-middle" scope="col"></th>
+                    </tr>
+                    </thead>
+                    <tbody class="list" id="project-list-table-body">
+                    {% for car in cars %}
+                        <tr class="position-static">
+                            <td class="align-middle time white-space-nowrap">
+                              <div class="form-check">
+                                  <input class="form-check-input car-checkbox"
+                                         type="checkbox"
+                                         name="car"
+                                         value="{{ car.pk }}"
+                                         id="car-{{car.pk}}" />
+                              </div>
+                            </td>
+                            <td class="align-middle white-space-nowrap assignees">
+                                <a class="fw-bold" href="{% url 'car_detail' car.slug %}">{{ car.vin }}</a>
+                            </td>
+                            <td class="align-middle white-space-nowrap make">
+                                <p class="mb-0 fs-9 text-body">{{ car.id_car_make.get_local_name|default:car.id_car_make.name }}</p>
+                            </td>
+                            <td class="align-middle white-space-nowrap model">
+                                <p class="mb-0 fs-9 text-body">{{ car.id_car_model.get_local_name|default:car.id_car_model.name }}</p>
+                            </td>
+                            <td class="align-middle white-space-nowrap year">
+                                <p class="fw-bo text-body fs-9 mb-0">{{ car.year }}</p>
+                            </td>
+                            <td class="align-middle white-space-nowrap">
+                                <p class="text-body-secondary fs-10 mb-0">{{ car.id_car_trim }}</p>
+                            </td>
+                            <td class="align-middle white-space-nowrap">
+                                <div class="d-flex flex-row align-items-center">
+                                    <div class="d-flex flex-column align-items-center">
+                                        <span class="color-div"
+                                              style="background: linear-gradient(90deg, rgba({{ car.colors.exterior.rgb }},1) 10%, rgba({{ car.colors.exterior.rgb }},0.10) 100%)"
+                                              title="{{ car.colors.exterior.get_local_name }}"></span><span>{{ car.colors.exterior.get_local_name }}</span>
+                                    </div>
+                                    <div class="d-flex flex-column align-items-center">
+                                        <span class="color-div"
+                                              style="background: linear-gradient(90deg, rgba({{ car.colors.interior.rgb }},1) 10%, rgba({{ car.colors.interior.rgb }},0.10) 100%)"
+                                              title="{{ car.colors.interior.get_local_name }}"></span><span>{{ car.colors.interior.get_local_name }}</span>
+                                    </div>
+                                </div>
+                            </td>
+                            <td class="align-middle white-space-nowrap">
+                                <p class="fw-bold text-body mb-0">{{ car.receiving_date|naturalday|capfirst }}</p>
+                            </td>
+                            <td class="align-middle white-space-nowrap statuses">
+                                {% if car.status == "available" %}
+                                    <span class="badge badge-phoenix fs-11 badge-phoenix-success">{{ _("Available") }}</span>
+                                {% elif car.status == "reserved" %}
+                                    <span class="badge badge-phoenix fs-11 badge-phoenix-danger">{{ _("Reserved") }}</span>
+                                {% elif car.status == "sold" %}
+                                    <span class="badge badge-phoenix fs-11 badge-phoenix-info">{{ _("Sold") }}</span>
+                                {% elif car.status == "transfer" %}
+                                    <span class="badge badge-phoenix fs-11 badge-phoenix-warning">{{ _("Transfer") }}</span>
+                                {% endif %}
+                            </td>
+                            <td class="align-middle white-space-nowrap">
+                                {% if not car.ready %}
+                                    <span class="text-danger"> {{ _("NO") }} </span>
+                                {%else%}
+                                    <span class="text-success"> {{ _("YES") }} </span>
+                                {%endif%}
+                            </td>
+                            <td class="align-middle text-end white-space-nowrap pe-0 action">
+                                <div class="btn-reveal-trigger position-static">
+                                    <button class="btn btn-sm dropdown-toggle dropdown-caret-none transition-none btn-reveal fs-10"
+                                            type="button"
+                                            data-bs-toggle="dropdown"
+                                            data-boundary="window"
+                                            aria-haspopup="true"
+                                            aria-expanded="false"
+                                            data-bs-reference="parent">
+                                        <span class="fas fa-ellipsis-h fs-10"></span>
+                                    </button>
+                                    <div class="dropdown-menu dropdown-menu-end py-2">
+                                        <a class="dropdown-item" href="{% url 'car_detail' car.slug %}">{{ _("View") }}</a>
+                                        <a class="dropdown-item" href="#!">{{ _("Export") }}</a>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+                    {% empty %}
+                        <div class="col-12">
+                            <div class="text-center py-5">
+                                <div class="text-body-secondary">
+                                    <i class="fas fa-car fa-4x mb-3 opacity-50"></i>
+                                    <h4 class="text-body-secondary">{{ _("No vehicles found") }}</h4>
+                                    <p class="text-body-tertiary">{{ _("Try adjusting your search criteria or filters") }}</p>
+                                </div>
                             </div>
-                          </div>
                         </div>
-                      </div>
-
-                  <!-- Action Menu -->
-                      <div class="col-auto">
-                        <div class="btn-reveal-trigger position-static">
-                          <button
-                            class="btn btn-sm dropdown-toggle dropdown-caret-none transition-none btn-reveal fs-10"
-                            type="button"
-                            data-bs-toggle="dropdown"
-                            data-boundary="window"
-                            aria-haspopup="true"
-                            aria-expanded="false"
-                            data-bs-reference="parent">
-                            <span class="fas fa-ellipsis-h fs-10"></span>
-                          </button>
-                          <div class="dropdown-menu dropdown-menu-end py-2">
-                            <a class="dropdown-item" href="{% url 'car_detail' car.slug %}"> <span class="fas fa-eye me-2"></span>{{ _("View") }} </a>
-                            <a class="dropdown-item" href="{% url 'car_update' car.slug %}"> <span class="fas fa-edit me-2"></span>{{ _("Edit") }} </a>
-                            <div class="dropdown-divider"></div>
-                            <a class="dropdown-item text-danger" href="{% url 'car_delete' car.slug %}"> <span class="fas fa-trash me-2"></span>{{ _("Remove") }} </a>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              {% empty %}
-                <div class="text-center py-5">
-                  <div class="text-body-secondary">
-                    <span class="fas fa-car fa-4x mb-3 opacity-50"></span>
-                    <h4 class="text-body-secondary">{{ _("No vehicles found") }}</h4>
-                    <p class="text-body-tertiary">{{ _("Try adjusting your search criteria or filters") }}</p>
-                  </div>
-                </div>
-              {% endfor %}
+                    {% endfor %}
+                    </tbody>
+                </table>
             </div>
           </div>
           {% if page_obj.paginator.num_pages > 1 %}
@@ -297,9 +306,11 @@
             {% endif %}
           </div>
         </div>
-      </div>
     </div>
-{% endblock %} {% block customJS %}
+</div>
+{% endblock %}
+
+{% block customJS %}
   <script>
     links = document.querySelectorAll(".nav-link");
     links.forEach((link) => {
@@ -364,4 +375,4 @@
     }
   </script>
 {% endblock customJS %}
-</div>
+

templates/partials/pagination.html

@@ -1,7 +1,11 @@
 {% load i18n static %}
-
+<div class="d-flex justify-content-between align-items-center mt-4">
+                    <div class="text-body-secondary">
+                        {{ _("Showing") }} {{ page_obj.start_index }} {{ _("to") }} {{ page_obj.end_index }}
+                        {{ _("of") }} {{ page_obj.paginator.count }} {{ _("results") }}
+                    </div>
 <nav aria-label="Page navigation">
-    <ul class="pagination flex items-center justify-center space-x-2 py-4 text-sm">
+    <ul class="pagination mb-0">
         {# First Page Link #}
         {% if page_obj.has_previous %}
             <li class="page-item rounded-md overflow-hidden">
@@ -38,18 +42,13 @@
 
         {# Page Numbers #}
         {% for num in page_obj.paginator.page_range %}
-
             {% if num == 1 or num == page_obj.paginator.num_pages or num >= page_obj.number|add:-2 and num <= page_obj.number|add:2 %}
-                <li class="page-item rounded-md overflow-hidden {% if num == page_obj.number %}bg-blue-600 text-white shadow-md{% else %}bg-white text-blue-600 hover:bg-gray-100{% endif %}">
-                    <a class="page-link block px-3 py-2 border {% if num == page_obj.number %}border-blue-600{% else %}border-gray-300{% endif %} transition-colors duration-200"
+                <li class="page-item {% if num == page_obj.number %}active{% endif %}">
+                    <a class="page-link" {% if num == page_obj.number %}aria-current="page"{% endif %}
                        href="?page={{ num }}{% if q %}&q={{q}}{% endif %}">
                         {{ num }}
                     </a>
                 </li>
-            {% elif num == page_obj.number|add:-3 or num == page_obj.number|add:3 %}
-                <li class="page-item disabled rounded-md overflow-hidden">
-                    <span class="page-link px-3 py-2 border border-gray-300 bg-white text-gray-600 cursor-default">...</span>
-                </li>
             {% endif %}
         {% endfor %}
 
@@ -88,3 +87,4 @@
         {% endif %}
     </ul>
 </nav>
+</div>

templates/purchase_orders/includes/po_item_formset.html

@@ -16,7 +16,7 @@
                 {{ itemtxs_formset.non_form_errors }}
                 {{ itemtxs_formset.management_form }}
                 <table class="table table-hover table-bordered">
-                    <thead class="table-light">
+                    <thead class="">
                         <tr>
                             <th>{% trans 'Item' %}</th>
                             <th>{% trans 'Unit Cost' %}</th>