ismail/haikal
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflict issue

Browse Source
This commit is contained in:
gitea 2025-03-04 21:50:29 +00:00
parent 4cd61f6a84
commit 76fbb4a69b
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inventory/services.py
View File

@ -43,8 +43,8 @@ def decodevin(vin):
return result return result
elif result:=elm(vin): elif result:=elm(vin):
return result return result
# elif result:=decode_vin_haikalna(vin): elif result:=decode_vin_haikalna(vin):
# return result return result
else: else:
return None return None

12
templates/header.html
View File

@ -3,11 +3,9 @@
{% if user.is_authenticated %} {% if user.is_authenticated %}
<nav class="navbar navbar-vertical navbar-expand-lg"> <nav class="navbar navbar-vertical navbar-expand-lg">
<div class="collapse navbar-collapse" id="navbarVerticalCollapse"> <div class="collapse navbar-collapse" id="navbarVerticalCollapse">
<!-- scrollbar removed-->
<div class="navbar-vertical-content"> <div class="navbar-vertical-content">
<ul class="navbar-nav flex-column" id="navbarVerticalNav"> <ul class="navbar-nav flex-column" id="navbarVerticalNav">
<li class="nav-item"> <li class="nav-item">
<!-- parent pages-->
<div class="nav-item-wrapper"> <div class="nav-item-wrapper">
<a class="nav-link dropdown-indicator label-1" href="#nv-dashboards" role="button" data-bs-toggle="collapse" aria-expanded="false" aria-controls="nv-dashboards"> <a class="nav-link dropdown-indicator label-1" href="#nv-dashboards" role="button" data-bs-toggle="collapse" aria-expanded="false" aria-controls="nv-dashboards">
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
@ -57,10 +55,8 @@
</li> </li>
<hr class="my-0" /> <hr class="my-0" />
<li class="nav-item"> <li class="nav-item">
<!-- label-->
<p class="navbar-vertical-label">Apps</p> <p class="navbar-vertical-label">Apps</p>
<hr class="navbar-vertical-line" /> <hr class="navbar-vertical-line" />
<!-- parent pages-->
<div class="nav-item-wrapper"> <div class="nav-item-wrapper">
<a class="nav-link dropdown-indicator label-1" href="#nv-inventory" role="button" data-bs-toggle="collapse" aria-expanded="false" aria-controls="nv-inventory"> <a class="nav-link dropdown-indicator label-1" href="#nv-inventory" role="button" data-bs-toggle="collapse" aria-expanded="false" aria-controls="nv-inventory">
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
@ -78,10 +74,9 @@
<span class="nav-link-icon"><span class="fas fa-plus-circle"></span></span><span class="nav-link-text">{% trans "add car"|capfirst %}</span> <span class="nav-link-icon"><span class="fas fa-plus-circle"></span></span><span class="nav-link-text">{% trans "add car"|capfirst %}</span>
</div> </div>
</a> </a>
<!-- more inner pages-->
</li> </li>
{% endif %} {% endif %}
<!--<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="{% url 'inventory_stats' %}"> <a class="nav-link" href="{% url 'inventory_stats' %}">
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
@ -94,8 +89,7 @@
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<span class="nav-link-icon"><span class="fas fa-car-side"></span></span><span class="nav-link-text">{% trans 'Stock'|capfirst %}</span> <span class="nav-link-icon"><span class="fas fa-car-side"></span></span><span class="nav-link-text">{% trans 'Stock'|capfirst %}</span>
</div> </div>
</a> </a>
<!-- more inner pages-->
</li> </li>
</ul> </ul>
</div> </div>
@ -204,7 +198,7 @@
<span class="nav-link-icon"><span class="fas fa-city"></span></span><span class="nav-link-text">{% trans "Organizations"|capfirst %}</span> <span class="nav-link-icon"><span class="fas fa-city"></span></span><span class="nav-link-text">{% trans "Organizations"|capfirst %}</span>
</div> </div>
</a> </a>
<!-- more inner pages
</li> </li>
{% comment %} <li class="nav-item"> {% comment %} <li class="nav-item">
<a class="nav-link" href="{% url 'representative_list' %}"> <a class="nav-link" href="{% url 'representative_list' %}">