update

inventory/forms.py

@@ -4,6 +4,8 @@ from django.core.validators import MinLengthValidator
 from django.core.validators import RegexValidator
 from django import forms
 from django.contrib.auth import get_user_model
+from phonenumber_field.phonenumber import PhoneNumber
+
 from .mixins import AddClassMixin
 from django.forms.models import inlineformset_factory
 from .models import (
@@ -29,7 +31,7 @@ from .models import (
     Opportunity, Priority, Sources,
 )
 from django_ledger.models import ItemModel, InvoiceModel
-from django.forms import ModelMultipleChoiceField, ValidationError
+from django.forms import ModelMultipleChoiceField, ValidationError, DateInput
 from django.utils.translation import gettext_lazy as _
 import django_tables2 as tables
 from django.forms import formset_factory
@@ -62,21 +64,21 @@ class StaffForm(forms.ModelForm):
         model = Staff
         fields = ["name", "arabic_name", "phone_number", "staff_type"]
 
-    # def __init__(self, *args, **kwargs):
-    #     user_instance = kwargs.get("instance")
-    #     if user_instance and user_instance.user:
-    #         initial = kwargs.setdefault("initial", {})
-    #         initial["email"] = user_instance.user.email
-    #     super().__init__(*args, **kwargs)
-    #
-    # def save(self, commit=True):
-    #     user_instance = super().save(commit=False)
-    #     user = user_instance.user
-    #     user.email = self.cleaned_data["email"]
-    #     if commit:
-    #         user.save()
-    #         user_instance.save()
-    #     return user_instance
+    def __init__(self, *args, **kwargs):
+        user_instance = kwargs.get("instance")
+        if user_instance and user_instance.user:
+            initial = kwargs.setdefault("initial", {})
+            initial["email"] = user_instance.user.email
+        super().__init__(*args, **kwargs)
+
+    def save(self, commit=True):
+        user_instance = super().save(commit=False)
+        user = user_instance.user
+        user.email = self.cleaned_data["email"]
+        if commit:
+            user.save()
+            user_instance.save()
+        return user_instance
 
 
 # Dealer Form
@@ -99,16 +101,23 @@ class CustomerForm(forms.ModelForm, AddClassMixin):
     class Meta:
         model = Customer
         fields = [
+            "title",
             "first_name",
             "middle_name",
             "last_name",
+            "gender",
+            "dob",
             "email",
             "national_id",
+            "city",
             "phone_number",
             "address",
-            "country"
         ]
-        widgets = {"country": CountrySelectWidget()}
+        widgets = {
+            "phone_number": forms.TextInput(attrs={"class": "phone"}),
+            "dob": forms.DateInput(attrs={"type": "date"}),
+        }
+
 
 
 class CarForm(

inventory/migrations/0010_customer_staff.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.1.4 on 2025-01-09 11:36
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inventory', '0009_alter_staff_managers'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='customer',
+            name='staff',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='customer_staff', to='inventory.staff', verbose_name='Staff'),
+        ),
+    ]

inventory/migrations/0011_remove_customer_country_customer_city.py

@@ -0,0 +1,22 @@
+# Generated by Django 5.1.4 on 2025-01-09 20:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inventory', '0010_customer_staff'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='customer',
+            name='country',
+        ),
+        migrations.AddField(
+            model_name='customer',
+            name='city',
+            field=models.CharField(blank=True, max_length=255, verbose_name='City'),
+        ),
+    ]

inventory/models.py

@@ -824,6 +824,8 @@ class Customer(models.Model):
     lead = models.OneToOneField(Lead, on_delete=models.SET_NULL, null=True, blank=True,
                                 related_name="converted", verbose_name=_("Lead"))
     dealer = models.ForeignKey(Dealer, on_delete=models.CASCADE,related_name="customers")
+    staff = models.ForeignKey(Staff, on_delete=models.SET_NULL, null=True, related_name="customer_staff",
+                              verbose_name=_("Staff"))
     title = models.CharField(choices=Title.choices, default=Title.NA, max_length=10, verbose_name=_("Title"))
     first_name = models.CharField(max_length=50, verbose_name=_("First Name"))
     middle_name = models.CharField(max_length=50, blank=True, null=True, verbose_name=_("Middle Name"))
@@ -832,8 +834,8 @@ class Customer(models.Model):
     dob = models.DateField(verbose_name=_("Date of Birth"))
     email = models.EmailField(unique=True, verbose_name=_("Email"))
     national_id = models.CharField(max_length=10, unique=True, verbose_name=_("National ID"))
-    country = CountryField(blank=True, verbose_name=_("Country"))
     phone_number = PhoneNumberField(region="SA", unique=True, verbose_name=_("Phone Number"))
+    city = models.CharField(max_length=255, blank=True, verbose_name=_("City"))
     address = models.CharField(max_length=200, blank=True, null=True, verbose_name=_("Address"))
     created = models.DateTimeField(auto_now_add=True, verbose_name=_("Created"))
     updated = models.DateTimeField(auto_now=True, verbose_name=_("Updated"))