small fixes
This commit is contained in:
parent
0b1bb10934
commit
f8527795ae
@ -4451,20 +4451,14 @@ class EstimateListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
|
|||||||
entity = dealer.entity
|
entity = dealer.entity
|
||||||
status = self.request.GET.get("status")
|
status = self.request.GET.get("status")
|
||||||
queryset = entity.get_estimates()
|
queryset = entity.get_estimates()
|
||||||
type(queryset)
|
|
||||||
if status:
|
if status:
|
||||||
queryset = queryset.filter(status=status)
|
queryset = queryset.filter(status=status)
|
||||||
for f in queryset.first()._meta.get_fields():
|
search_query = self.request.GET.get('q', None)
|
||||||
print(f)
|
|
||||||
search_query = self.request.GET.get('q', '').strip()
|
|
||||||
print(search_query)
|
|
||||||
if search_query:
|
if search_query:
|
||||||
print("inside")
|
|
||||||
queryset = queryset.filter(
|
queryset = queryset.filter(
|
||||||
Q(estimate_number__icontains=search_query)
|
Q(estimate_number__icontains=search_query)
|
||||||
|
|
||||||
).distinct()
|
).distinct()
|
||||||
|
|
||||||
return queryset
|
return queryset
|
||||||
|
|
||||||
|
|
||||||
@ -5829,6 +5823,7 @@ class LeadListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
|
|||||||
permission_required = ["inventory.view_lead"]
|
permission_required = ["inventory.view_lead"]
|
||||||
|
|
||||||
def get_queryset(self):
|
def get_queryset(self):
|
||||||
|
# print(self.request.is_dealer)
|
||||||
dealer = get_object_or_404(models.Dealer, slug=self.kwargs["dealer_slug"])
|
dealer = get_object_or_404(models.Dealer, slug=self.kwargs["dealer_slug"])
|
||||||
query = self.request.GET.get("q")
|
query = self.request.GET.get("q")
|
||||||
qs = models.Lead.objects.filter(dealer=dealer).exclude(status="converted")
|
qs = models.Lead.objects.filter(dealer=dealer).exclude(status="converted")
|
||||||
|
|||||||
@ -83,9 +83,9 @@
|
|||||||
{% block period_navigation %}
|
{% block period_navigation %}
|
||||||
{% endblock period_navigation %}
|
{% endblock period_navigation %}
|
||||||
<div id="main_content" class="fade-me-in" hx-boost="true" hx-target="#main_content" hx-select="#main_content" hx-swap="outerHTML transition:false" hx-select-oob="#toast-container" hx-history-elt>
|
<div id="main_content" class="fade-me-in" hx-boost="true" hx-target="#main_content" hx-select="#main_content" hx-swap="outerHTML transition:false" hx-select-oob="#toast-container" hx-history-elt>
|
||||||
<div id="spinner" class="htmx-indicator spinner-bg">
|
{% comment %} <div id="spinner" class="htmx-indicator spinner-bg">
|
||||||
<img src="{% static 'spinner.svg' %}" width="100" height="100" alt="">
|
<img src="{% static 'spinner.svg' %}" width="100" height="100" alt="">
|
||||||
</div>
|
</div> {% endcomment %}
|
||||||
{% block customCSS %}{% endblock %}
|
{% block customCSS %}{% endblock %}
|
||||||
{% block content %}{% endblock content %}
|
{% block content %}{% endblock content %}
|
||||||
{% block customJS %}{% endblock %}
|
{% block customJS %}{% endblock %}
|
||||||
|
|||||||
@ -10,7 +10,7 @@
|
|||||||
<li class="fas fa-bullhorn text-primary ms-2"></li>
|
<li class="fas fa-bullhorn text-primary ms-2"></li>
|
||||||
</h2>
|
</h2>
|
||||||
<!-- Action Tracking Modal -->
|
<!-- Action Tracking Modal -->
|
||||||
{% include "crm/leads/partials/update_action.html" %}
|
{% comment %} {% include "crm/leads/partials/update_action.html" %} {% endcomment %}
|
||||||
<div class="row g-3 justify-content-between mb-4">
|
<div class="row g-3 justify-content-between mb-4">
|
||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
<div class="d-md-flex justify-content-between">
|
<div class="d-md-flex justify-content-between">
|
||||||
|
|||||||
@ -13,7 +13,7 @@
|
|||||||
aria-label="Close"></button>
|
aria-label="Close"></button>
|
||||||
</div>
|
</div>
|
||||||
<form id="actionTrackingForm"
|
<form id="actionTrackingForm"
|
||||||
action="{% url 'update_lead_actions' lead.dealer.slug %}"
|
action="{% url 'update_lead_actions' request.dealer.slug %}"
|
||||||
hx-select-oob="#currentStage:outerHTML,#leadStatus:outerHTML,#toast-container:outerHTML"
|
hx-select-oob="#currentStage:outerHTML,#leadStatus:outerHTML,#toast-container:outerHTML"
|
||||||
hx-swap="none"
|
hx-swap="none"
|
||||||
hx-on::after-request="{
|
hx-on::after-request="{
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
<li class="collapsed-nav-item-title d-none">{% trans "Inventory"|capfirst %}</li>
|
<li class="collapsed-nav-item-title d-none">{% trans "Inventory"|capfirst %}</li>
|
||||||
{% if perms.inventory.add_car %}
|
{% if perms.inventory.add_car %}
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a id="btn-add-car" class="nav-link btn-add-car" href="{% url 'car_add' request.dealer.slug %}">
|
<a hx-boost="false" id="btn-add-car" class="nav-link btn-add-car" href="{% url 'car_add' request.dealer.slug %}">
|
||||||
<div class="d-flex align-items-center">
|
<div class="d-flex align-items-center">
|
||||||
<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>
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
{% load i18n static custom_filters %}
|
{% load i18n static custom_filters %}
|
||||||
{% block title %}
|
{% block title %}
|
||||||
{% trans 'Add New Car' %} {% endblock %}
|
{% trans 'Add New Car' %} {% endblock %}
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<style>
|
<style>
|
||||||
#video {
|
#video {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user