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-06-01 15:48:36 +03:00
commit 4d4a0b8077
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inventory/models.py
View File

@ -1973,7 +1973,7 @@ class Opportunity(models.Model):
self.slug = slugify( self.slug = slugify(
f"opportunity {opportinity_for}" f"opportunity {opportinity_for}"
) )
super(Opportunity, self).save(*args, **kwargs) super().save(*args, **kwargs)
class Meta: class Meta:
verbose_name = _("Opportunity") verbose_name = _("Opportunity")

23
inventory/views.py
View File

@ -5469,16 +5469,14 @@ class OpportunityCreateView(CreateView, SuccessMessageMixin, LoginRequiredMixin)
def form_valid(self, form): def form_valid(self, form):
dealer = get_user_type(self.request) dealer = get_user_type(self.request)
instance = form.save(commit=False) instance = form.save(commit=False)
if self.kwargs.get("slug"): instance.dealer = dealer
lead = models.Lead.objects.get(slug=self.kwargs.get("slug"), dealer=dealer) instance.staff = instance.lead.staff
instance.dealer = dealer instance.save()
instance.staff = lead.staff instance.lead.convert_to_customer()
instance.lead = lead instance.lead.save()
lead.convert_to_customer()
lead.save()
instance.save()
return super().form_valid(form) return super().form_valid(form)
def get_success_url(self): def get_success_url(self):
return reverse_lazy("opportunity_detail", kwargs={"slug": self.object.slug}) return reverse_lazy("opportunity_detail", kwargs={"slug": self.object.slug})
@ -5547,17 +5545,20 @@ class OpportunityDetailView(LoginRequiredMixin, DetailView):
context["lead_notes"] = models.Notes.objects.filter( context["lead_notes"] = models.Notes.objects.filter(
content_type__model="lead", object_id=self.object.id content_type__model="lead", object_id=self.object.id
).order_by("-created") ).order_by("-created")
context["lead_notes"] = models.Notes.objects.filter(
content_type__model="lead", object_id=self.object.lead.id
).order_by("-created")
context["notes"] = models.Notes.objects.filter( context["notes"] = models.Notes.objects.filter(
content_type__model="opportunity", object_id=self.object.id content_type__model="opportunity", object_id=self.object.id
).order_by("-created") ).order_by("-created")
context["lead_activities"] = models.Activity.objects.filter( context["lead_activities"] = models.Activity.objects.filter(
content_type__model="lead", object_id=self.object.id content_type__model="lead", object_id=self.object.lead.id
) )
context["activities"] = models.Activity.objects.filter( context["activities"] = models.Activity.objects.filter(
content_type__model="opportunity", object_id=self.object.id content_type__model="opportunity", object_id=self.object.id
) )
lead_email_qs = models.Email.objects.filter( lead_email_qs = models.Email.objects.filter(
content_type__model="lead", object_id=self.object.id content_type__model="lead", object_id=self.object.lead.id
) )
email_qs = models.Email.objects.filter( email_qs = models.Email.objects.filter(
content_type__model="opportunity", object_id=self.object.id content_type__model="opportunity", object_id=self.object.id
@ -5572,7 +5573,7 @@ class OpportunityDetailView(LoginRequiredMixin, DetailView):
} }
context["staff_task_form"] = forms.StaffTaskForm() context["staff_task_form"] = forms.StaffTaskForm()
context["lead_tasks"] = models.Tasks.objects.filter( context["lead_tasks"] = models.Tasks.objects.filter(
content_type__model="lead", object_id=self.object.id content_type__model="lead", object_id=self.object.lead.id
) )
context["tasks"] = models.Tasks.objects.filter( context["tasks"] = models.Tasks.objects.filter(
content_type__model="opportunity", object_id=self.object.id content_type__model="opportunity", object_id=self.object.id

4
templates/crm/opportunities/opportunity_detail.html
View File

@ -646,7 +646,9 @@
</tr> </tr>
</thead> </thead>
<tbody class="list" id="all-tasks-table-body"> <tbody class="list" id="all-tasks-table-body">
{% for task in lead_tasks %}
{% include "partials/task.html" with task=task content_type="lead" %}
{% endfor %}
{% for task in tasks %} {% for task in tasks %}
{% include "partials/task.html" with task=task content_type="opportunity" %} {% include "partials/task.html" with task=task content_type="opportunity" %}
{% endfor %} {% endfor %}