diff --git a/inventory/forms.py b/inventory/forms.py index 35d6e9c6..79d2889e 100644 --- a/inventory/forms.py +++ b/inventory/forms.py @@ -737,6 +737,7 @@ class LeadForm(forms.ModelForm): "last_name", "email", "phone_number", + "lead_type", "address", "id_car_make", "id_car_model", diff --git a/inventory/migrations/0052_lead_lead_type.py b/inventory/migrations/0052_lead_lead_type.py new file mode 100644 index 00000000..e0d79b3c --- /dev/null +++ b/inventory/migrations/0052_lead_lead_type.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.17 on 2025-02-27 15:48 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('inventory', '0051_merge_20250226_1654'), + ] + + operations = [ + migrations.AddField( + model_name='lead', + name='lead_type', + field=models.CharField(choices=[('customer', 'Customer'), ('organization', 'Organization')], default='customer', max_length=50, verbose_name='Lead Type'), + ), + ] diff --git a/inventory/models.py b/inventory/models.py index 7459d2b6..78492a91 100644 --- a/inventory/models.py +++ b/inventory/models.py @@ -1164,6 +1164,9 @@ class Lead(models.Model): last_name = models.CharField(max_length=50, verbose_name=_("Last Name")) email = models.EmailField(verbose_name=_("Email")) phone_number = PhoneNumberField(region="SA", verbose_name=_("Phone Number")) + lead_type = models.CharField( + max_length=50, choices=[("customer", _("Customer")), ("organization", _("Organization"))], verbose_name=_("Lead Type") + ,default="customer") customer = models.ForeignKey( CustomerModel, on_delete=models.CASCADE, related_name="leads", null=True,blank=True diff --git a/inventory/views.py b/inventory/views.py index ecaeab8f..87d07ad4 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -2847,7 +2847,6 @@ def schedule_lead(request, pk): messages.error(request, "You do not have permission to schedule lead.") return redirect("lead_list") dealer = get_user_type(request) - lead = get_object_or_404(models.Lead, pk=pk, dealer=dealer) if request.method == "POST": form = forms.ScheduleForm(request.POST) diff --git a/templates/customers/customer_list.html b/templates/customers/customer_list.html index cd7bc7a7..355a9469 100644 --- a/templates/customers/customer_list.html +++ b/templates/customers/customer_list.html @@ -18,7 +18,6 @@
{% include 'partials/search_box.html' %} -
@@ -61,7 +60,6 @@ - {% for customer in customers %} @@ -94,22 +92,19 @@ - - - {% endfor %} + data-url="{% url 'customer_delete' customer.pk %}" + data-message="Are you sure you want to delete this customer?" + data-bs-toggle="modal" data-bs-target="#deleteModal"> + + + + + {% endfor %} {% endif %} - - {% include 'partials/pagination.html' %} - + {% include 'partials/pagination.html' %} -{% include 'modal/delete_modal.html' %} - + {% include 'modal/delete_modal.html' %} {% endblock %} \ No newline at end of file diff --git a/templates/header.html b/templates/header.html index 99976147..b244d786 100644 --- a/templates/header.html +++ b/templates/header.html @@ -275,8 +275,8 @@
- {% if request.user.is_authenticated and request.user.dealer %} + {% if request.user.is_authenticated and request.is_dealer %} {% else %} @@ -294,7 +294,7 @@ {% trans 'Cash Flow'|capfirst %} - {% if request.user.is_authenticated and request.user.dealer %} + {% if request.user.is_authenticated and request.is_dealer %} {% else %} @@ -303,7 +303,7 @@ {% trans 'Income Statement'|capfirst %} - {% if request.user.is_authenticated and request.user.dealer %} + {% if request.user.is_authenticated and request.is_dealer %} {% else %} diff --git a/templates/sales/orders/order_list.html b/templates/sales/orders/order_list.html index e0532a5e..67d4e2bb 100644 --- a/templates/sales/orders/order_list.html +++ b/templates/sales/orders/order_list.html @@ -21,7 +21,6 @@ {% for order in orders %} - {{ order.id }} {{ order.formatted_order_id }} {{ order.estimate.customer.customer_name }} @@ -34,7 +33,7 @@ class="btn btn-sm btn-phoenix-success"> {% trans "view"|capfirst %} {% endcomment %} - + {% empty %}