diff --git a/.DS_Store b/.DS_Store index 42f33779..2d80a8de 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/inventory/forms.py b/inventory/forms.py index 3debc3bf..31328ab2 100644 --- 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"), ) diff --git a/inventory/views.py b/inventory/views.py index fdfc5921..18785db4 100644 --- a/inventory/views.py +++ b/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 diff --git a/static/.DS_Store b/static/.DS_Store index 0f22e4c5..07457a87 100644 Binary files a/static/.DS_Store and b/static/.DS_Store differ diff --git a/static/images/.DS_Store b/static/images/.DS_Store index d9783fd7..37a79eeb 100644 Binary files a/static/images/.DS_Store and b/static/images/.DS_Store differ diff --git a/static/images/car_make/.DS_Store b/static/images/car_make/.DS_Store index 5008ddfc..ba83d1a2 100644 Binary files a/static/images/car_make/.DS_Store and b/static/images/car_make/.DS_Store differ diff --git a/static/images/car_make/Alfa-Romeo-2_jj41jXd.png b/static/images/car_make/Alfa-Romeo-2_jj41jXd.png index 9c019410..e50a4b04 100644 Binary files a/static/images/car_make/Alfa-Romeo-2_jj41jXd.png and b/static/images/car_make/Alfa-Romeo-2_jj41jXd.png differ diff --git a/static/images/car_make/Avatr.png b/static/images/car_make/Avatr.png new file mode 100644 index 00000000..837969be Binary files /dev/null and b/static/images/car_make/Avatr.png differ diff --git a/static/images/car_make/BAIC.png b/static/images/car_make/BAIC.png index cde8f9b5..2efbafcf 100644 Binary files a/static/images/car_make/BAIC.png and b/static/images/car_make/BAIC.png differ diff --git a/static/images/car_make/BMW.png b/static/images/car_make/BMW.png index c9a745a5..5e547272 100644 Binary files a/static/images/car_make/BMW.png and b/static/images/car_make/BMW.png differ diff --git a/static/images/car_make/Changfeng.png b/static/images/car_make/Changfeng.png new file mode 100644 index 00000000..49e19c81 Binary files /dev/null and b/static/images/car_make/Changfeng.png differ diff --git a/static/images/car_make/Chery.png b/static/images/car_make/Chery.png index 41e33b1a..ebfd8e9e 100644 Binary files a/static/images/car_make/Chery.png and b/static/images/car_make/Chery.png differ diff --git a/static/images/car_make/Chevrolet_ZUJVQuH.png b/static/images/car_make/Chevrolet_ZUJVQuH.png index c7c6c798..fff175d9 100644 Binary files a/static/images/car_make/Chevrolet_ZUJVQuH.png and b/static/images/car_make/Chevrolet_ZUJVQuH.png differ diff --git a/static/images/car_make/Citroen.png b/static/images/car_make/Citroen.png index eb2d3d22..ec6352b2 100644 Binary files a/static/images/car_make/Citroen.png and b/static/images/car_make/Citroen.png differ diff --git a/static/images/car_make/Dongfeng.png b/static/images/car_make/Dongfeng.png index fa272b7b..e2dc1644 100644 Binary files a/static/images/car_make/Dongfeng.png and b/static/images/car_make/Dongfeng.png differ diff --git a/static/images/car_make/EXEED.png b/static/images/car_make/EXEED.png index c6c40273..fb4b9da3 100644 Binary files a/static/images/car_make/EXEED.png and b/static/images/car_make/EXEED.png differ diff --git a/static/images/car_make/Enovate.png b/static/images/car_make/Enovate.png new file mode 100644 index 00000000..ee909149 Binary files /dev/null and b/static/images/car_make/Enovate.png differ diff --git a/static/images/car_make/Forthing.png b/static/images/car_make/Forthing.png index 474a02a3..24dcc489 100644 Binary files a/static/images/car_make/Forthing.png and b/static/images/car_make/Forthing.png differ diff --git a/static/images/car_make/GWM.png b/static/images/car_make/GWM.png index df788792..cd7970f3 100644 Binary files a/static/images/car_make/GWM.png and b/static/images/car_make/GWM.png differ diff --git a/static/images/car_make/HiPhi.png b/static/images/car_make/HiPhi.png new file mode 100644 index 00000000..e4262128 Binary files /dev/null and b/static/images/car_make/HiPhi.png differ diff --git a/static/images/car_make/Hozon.png b/static/images/car_make/Hozon.png new file mode 100644 index 00000000..ff3383ef Binary files /dev/null and b/static/images/car_make/Hozon.png differ diff --git a/static/images/car_make/Huawei.png b/static/images/car_make/Huawei.png new file mode 100644 index 00000000..7c8652a3 Binary files /dev/null and b/static/images/car_make/Huawei.png differ diff --git a/static/images/car_make/Hyundai.png b/static/images/car_make/Hyundai.png index 59f9af60..f55ff589 100644 Binary files a/static/images/car_make/Hyundai.png and b/static/images/car_make/Hyundai.png differ diff --git a/static/images/car_make/IM-Motors.png b/static/images/car_make/IM-Motors.png new file mode 100644 index 00000000..e31c293f Binary files /dev/null and b/static/images/car_make/IM-Motors.png differ diff --git a/static/images/car_make/Jaguar.png b/static/images/car_make/Jaguar.png index 7f4bc6e9..9621c739 100644 Binary files a/static/images/car_make/Jaguar.png and b/static/images/car_make/Jaguar.png differ diff --git a/static/images/car_make/Jeep.png b/static/images/car_make/Jeep.png index 2e4b247e..37c47e98 100644 Binary files a/static/images/car_make/Jeep.png and b/static/images/car_make/Jeep.png differ diff --git a/static/images/car_make/Leapmotor.png b/static/images/car_make/Leapmotor.png new file mode 100644 index 00000000..9dee98b8 Binary files /dev/null and b/static/images/car_make/Leapmotor.png differ diff --git a/static/images/car_make/Lincoln.png b/static/images/car_make/Lincoln.png index a8b95d17..3fabda22 100644 Binary files a/static/images/car_make/Lincoln.png and b/static/images/car_make/Lincoln.png differ diff --git a/static/images/car_make/Lincoln1.png b/static/images/car_make/Lincoln1.png new file mode 100644 index 00000000..89a2360c Binary files /dev/null and b/static/images/car_make/Lincoln1.png differ diff --git a/static/images/car_make/LynkCo.png b/static/images/car_make/LynkCo.png index 2e90a6e2..d4e8bf58 100644 Binary files a/static/images/car_make/LynkCo.png and b/static/images/car_make/LynkCo.png differ diff --git a/static/images/car_make/Maserati.png b/static/images/car_make/Maserati.png index 7cb2e6e3..d89073ae 100644 Binary files a/static/images/car_make/Maserati.png and b/static/images/car_make/Maserati.png differ diff --git a/static/images/car_make/Renault.png b/static/images/car_make/Renault.png index b130c600..d9791024 100644 Binary files a/static/images/car_make/Renault.png and b/static/images/car_make/Renault.png differ diff --git a/static/images/car_make/Rover.png b/static/images/car_make/Rover.png index 7bb26736..b7aece62 100644 Binary files a/static/images/car_make/Rover.png and b/static/images/car_make/Rover.png differ diff --git a/static/images/car_make/Ssangyong.png b/static/images/car_make/Ssangyong.png index 8b8d2bef..e70b82b2 100644 Binary files a/static/images/car_make/Ssangyong.png and b/static/images/car_make/Ssangyong.png differ diff --git a/static/images/car_make/Stelato.png b/static/images/car_make/Stelato.png index 398919c2..856a2753 100644 Binary files a/static/images/car_make/Stelato.png and b/static/images/car_make/Stelato.png differ diff --git a/static/images/car_make/Toyota.png b/static/images/car_make/Toyota.png index 2220f0f0..5a564d91 100644 Binary files a/static/images/car_make/Toyota.png and b/static/images/car_make/Toyota.png differ diff --git a/static/images/car_make/Voyah.png b/static/images/car_make/Voyah.png index b8e0d3b1..5d8adbc0 100644 Binary files a/static/images/car_make/Voyah.png and b/static/images/car_make/Voyah.png differ diff --git a/static/images/car_make/Xiaomi.png b/static/images/car_make/Xiaomi.png new file mode 100644 index 00000000..4c7dfe31 Binary files /dev/null and b/static/images/car_make/Xiaomi.png differ diff --git a/static/images/car_make/Zeekr.png b/static/images/car_make/Zeekr.png new file mode 100644 index 00000000..6a2ecbe4 Binary files /dev/null and b/static/images/car_make/Zeekr.png differ diff --git a/static/images/car_make/Zotye.png b/static/images/car_make/Zotye.png index c86d94e0..d9ecefba 100644 Binary files a/static/images/car_make/Zotye.png and b/static/images/car_make/Zotye.png differ diff --git a/static/images/car_make/changan.png b/static/images/car_make/changan.png index 5761674e..1002e821 100644 Binary files a/static/images/car_make/changan.png and b/static/images/car_make/changan.png differ diff --git a/static/images/cars/.DS_Store b/static/images/cars/.DS_Store index 537c8200..b7e89b25 100644 Binary files a/static/images/cars/.DS_Store and b/static/images/cars/.DS_Store differ diff --git a/static/images/cars/1FM5K7B86EJA77428.png b/static/images/cars/1FM5K7B86EJA77428.png new file mode 100644 index 00000000..ab2a4983 Binary files /dev/null and b/static/images/cars/1FM5K7B86EJA77428.png differ diff --git a/static/images/cars/1g6a85sx8k0144230.png b/static/images/cars/1g6a85sx8k0144230.png index f27d5384..495d6b49 100644 Binary files a/static/images/cars/1g6a85sx8k0144230.png and b/static/images/cars/1g6a85sx8k0144230.png differ diff --git a/static/images/cars/2G1F93D33C9198388.png b/static/images/cars/2G1F93D33C9198388.png index f5f2e4a7..b6a1f75d 100644 Binary files a/static/images/cars/2G1F93D33C9198388.png and b/static/images/cars/2G1F93D33C9198388.png differ diff --git a/static/images/cars/3GCNY9EF5LG275234.png b/static/images/cars/3GCNY9EF5LG275234.png index 6ca9b1e5..585597d5 100644 Binary files a/static/images/cars/3GCNY9EF5LG275234.png and b/static/images/cars/3GCNY9EF5LG275234.png differ diff --git a/static/images/cars/5LMCJ2D93NUL03460.png b/static/images/cars/5LMCJ2D93NUL03460.png index b1ea45cf..b8f16f11 100644 Binary files a/static/images/cars/5LMCJ2D93NUL03460.png and b/static/images/cars/5LMCJ2D93NUL03460.png differ diff --git a/static/images/cars/JN8AY2NY9E9073687.png b/static/images/cars/JN8AY2NY9E9073687.png index 7a71f306..7687330c 100644 Binary files a/static/images/cars/JN8AY2NY9E9073687.png and b/static/images/cars/JN8AY2NY9E9073687.png differ diff --git a/static/images/cars/LJXCU3BB0RTF17235.png b/static/images/cars/LJXCU3BB0RTF17235.png new file mode 100644 index 00000000..4ab35847 Binary files /dev/null and b/static/images/cars/LJXCU3BB0RTF17235.png differ diff --git a/static/images/cars/VF3V1ZKX7RZ002134.png b/static/images/cars/VF3V1ZKX7RZ002134.png new file mode 100644 index 00000000..201190f0 Binary files /dev/null and b/static/images/cars/VF3V1ZKX7RZ002134.png differ diff --git a/templates/base.html b/templates/base.html index fb1cfb98..76641d01 100644 --- a/templates/base.html +++ b/templates/base.html @@ -40,7 +40,6 @@ - {% if LANGUAGE_CODE == 'ar' %} @@ -52,14 +51,7 @@ - + {% block customCSS %} {% endblock %} @@ -83,7 +75,7 @@ {% block body %} {% endblock body%} -
+ {% include 'footer.html' %} @@ -99,11 +91,6 @@ - - - - - diff --git a/templates/csv_upload.html b/templates/csv_upload.html index 28b18a6f..1ea1ba5c 100644 --- a/templates/csv_upload.html +++ b/templates/csv_upload.html @@ -167,7 +167,7 @@
- CSV should include columns: vin + {{ _("CSV should include columns: vin")}}
diff --git a/templates/dashboards/manager.html b/templates/dashboards/manager.html index 2b24a733..8abf93ee 100644 --- a/templates/dashboards/manager.html +++ b/templates/dashboards/manager.html @@ -37,7 +37,7 @@
-

