diff --git a/inventory/forms.py b/inventory/forms.py index 89dfe772..0cd2e589 100644 --- a/inventory/forms.py +++ b/inventory/forms.py @@ -177,7 +177,7 @@ class DealerForm(forms.ModelForm): """ - phone_number = SaudiPhoneNumberField(label=_("Phone Number")) + # phone_number = SaudiPhoneNumberField(label=_("Phone Number")) class Meta: model = Dealer @@ -193,7 +193,7 @@ class DealerForm(forms.ModelForm): class CustomerForm(forms.ModelForm): - phone_number = SaudiPhoneNumberField(label=_("Phone Number")) + # phone_number = SaudiPhoneNumberField(label=_("Phone Number")) class Meta: model = Customer @@ -563,7 +563,7 @@ class VendorForm(forms.ModelForm): :type Meta: Type[VendorForm.Meta] """ - phone_number = SaudiPhoneNumberField(label=_("Phone Number")) + # phone_number = SaudiPhoneNumberField(label=_("Phone Number")) contact_person = forms.CharField(label=_("Contact Person")) class Meta: @@ -652,7 +652,7 @@ class RepresentativeForm(forms.ModelForm): :type Meta.fields: list of str """ - phone_number = SaudiPhoneNumberField(label=_("Phone Number")) + # phone_number = SaudiPhoneNumberField(label=_("Phone Number")) class Meta: model = Representative @@ -1077,7 +1077,7 @@ class LeadForm(forms.ModelForm): :type id_car_model: ModelChoiceField """ - phone_number = SaudiPhoneNumberField(label=_("Phone Number")) + # phone_number = SaudiPhoneNumberField(label=_("Phone Number")) # email = forms.EmailField( # label=_("Email"), diff --git a/inventory/models.py b/inventory/models.py index b31b9d5f..761de267 100644 --- a/inventory/models.py +++ b/inventory/models.py @@ -1980,7 +1980,7 @@ class Lead(models.Model): first_name = models.CharField(max_length=50, verbose_name=_("First Name")) last_name = models.CharField(max_length=50, verbose_name=_("Last Name")) email = models.EmailField(verbose_name=_("Email")) - phone_number = models.CharField(max_length=255, verbose_name=_("Phone Number"),validators=[SaudiPhoneNumberValidator]) + phone_number = models.CharField(max_length=255, verbose_name=_("Phone Number"),validators=[SaudiPhoneNumberValidator()]) address = models.CharField( max_length=200, blank=True, null=True, verbose_name=_("Address") ) diff --git a/inventory/validators.py b/inventory/validators.py index 68a95412..4c7a0191 100644 --- a/inventory/validators.py +++ b/inventory/validators.py @@ -3,8 +3,8 @@ from django.utils.translation import gettext_lazy as _ class SaudiPhoneNumberValidator(RegexValidator): - def __init__(self): + def __init__(self, *args, **kwargs): super().__init__( regex=r"^(\+9665|05)[0-9]{8}$", message=_("Enter a valid Saudi phone number (05XXXXXXXX or +9665XXXXXXXX)"), - ) + ) \ No newline at end of file diff --git a/templates/dashboards/aging_inventory_list.html b/templates/dashboards/aging_inventory_list.html index f2619a01..01097a10 100644 --- a/templates/dashboards/aging_inventory_list.html +++ b/templates/dashboards/aging_inventory_list.html @@ -8,7 +8,7 @@ {% trans "Aging Inventory" %} -

{% trans "Aging Inventory Total" %} :: {{total_aging_inventory_value}}

+

{% trans "Aging Inventory Total" %} :: {{total_aging_inventory_value|default:0.00}}

{% trans "Cars in inventory for more than 60 days." %}