update

2025-06-23 11:24:49 +03:00 · 2025-06-23 11:24:49 +03:00 · a407663ff0
commit a407663ff0
parent 4a941aa891
10 changed files with 17 additions and 25 deletions
--- a/inventory/forms.py
+++ b/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"),
    )
--- a/inventory/views.py
+++ b/inventory/views.py
@ -9387,7 +9387,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
--- a/templates/base.html
+++ b/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 %}
@ -82,7 +74,7 @@
                {% block body %}
                {% endblock body%}

-                <div class="my-3"></div>
+
                {% include 'footer.html' %}
            </div>
        </main>
@ -98,11 +90,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>
--- a/templates/csv_upload.html
+++ b/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>
--- a/templates/dashboards/manager.html
+++ b/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>
--- a/templates/footer.html
+++ b/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>
--- a/templates/inventory/car_detail.html
+++ b/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>
--- a/templates/inventory/car_list_view.html
+++ b/templates/inventory/car_list_view.html
@ -28,7 +28,7 @@
 <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">
-            <h1 class="text-body-emphasis fw-bold fs-2 mb-0">{{ _("Inventory") }}</h1>
+            <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">
--- a/templates/purchase_orders/includes/card_po.html
+++ b/templates/purchase_orders/includes/card_po.html
@ -32,7 +32,7 @@
 {% if not create_po %}
    {% if style == 'po-detail' %}
        <div class="card shadow-sm border-0 mb-4">
-            <div class="card-header bg-light">
+            <div class="card-header">
                <div class="d-flex align-items-center">
                    <span class="me-3 text-primary">
                        {% icon 'uil:bill' 36 %}
--- a/templates/purchase_orders/includes/po_item_formset.html
+++ b/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>