{{ purchase_orders }}

 +

{{ purchase_orders }}

{{ _("Purchase Orders")}}

diff --git a/templates/footer.html b/templates/footer.html index c4fbb04d..6b1b355f 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -6,7 +6,7 @@ Haikal | هيكل -
+
{{ _("Powered by")}} TENHAL | تنحل diff --git a/templates/inventory/car_detail.html b/templates/inventory/car_detail.html index effff5bd..194e36c1 100644 --- a/templates/inventory/car_detail.html +++ b/templates/inventory/car_detail.html @@ -78,11 +78,16 @@
-
+
+ {{ car.vin }} +
+
+

{% trans 'Car Details' %}

+ diff --git a/templates/inventory/car_list_table.html b/templates/inventory/car_list_table.html index ebed8155..c60456c6 100644 --- a/templates/inventory/car_list_table.html +++ b/templates/inventory/car_list_table.html @@ -19,3 +19,6 @@ {% endblock %} + + + diff --git a/templates/inventory/car_list_view.html b/templates/inventory/car_list_view.html index 44a718ae..c3b280e4 100644 --- a/templates/inventory/car_list_view.html +++ b/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 %} {% endblock customCSS %} + {% block content %} -
-
-
+
+
+

{{ _("Inventory") }}

+
+
+
+
-
+
+
+ {% csrf_token %} +
+ + +
+ +
+
-
+
+
- -
- - -
-
+
+
-
-
- {{ _("Select All") }} -
- {% for car in cars %} -
-
-
-
-
- -
-
- -
-
- {{ car.vin }} -
-
- -
-
- -
-
{{ car.year }}
-

