staff name fields removed

inventory/forms.py

@@ -144,11 +144,10 @@ class StaffForm(forms.ModelForm):
         queryset=CustomGroup.objects.all(),
         required=True,
     )
-    name = forms.CharField(
-        label=_("Full Name"))
+
     class Meta:
         model = Staff
-        fields = ["first_name","last_name","name", "arabic_name", "phone_number", "address", "logo", "group"]
+        fields = ["first_name","last_name", "arabic_name", "phone_number", "address", "logo", "group"]
 
 
 # Dealer Form

inventory/models.py

@@ -1419,7 +1419,7 @@ class StaffTypes(models.TextChoices):
     # AGENT = "agent", _("Agent")
 
 
-class Staff(models.Model, LocalizedNameMixin):
+class Staff(models.Model):
     # staff_member = models.OneToOneField(
     #     StaffMember, on_delete=models.CASCADE, related_name="staff"
     # )
@@ -1429,7 +1429,7 @@ class Staff(models.Model, LocalizedNameMixin):
     dealer = models.ForeignKey(Dealer, on_delete=models.CASCADE, related_name="staff")
     first_name = models.CharField(max_length=255, verbose_name=_("First Name"))
     last_name = models.CharField(max_length=255, verbose_name=_("Last Name"))
-    name = models.CharField(max_length=255, verbose_name=_("Name"))
+
     arabic_name = models.CharField(max_length=255, verbose_name=_("Arabic Name"))
     phone_number = PhoneNumberField(region="SA", verbose_name=_("Phone Number"))
     staff_type = models.CharField(
@@ -1456,7 +1456,7 @@ class Staff(models.Model, LocalizedNameMixin):
 
     def save(self, *args, **kwargs):
         if not self.slug:
-            base_slug = slugify(f"{self.name}")
+            base_slug = slugify(f"{self.first_name}-{self.last_name}")
             self.slug = base_slug
             counter = 1
 
@@ -1471,6 +1471,9 @@ class Staff(models.Model, LocalizedNameMixin):
 
     objects = StaffUserManager()
 
+    @property
+    def fullname(self):
+        return self.first_name + " " + self.last_name
     def deactivate_account(self):
         self.active = False
         self.user.is_active = False
@@ -1530,7 +1533,6 @@ class Staff(models.Model, LocalizedNameMixin):
         verbose_name = _("Staff")
         verbose_name_plural = _("Staff")
         indexes = [
-            models.Index(fields=["name"]),
             models.Index(fields=["staff_type"]),
         ]
         permissions = []
@@ -1542,7 +1544,7 @@ class Staff(models.Model, LocalizedNameMixin):
         ]
 
     def __str__(self):
-        return f"{self.name}"
+        return f"{self.first_name} {self.last_name}"
 
 
 class Sources(models.TextChoices):

inventory/views.py

@@ -3720,7 +3720,7 @@ class UserUpdateView(
 
         staff = form.save(commit=False)
         print(form.cleaned_data)
-        staff.name = form.cleaned_data["name"]
+        # staff.name = form.cleaned_data["name"]
         staff.arabic_name = form.cleaned_data["arabic_name"]
         staff.phone_number = form.cleaned_data["phone_number"]
         for customgroup in form.cleaned_data["group"]:

templates/crm/leads/lead_detail.html

@@ -109,7 +109,7 @@
                                             {% if lead.staff == request.staff %}
                                                 {{ _("Me") }}
                                             {% elif LANGUAGE_CODE == "en" %}
-                                                {{ lead.staff.name|capfirst }}
+                                                {{ lead.staff.fullname|capfirst }}
                                             {% else %}
                                                 {{ lead.staff.arabic_name }}
                                             {% endif %}

templates/crm/leads/lead_list.html

@@ -199,7 +199,7 @@
                                                         {% if lead.staff == request.staff %}
                                                             {{ _("Me") }}
                                                         {% elif LANGUAGE_CODE == "en" %}
-                                                            {{ lead.staff.name|capfirst }}
+                                                            {{ lead.staff.fullname|capfirst }}
                                                         {% else %}
                                                             {{ lead.staff.arabic_name }}
                                                         {% endif %}

templates/crm/opportunities/opportunity_list copy.html

@@ -84,7 +84,7 @@
                                             </div>
                                             <div class="d-flex align-items-center">
                                                 <span class="uil uil-headphones me-2"></span>
-                                                <p class="text-body-secondary fw-bold fs-10 mb-0">{{ opportunity.staff.name }}</p>
+                                                <p class="text-body-secondary fw-bold fs-10 mb-0">{{ opportunity.staff.fullname }}</p>
                                             </div>
                                         </div>
                                         <div class="collapse" id="collapseWidthDeals-1">

templates/crm/opportunities/partials/opportunity_grid.html

@@ -75,7 +75,7 @@
                                                         {% if request.user.email == opportunity.staff.email %}
                                                             {{ _("You") }}
                                                         {% else %}
-                                                            {{ opportunity.staff.name }}
+                                                            {{ opportunity.staff.fullname }}
                                                         </p>
                                                     {% endif %}
                                                 </div>