commit before the pull
This commit is contained in:
parent
e7e46511dd
commit
966e682d1d
@ -443,7 +443,7 @@ urlpatterns = [
|
||||
path(
|
||||
"<slug:dealer_slug>/inventory/<slug:entity_slug>/list/",
|
||||
views.InventoryListView.as_view(),
|
||||
name="inventort_list",
|
||||
name="inventory_list",
|
||||
),
|
||||
# Sales URLs quotation_create
|
||||
# path(
|
||||
|
||||
@ -10617,10 +10617,12 @@ class PurchaseOrderListView(LoginRequiredMixin, PermissionRequiredMixin, ListVie
|
||||
query = self.request.GET.get("q")
|
||||
qs = self.model.objects.filter(entity=dealer.entity)
|
||||
if query:
|
||||
qs = apply_search_filters(qs, query)
|
||||
qs=qs.filter(Q(po_number__icontains=query)|Q(po_status__icontains=query)|Q(po_title__icontains=query))
|
||||
return qs
|
||||
return qs
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
dealer = get_user_type(self.request)
|
||||
vendors=models.Vendor.objects.filter(dealer=dealer)
|
||||
context = super().get_context_data(**kwargs)
|
||||
|
||||
@ -58,7 +58,7 @@ def run():
|
||||
visible=True,
|
||||
order=1,
|
||||
)
|
||||
basic_plan.quotas.add(basic_quota)
|
||||
basic_plan.quotas.add(basic_quota,free_quota)
|
||||
|
||||
pro_plan = Plan.objects.create(
|
||||
name="Professional",
|
||||
@ -69,7 +69,7 @@ def run():
|
||||
visible=True,
|
||||
# order=2
|
||||
)
|
||||
pro_plan.quotas.add(basic_quota, pro_quota)
|
||||
pro_plan.quotas.add(free_quota,basic_quota, pro_quota)
|
||||
|
||||
premium_plan = Plan.objects.create(
|
||||
name="Premium",
|
||||
@ -80,4 +80,4 @@ def run():
|
||||
visible=True,
|
||||
order=3,
|
||||
)
|
||||
premium_plan.quotas.add(basic_quota, pro_quota, premium_quota)
|
||||
premium_plan.quotas.add(free_quota,basic_quota, pro_quota, premium_quota)
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
<ul class="navbar-nav flex-column" id="navbarVerticalNav" hx-boost="true" hx-target="#main_content" hx-select="#main_content" hx-swap="outerHTML" hx-select-oob="#toast-container" hx-indicator="#spinner">
|
||||
<li class="nav-item">
|
||||
<p class="navbar-vertical-label text-primary fs-8 text-truncate">{{request.dealer|default:"Apps"}}</p>
|
||||
<hr class="navbar-vertical-line" />
|
||||
<hr class="navbar-vertical-line">
|
||||
{% if perms.inventory.can_view_inventory %}
|
||||
<div class="nav-item-wrapper">
|
||||
<a id="inventory-nav" class="nav-link dropdown-indicator label-1 inventory-nav" href="#nv-inventory" role="button" data-bs-toggle="collapse" aria-expanded="false" aria-controls="nv-inventory">
|
||||
@ -26,7 +26,7 @@
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
</li>
|
||||
|
||||
{% endif %}
|
||||
|
||||
{% if perms.inventory.view_car%}
|
||||
@ -64,7 +64,7 @@
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{% url 'inventort_list' request.dealer.slug request.dealer.entity.slug %}">
|
||||
<a class="nav-link" href="{% url 'inventory_list' request.dealer.slug request.dealer.entity.slug %}">
|
||||
<div class="d-flex align-items-center">
|
||||
<span class="nav-link-icon"><span class="fas fa-boxes"></span></span><span class="nav-link-text">{% trans "Inventory List"|capfirst %}</span>
|
||||
</div>
|
||||
@ -129,7 +129,6 @@
|
||||
<span class="nav-link-icon"><span class="fas fa-city"></span></span><span class="nav-link-text">{% trans "Organizations"|capfirst %}</span>
|
||||
</div>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
{% endif %}
|
||||
{% comment %} <li class="nav-item">
|
||||
@ -434,12 +433,18 @@
|
||||
</a>
|
||||
</div>
|
||||
{% if request.user.is_authenticated%}
|
||||
<div class="d-flex mx-4 px-4">
|
||||
|
||||
<div class="navbar-logo">
|
||||
<div class="d-flex align-items-center">
|
||||
<h5 class="text-warning ms-2 d-none d-sm-block">{% trans 'Hello, ' %}{{ request.user.first_name|default:request.dealer.name }} {{ request.user.last_name }}</h5>
|
||||
{% with name_to_display=request.user.first_name|default:request.dealer.name %}
|
||||
<h6 class="text-info ms-2 d-none d-sm-block fs-7"
|
||||
data-bs-toggle="tooltip"
|
||||
data-bs-placement="bottom"
|
||||
title="{% trans 'Logged in as ' %}{{request.user.username }}">
|
||||
{% trans 'Hello, ' %}{{ name_to_display }}
|
||||
</h6>
|
||||
{% endwith %}
|
||||
</div>
|
||||
</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
|
||||
@ -36,8 +36,26 @@
|
||||
<td class="align-middle product white-space-nowrap">
|
||||
{% if perms.django_ledger.change_itemmodel %}
|
||||
|
||||
<a href="{% url 'item_expense_update' request.dealer.slug expense.pk %}"
|
||||
class="btn btn-sm btn-phoenix-primary"><li class="fa fa-edit me-1"></li>{% trans "Update" %}</a>
|
||||
<div class="btn-reveal-trigger position-static">
|
||||
<button class="btn btn-sm dropdown-toggle dropdown-caret-none transition-none btn-reveal fs-10"
|
||||
type="button"
|
||||
data-bs-toggle="dropdown"
|
||||
data-boundary="window"
|
||||
aria-haspopup="true"
|
||||
aria-expanded="false"
|
||||
data-bs-reference="parent">
|
||||
<span class="fas fa-ellipsis-h fs-10"></span>
|
||||
</button>
|
||||
<div class="dropdown-menu dropdown-menu-end py-2">
|
||||
|
||||
<a class="dropdown-item" href="{% url 'item_expense_update' request.dealer.slug expense.pk %}" >
|
||||
<i class="fa fa-edit me-2"></i>{% trans "Update" %}
|
||||
</a>
|
||||
<a class="text-danger dropdown-item" href="#" >
|
||||
<i class="fa fa-trash me-2"></i>{% trans "Delete" %}
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
</td>
|
||||
|
||||
|
||||
@ -38,8 +38,28 @@
|
||||
<td class="align-middle product white-space-nowrap">{{ service.item.co }}</td>
|
||||
<td class="align-middle white-space-nowrap text-start">
|
||||
{% if perms.inventory.add_additionalservices %}
|
||||
<a href="{% url 'item_service_update' request.dealer.slug service.pk %}"
|
||||
class="btn btn-sm btn-phoenix-primary"><li class="fa fa-edit me-1"></li>{% trans "Update" %}</a>
|
||||
|
||||
|
||||
<div class="btn-reveal-trigger position-static">
|
||||
<button class="btn btn-sm dropdown-toggle dropdown-caret-none transition-none btn-reveal fs-10"
|
||||
type="button"
|
||||
data-bs-toggle="dropdown"
|
||||
data-boundary="window"
|
||||
aria-haspopup="true"
|
||||
aria-expanded="false"
|
||||
data-bs-reference="parent">
|
||||
<span class="fas fa-ellipsis-h fs-10"></span>
|
||||
</button>
|
||||
<div class="dropdown-menu dropdown-menu-end py-2">
|
||||
|
||||
<a class="dropdown-item" href="{% url 'item_service_update' request.dealer.slug service.pk %}" >
|
||||
<i class="fa fa-edit me-2"></i>{% trans "Update" %}
|
||||
</a>
|
||||
<a class="text-danger dropdown-item" href="#" >
|
||||
<i class="fa fa-trash me-2"></i>{% trans "Delete" %}
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@ -11,19 +11,18 @@
|
||||
{% if messages %}
|
||||
{% for message in messages %}<div class="alert alert-success">{{ message }}</div>{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
|
||||
<div class="row g-3 justify-content-between mb-4">
|
||||
<div class="d-flex justify-content-between mb-2">
|
||||
<h2 class="">
|
||||
{{ _("Purchase Orders") |capfirst }} <li class="fas fa-cart-plus text-primary ms-2"></li>
|
||||
</h2>
|
||||
|
||||
<div class="row g-3 justify-content-between mb-4">
|
||||
<div class="col-auto">
|
||||
<div class="d-md-flex justify-content-between">
|
||||
{% if perms.django_ledger.add_purchaseordermodel %}
|
||||
<a href="{% url 'purchase_order_create' request.dealer.slug request.dealer.entity.slug %}"
|
||||
class="btn btn-md btn-phoenix-primary"><i class="fa fa-plus me-2"></i>{{ _("Create New PO") }}</a>
|
||||
class="btn btn-md btn-phoenix-primary"><i class="fa fa-plus me-2"></i>{{ _("Create New Purchase") }}</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-auto">
|
||||
<div class="d-flex">
|
||||
{% include 'partials/search_box.html' %}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user