- - {{ car.id_car_make.get_local_name }} - - {{ car.id_car_model.get_local_name }} -

- - {{ car.id_car_trim }} - -
- - -
-

- {{ car.colors.exterior.get_local_name }} -

- - {{ car.receiving_date|naturalday|capfirst }} - -
- - -
- {% if car.status == "available" %} - {{ _("Available") }} - {% elif car.status == "reserved" %} - {{ _("Reserved") }} - {% elif car.status == "sold" %} - {{ _("Sold") }} - {% elif car.status == "transfer" %} - {{ _("Transfer") }} - {% endif %} -
- - -
-
- {{ _("Inventory Ready") }} - {% if car.ready %} - - - - {{ _("Yes") }} - {% else %} - - - - {{ _("No") }} - {% endif %} + hx-on::after-request="on_after_request()"> +
+
{% trans "VIN" %} {{ car.vin }}
+ + + + + + + + + + + + + + + + + {% for car in cars %} + + + + + + + + + + + + + + {% empty %} +
+
+
+ +

{{ _("No vehicles found") }}

+

{{ _("Try adjusting your search criteria or filters") }}

+
-
- - - -
-
- -
- {{ _("View") }} - {{ _("Edit") }} -
- {{ _("Remove") }} -
-
-
- - - - {% empty %} -
-
- -

