diff --git a/inventory/models.py b/inventory/models.py index 9e43c3c1..99b67cc1 100644 --- a/inventory/models.py +++ b/inventory/models.py @@ -223,7 +223,7 @@ class CarMake(models.Model, LocalizedNameMixin): name = models.CharField(max_length=255, blank=True, null=True) slug = models.SlugField(max_length=255, unique=True, blank=True, null=True) arabic_name = models.CharField(max_length=255, blank=True, null=True) - logo = models.ImageField(_("logo"), upload_to="car_make", blank=True, null=True,default="user-logo.png") + logo = models.ImageField(_("logo"), upload_to="car_make", blank=True, null=True,default="user-logo.jpg") is_sa_import = models.BooleanField(default=False) car_type = models.SmallIntegerField(choices=CarType.choices, blank=True, null=True) @@ -593,7 +593,7 @@ class AdditionalServices(models.Model, LocalizedNameMixin): class Car(Base): - + item_model = models.OneToOneField( ItemModel, models.DO_NOTHING, @@ -1288,7 +1288,7 @@ class Staff(models.Model, LocalizedNameMixin): max_length=200, blank=True, null=True, verbose_name=_("Address") ) logo = models.ImageField( - upload_to="logos/staff", blank=True, null=True, verbose_name=_("Image"),default="user-logo.png" + upload_to="logos/staff", blank=True, null=True, verbose_name=_("Image"),default="user-logo.jpg" ) thumbnail = ImageSpecField( source="logo", @@ -1661,7 +1661,7 @@ class Organization(models.Model, LocalizedNameMixin): max_length=200, blank=True, null=True, verbose_name=_("Address") ) logo = models.ImageField( - upload_to="logos", blank=True, null=True, verbose_name=_("Logo"),default="user-logo.png" + upload_to="logos", blank=True, null=True, verbose_name=_("Logo"),default="user-logo.jpg" ) thumbnail = ImageSpecField( source="logo", @@ -2481,7 +2481,7 @@ class Vendor(models.Model, LocalizedNameMixin): email = models.EmailField(max_length=255, verbose_name=_("Email Address")) address = models.CharField(max_length=200, verbose_name=_("Address")) logo = models.ImageField( - upload_to="logos/vendors", blank=True, null=True, verbose_name=_("Logo"),default="user-logo.png" + upload_to="logos/vendors", blank=True, null=True, verbose_name=_("Logo"),default="user-logo.jpg" ) thumbnail = ImageSpecField( source="logo", diff --git a/static/images/logos/no-content-new.jpg b/static/images/logos/no-content-new.jpg index e71780d9..84e4b140 100644 Binary files a/static/images/logos/no-content-new.jpg and b/static/images/logos/no-content-new.jpg differ diff --git a/static/images/logos/no-content-new1.jpg b/static/images/logos/no-content-new1.jpg new file mode 100644 index 00000000..e71780d9 Binary files /dev/null and b/static/images/logos/no-content-new1.jpg differ diff --git a/static/images/logos/no-content-new2.jpg b/static/images/logos/no-content-new2.jpg new file mode 100644 index 00000000..0545ec71 Binary files /dev/null and b/static/images/logos/no-content-new2.jpg differ diff --git a/static/user-logo.jpg b/static/user-logo.jpg new file mode 100644 index 00000000..bb7e4923 Binary files /dev/null and b/static/user-logo.jpg differ diff --git a/templates/account/signup-wizard-copy.html b/templates/account/signup-wizard-nkp.html similarity index 50% rename from templates/account/signup-wizard-copy.html rename to templates/account/signup-wizard-nkp.html index 5c33c76e..52dac1a7 100644 --- a/templates/account/signup-wizard-copy.html +++ b/templates/account/signup-wizard-nkp.html @@ -3,7 +3,7 @@ {% load i18n static %} {% block content %}
-
+
{% trans 'Sign Up' %}

{% trans 'Create your account today' %}

-
+
    @@ -84,7 +86,7 @@
-
+
- {{ form1|crispy }} - {{ _("Read Terms of Service and Privacy Policy") }} + data-wizard-form="1" + data-ref-f1> +
+ + +
{% trans "Please enter a valid email address" %}
+
+
+ + +
+ {% trans "Password does not match. or length is less than 8 characters." %} +
+
+
+ + * + +
+ {% trans "Password does not match. or length is less than 8 characters." %} +
+
- {{ form2|crispy }} + data-wizard-form="2" + data-ref-f2> +
+ + +
+
+ + +
+
+ + * + +
{% trans "Please enter a valid phone number" %}
+
- {{ form3|crispy }} + data-wizard-form="3" + data-ref-f3> +
+ + +
+
+ + +
+
+ + +
{% trans 'anytime' %} {% trans 'anywhere' %}

- +
-
-
@@ -177,160 +288,36 @@ {% endblock content %} {% block customJS %} - + + + {% endblock customJS %} diff --git a/templates/account/signup-wizard.html b/templates/account/signup-wizard.html index 52dac1a7..ef2e8791 100644 --- a/templates/account/signup-wizard.html +++ b/templates/account/signup-wizard.html @@ -307,7 +307,7 @@ return true } function validate_sa_phone_number(phone_number) { - const phone_numberRegex = /^056[0-9]{7}$/; + const phone_numberRegex = /^05[0-9]{8}$/; return phone_numberRegex.test(phone_number) && phone_numberRegex !== ''; } function getAllFormData() { diff --git a/templates/base.html b/templates/base.html index c6d79f45..7f6b4995 100644 --- a/templates/base.html +++ b/templates/base.html @@ -66,7 +66,7 @@ rel="stylesheet" id="user-style-default"> {% endif %} - + @@ -83,7 +83,7 @@ {% include "plans/expiration_messages.html" %} {% block period_navigation %} {% endblock period_navigation %} -
+
diff --git a/templates/empty-illustration-page.html b/templates/empty-illustration-page.html index 1e305b2e..e9bc7315 100644 --- a/templates/empty-illustration-page.html +++ b/templates/empty-illustration-page.html @@ -1,18 +1,18 @@ {% load static %} - +{% load i18n %}