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

Merge branch 'main' of http://10.10.1.136:3000/ismail/haikal into frontend

Browse Source
This commit is contained in:
Faheedkhan 2025-07-02 16:51:03 +03:00
commit 64e4f225ca
1 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
inventory/views.py
View File

@ -4256,25 +4256,6 @@ def create_estimate(request, dealer_slug, slug=None):
] ]
items_txs = [] items_txs = []
for item in items_list: for item in items_list:
# car_instance = ItemModel.objects.filter(
# additional_info__car_info__hash=item.get("item_id")
# ).all()
# for i in car_instance[: int(quantities[0])]:
# items_txs.append(
# {
# "item_number": i.item_number,
# "quantity": 1,
# "unit_cost": i.additional_info.get("car_finance").get(
# "selling_price"
# ),
# "unit_revenue": i.additional_info.get("car_finance").get(
# "selling_price"
# ),
# "total_amount": (
# i.additional_info.get("car_finance").get("total_vat")
# ),
# }
# )
car_instance = models.Car.objects.filter( car_instance = models.Car.objects.filter(
hash=item.get("item_id"), hash=item.get("item_id"),
finances__is_sold=False, finances__is_sold=False,
@ -4349,6 +4330,16 @@ def create_estimate(request, dealer_slug, slug=None):
opportunity.estimate = estimate opportunity.estimate = estimate
opportunity.save() opportunity.save()
# models.ExtraInfo.objects.create(
# content_object=estimate,
# data={
# "customer": {
# "name": customer.name,
# "phone": customer.phone,
# "email": customer.email,
# }
# },
# )
url = reverse( url = reverse(
"estimate_detail", kwargs={"dealer_slug": dealer.slug, "pk": estimate.pk} "estimate_detail", kwargs={"dealer_slug": dealer.slug, "pk": estimate.pk}
) )
@ -5361,8 +5352,8 @@ class LeadListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
permission_required = ["inventory.view_lead"] permission_required = ["inventory.view_lead"]
def get_queryset(self): def get_queryset(self):
dealer = get_object_or_404(models.Dealer, slug=self.kwargs["dealer_slug"])
query = self.request.GET.get("q") query = self.request.GET.get("q")
dealer = get_user_type(self.request)
qs = models.Lead.objects.filter(dealer=dealer).exclude(status="converted") qs = models.Lead.objects.filter(dealer=dealer).exclude(status="converted")
if query: if query:
qs = apply_search_filters(qs, query) qs = apply_search_filters(qs, query)
@ -5533,10 +5524,7 @@ def lead_create(request,dealer_slug):
) )
form.fields["staff"].queryset = form.fields["staff"].queryset.filter( form.fields["staff"].queryset = form.fields["staff"].queryset.filter(
dealer=dealer,staff_member__user__groups__permissions__codename__contains="add_lead") dealer=dealer,staff_member__user__groups__permissions__codename__contains="add_lead")
# form.fields["staff"].queryset = form.fields["staff"].queryset.filter(
# dealer=dealer
# )
print(form.fields["staff"].queryset)
if hasattr(request.user.staffmember, "staff"): if hasattr(request.user.staffmember, "staff"):
form.initial["staff"] = request.user.staffmember.staff form.initial["staff"] = request.user.staffmember.staff
@ -5553,13 +5541,18 @@ def lead_create(request,dealer_slug):
@permission_required("inventory.view_lead", raise_exception=True) @permission_required("inventory.view_lead", raise_exception=True)
def lead_tracking(request,dealer_slug): def lead_tracking(request,dealer_slug):
dealer = get_object_or_404(models.Dealer,slug=dealer_slug) dealer = get_object_or_404(models.Dealer,slug=dealer_slug)
new = models.Lead.objects.filter(dealer=dealer, status="new") staff = models.Staff.objects.filter(dealer=dealer, staff_member__user=request.user).first()
follow_up = models.Lead.objects.filter( if staff:
dealer=dealer, next_action__in=["call", "meeting"] qs = models.Lead.objects.filter(dealer=dealer,staff=staff).exclude(status="converted")
) else:
won = models.Lead.objects.filter(dealer=dealer, status="won") qs = models.Lead.objects.filter(dealer=dealer).exclude(status="converted")
lose = models.Lead.objects.filter(dealer=dealer, status="lost")
negotiation = models.Lead.objects.filter(dealer=dealer, status="negotiation") won = qs.filter(status="won")
new = qs.filter(status="new")
lose = qs.filter(status="lose")
negotiation = qs.filter(status="negotiation")
follow_up = qs.filter(next_action__in=["call", "meeting"])
context = { context = {
"new": new, "new": new,
"follow_up": follow_up, "follow_up": follow_up,