{{ _("No vehicles found") }}

-

{{ _("Try adjusting your search criteria or filters") }}

-
-
- {% endfor %} + {% endfor %} + +
+
+ +
+ 		{{ _("VIN") }}{{ _("Make") }}{{ _("Model") }}{{ _("Year") }}{{ _("Trim") }}{{ _("Color") }}{{ _("Date Received") }}{{ _("Status") }}{{ _("Inventory Ready") }}
+
+ +
+ 		+ {{ car.vin }} + +

{{ car.id_car_make.get_local_name|default:car.id_car_make.name }}

+ 		+

{{ car.id_car_model.get_local_name|default:car.id_car_model.name }}

+ 		+

{{ car.year }}

+ 		+

{{ car.id_car_trim }}

+ 		+
+
+ {{ car.colors.exterior.get_local_name }} +
+
+ {{ car.colors.interior.get_local_name }} +
+
+ 		+

{{ car.receiving_date|naturalday|capfirst }}

+ 		+ {% if car.status == "available" %} + {{ _("Available") }} + {% elif car.status == "reserved" %} + {{ _("Reserved") }} + {% elif car.status == "sold" %} + {{ _("Sold") }} + {% elif car.status == "transfer" %} + {{ _("Transfer") }} + {% endif %} + + {% if not car.ready %} + {{ _("NO") }} + {%else%} + {{ _("YES") }} + {%endif%} + +
+ +
+ {{ _("View") }} + {{ _("Export") }} +
+
+
{% if page_obj.paginator.num_pages > 1 %} @@ -297,9 +306,11 @@ {% endif %}
-
-{% endblock %} {% block customJS %} +
 +{% endblock %} + +{% block customJS %} {% endblock customJS %} -
+ diff --git a/templates/partials/pagination.html b/templates/partials/pagination.html index 409d2c99..66bec0ef 100644 --- a/templates/partials/pagination.html +++ b/templates/partials/pagination.html @@ -1,7 +1,11 @@ {% load i18n static %} - +
+
+ {{ _("Showing") }} {{ page_obj.start_index }} {{ _("to") }} {{ page_obj.end_index }} + {{ _("of") }} {{ page_obj.paginator.count }} {{ _("results") }} +
+
\ No newline at end of file diff --git a/templates/purchase_orders/includes/po_item_formset.html b/templates/purchase_orders/includes/po_item_formset.html index 32c3ffbd..bb6a6d41 100644 --- 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 }} - +
{% trans 'Item' %} {% trans 'Unit Cost' %}