diff --git a/inventory/models.py b/inventory/models.py index 112dbd0a..a3986995 100644 --- a/inventory/models.py +++ b/inventory/models.py @@ -1711,8 +1711,11 @@ class Customer(models.Model): national_id = models.CharField( max_length=10, unique=True, verbose_name=_("National ID"), null=True, blank=True ) - phone_number = PhoneNumberField( - region="SA", unique=True, verbose_name=_("Phone Number") + + 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") @@ -1723,7 +1726,7 @@ class Customer(models.Model): blank=True, null=True, verbose_name=_("Image"), - default="default-image/user-jpg", + default="default-image/user.jpg", ) thumbnail = ImageSpecField( source="image", diff --git a/static/images/customers/Gemini_Generated_Image_wf3w0uwf3w0uwf3w.png b/static/images/customers/Gemini_Generated_Image_wf3w0uwf3w0uwf3w.png new file mode 100644 index 00000000..0b4f99a9 Binary files /dev/null and b/static/images/customers/Gemini_Generated_Image_wf3w0uwf3w0uwf3w.png differ diff --git a/templates/account/password_reset_from_key.html b/templates/account/password_reset_from_key.html index 3b18129c..9109f8c8 100644 --- a/templates/account/password_reset_from_key.html +++ b/templates/account/password_reset_from_key.html @@ -36,7 +36,7 @@ {% if token_fail %} {% url 'account_reset_password' as passwd_reset_url %}

- {% trans "The password reset link was invalid, possibly because it has already been used. Please request a" %} {% trans "new password reset." %}{% endblocktrans %} + {% trans "The password reset link was invalid, possibly because it has already been used. Please request a" %} {% trans "new password reset." %}

{% else %}
diff --git a/templates/account/password_reset_from_key_done.html b/templates/account/password_reset_from_key_done.html index ade439b6..dff3b6b9 100644 --- a/templates/account/password_reset_from_key_done.html +++ b/templates/account/password_reset_from_key_done.html @@ -26,8 +26,9 @@

{% trans "Change Password" %}

- {% trans 'Your password is now changed.' %} + {% trans 'Congratulations, Your password is now changed.' %}

+

{% trans 'Click here to Login'%}

diff --git a/templates/dashboards/general_dashboard.html b/templates/dashboards/general_dashboard.html index 58e70557..03f2fa3a 100644 --- a/templates/dashboards/general_dashboard.html +++ b/templates/dashboards/general_dashboard.html @@ -10,12 +10,12 @@

{% if request.is_dealer %} {% trans "Business Health Dashboard" %} - {% elif request.is_manger %} - {% trans "Manager Dashboard" %} - {% elif request.is_inventory %} + {% elif request.is_accountant and not request.is_dealer and not request.is_manager %} + {% trans "Accountant Dashboard" %} + {% elif request.is_inventory and not request.is_dealer and not request.is_manager %} {% trans "Inventory Dashboard" %} {% else %} - {% trans "Accountant Dashboard" %} + {% trans "Manager Dashboard" %} {% endif %}

@@ -49,9 +49,10 @@
{% include 'dashboards/partials//financial_data_cards.html' %}
{% include 'dashboards/partials/chart.html' %}
- + {% endblock content %} {% block customJS %} + {% endblock %} diff --git a/templates/dashboards/partials/chart.html b/templates/dashboards/partials/chart.html index 3d997c3b..a093f4fc 100644 --- a/templates/dashboards/partials/chart.html +++ b/templates/dashboards/partials/chart.html @@ -60,6 +60,7 @@ +
{%if selected_make_sales%} @@ -70,7 +71,6 @@

{% trans "Please Select a Make from above to see the Statistics" %}

- {% endif %} @@ -108,6 +108,9 @@ + + + {%if selected_make_inventory%} @@ -118,9 +121,9 @@

{% trans "Please Select a Make from above to see the Statistics" %}

- {% endif %} {% endif %} + \ No newline at end of file diff --git a/templates/purchase_orders/po_list.html b/templates/purchase_orders/po_list.html index 113cfceb..c75e7536 100644 --- a/templates/purchase_orders/po_list.html +++ b/templates/purchase_orders/po_list.html @@ -92,7 +92,7 @@ {% endif %} {% else %} {% endif %}