fix the vendor delete and update

This commit is contained in:
ismail 2025-05-20 15:01:40 +03:00
parent 6621c1814c
commit faf4eba38a
4 changed files with 27 additions and 10 deletions

View File

@ -0,0 +1,18 @@
# Generated by Django 5.1.7 on 2025-05-20 12:00
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('inventory', '0001_initial'),
]
operations = [
migrations.AddField(
model_name='vendor',
name='active',
field=models.BooleanField(default=True, verbose_name='Active'),
),
]

View File

@ -1755,6 +1755,7 @@ class Vendor(models.Model, LocalizedNameMixin):
logo = models.ImageField( logo = models.ImageField(
upload_to="logos/vendors", blank=True, null=True, verbose_name=_("Logo") upload_to="logos/vendors", blank=True, null=True, verbose_name=_("Logo")
) )
active = models.BooleanField(default=True, verbose_name=_("Active"))
created_at = models.DateTimeField(auto_now_add=True, verbose_name=_("Created At")) created_at = models.DateTimeField(auto_now_add=True, verbose_name=_("Created At"))
slug = models.SlugField(max_length=255, unique=True, verbose_name=_("Slug"), null=True,blank=True) slug = models.SlugField(max_length=255, unique=True, verbose_name=_("Slug"), null=True,blank=True)

View File

@ -2144,13 +2144,14 @@ class VendorListView(LoginRequiredMixin, ListView):
context_object_name = "vendors" context_object_name = "vendors"
paginate_by = 10 paginate_by = 10
template_name = "vendors/vendors_list.html" template_name = "vendors/vendors_list.html"
ordering = ["-created"]
def get_queryset(self): def get_queryset(self):
query = self.request.GET.get("q") query = self.request.GET.get("q")
dealer = get_user_type(self.request) dealer = get_user_type(self.request)
vendors = dealer.entity.get_vendors().filter(active=True) vendors = super().get_queryset().filter(dealer=dealer,active=True)
return apply_search_filters(vendors, query) if query:
return apply_search_filters(vendors, query)
return vendors
@login_required @login_required

View File

@ -37,7 +37,7 @@
</div> </div>
</div> </div>
</div> </div>
{% if page_obj.object_list %}
<div class="table-responsive scrollbar mx-n1 px-1"> <div class="table-responsive scrollbar mx-n1 px-1">
<table class="table table-hover fs-9 mb-0"> <table class="table table-hover fs-9 mb-0">
@ -70,10 +70,7 @@
</tr> </tr>
</thead> </thead>
<tbody class="list" id="leal-tables-body"> <tbody class="list" id="leal-tables-body">
{% for vendor in vendors %} {% for vendor in vendors %}
<!-- Delete Modal -->
<tr class="hover-actions-trigger btn-reveal-trigger position-static"> <tr class="hover-actions-trigger btn-reveal-trigger position-static">
<td class="name align-middle white-space-nowrap ps-0"> <td class="name align-middle white-space-nowrap ps-0">
@ -84,7 +81,7 @@
<div class="avatar avatar-xl me-3"><img class="rounded-circle" src="{% static 'images/icons/picture.svg' %}" alt="" /> <div class="avatar avatar-xl me-3"><img class="rounded-circle" src="{% static 'images/icons/picture.svg' %}" alt="" />
{% endif %} {% endif %}
</div> </div>
<div><a class="fs-8 fw-bold" href="{% url 'vendor_detail' vendor.slug%}">{{ vendor.arabic_name }}</a> <div><a class="fs-8 fw-bold" href="{% url 'vendor_detail' vendor.slug %}">{{ vendor.arabic_name }}</a>
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<p class="mb-0 text-body-highlight fw-semibold fs-9 me-2">{{ vendor.name}}</p><!--<span class="badge badge-phoenix badge-phoenix-primary">{{ vendor.vendor_model.uuid }}</span>--> <p class="mb-0 text-body-highlight fw-semibold fs-9 me-2">{{ vendor.name}}</p><!--<span class="badge badge-phoenix badge-phoenix-primary">{{ vendor.vendor_model.uuid }}</span>-->
</div> </div>
@ -117,7 +114,7 @@
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
{% endif %}
</table> </table>
</div> </div>
<div class="row align-items-center justify-content-end py-4 pe-0 fs-9"> <div class="row align-items-center justify-content-end py-4 pe-0 fs-9">