diff --git a/templates/account/signup-wizard.html b/templates/account/signup-wizard.html index 70b17008..09660e40 100644 --- a/templates/account/signup-wizard.html +++ b/templates/account/signup-wizard.html @@ -372,7 +372,11 @@ hideLoading(); const data = await response.json(); if (response.ok) { +<<<<<<< HEAD + notify("success","{% trans 'Account created successfully'%}"); +======= notify("success","Account created successfully"); +>>>>>>> d3dcb85fa378e156b77550e8ab833ad10ffad51f setTimeout(() => { window.location.href = "{% url 'account_login' %}"; }, 1000); diff --git a/templates/dealers/dealer_detail.html b/templates/dealers/dealer_detail.html index 3b8ed928..8c61aa8a 100644 --- a/templates/dealers/dealer_detail.html +++ b/templates/dealers/dealer_detail.html @@ -68,7 +68,7 @@
{% trans 'Total users'|capfirst %}
-

{{ dealer.staff_count }} / {{ allowed_users }}

+

{{ dealer.staff_count }}

{% trans 'Total cars'|capfirst %}
-

{{ cars_count }} / {{ allowed_cars }}

+

{{ cars_count }}

{{ dealer.user.userplan.plan|capfirst }}

{% if dealer.user.userplan and not dealer.user.userplan.is_expired %} - {{ _("Active") }} + {{ _("Active") }} {% elif dealer.user.userplan and dealer.user.userplan.is_expired %} - {{ _("Expired") }} + {{ _("Expired") }} {% else %} - {{ _("No Active Plan") }} + {{ _("No Active Plan") }} {% endif %}

{% if dealer.user.userplan and not dealer.user.userplan.is_expired %} - {% trans 'Active until' %}: {{ dealer.user.userplan.expire }}   {% trans 'Days left' %}: {{ dealer.user.userplan.days_left }} + {% trans 'Active until' %}: {{ dealer.user.userplan.expire }}   {% trans 'Days left' %}: {{ dealer.user.userplan.days_left }} {% else %} - {% trans 'Please subscribe or renew your plan to continue using our services.' %} + {% trans 'Please subscribe or renew your plan to continue using our services.' %} {% endif %}

- {{ dealer.user.userplan.plan.planpricing_set.first.price }} + {{ dealer.user.userplan.plan.planpricing_set.first.price }}

{{ _("Per month") }}
    {% for line in dealer.user.userplan.plan.description|splitlines %} -
  • - - {{ line }} -
    • +
  • + + {{ line }} +
    • {% endfor %}
{% comment %}
{% if dealer.user.userplan.is_expired %} - {{ _("Renew") }} + {{ _("Renew") }} {% endif %} {% if dealer.user.userplan.plan.name != "Enterprise" %} - {{ _("Upgrade Plan") }} + {{ _("Upgrade Plan") }} {% endif %} {% if not dealer.user.userplan %} - {{ _("Subscribe Now") }} + {{ _("Subscribe Now") }} {% endif %}
{% endcomment %}
- {% if not dealer.user.userplan %} - {{ _("Subscribe Now") }} - {% elif dealer.user.userplan.is_expired %} - {{ _("Renew") }} - {% elif dealer.user.userplan.plan.name != "Enterprise" %} - {{ _("Upgrade Plan") }} - {% endif %} + {% if not dealer.user.userplan %} + {{ _("Subscribe Now") }} + {% elif dealer.user.userplan.is_expired %} + {{ _("Renew") }} + {% elif dealer.user.userplan.plan.name != "Enterprise" %} + {{ _("Upgrade Plan") }} + {% endif %}
@@ -221,8 +221,8 @@ aria-valuemax="100">
- {{ _("Used") }}: {{ dealer.staff_count }} - {{ _("Limit") }}: {{ allowed_users }} + {{ _("Used") }}: {{ dealer.staff_count }} +
@@ -236,8 +236,8 @@ aria-valuemax="100">
- {{ _("Used") }}: {{ cars_count }} - {{ _("Limit") }}: {{ allowed_cars }} + {{ _("Used") }}: {{ cars_count }} +
{{ _("Contact support to increase your limits") }} @@ -258,22 +258,22 @@
-
{% trans 'Address' %}
-

{{ dealer.address }}

+
{% trans 'Address' %}
+

{{ dealer.address }}

-
{% trans 'Email' %}
-

{{ dealer.user.email }}

+
{% trans 'Email' %}
+

{{ dealer.user.email }}

-
{% trans 'Phone' %}
-

{{ dealer.phone_number }}

+
{% trans 'Phone' %}
+

{{ dealer.phone_number }}

@@ -285,11 +285,11 @@
{{ _("VAT Information") }}
- {% csrf_token %} - {{ vatform|crispy }} - + {% csrf_token %} + {{ vatform|crispy }} +
@@ -304,21 +304,21 @@
{{ _("Makes you are selling") }}
- {% for make in car_makes %} -
- {% if make.logo %} - {{ make.get_local_name }} - {% endif %} -

{{ make.get_local_name }}

-
- {% empty %} -

{{ _("No car makes selected.") }}

- {% endfor %} + {% for make in car_makes %} +
+ {% if make.logo %} + {{ make.get_local_name }} + {% endif %} +

{{ make.get_local_name }}

+
+ {% empty %} +

{{ _("No car makes selected.") }}

+ {% endfor %}
{{ _("Select Makes") }} @@ -331,4 +331,4 @@
-{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/templates/ledger/reports/car_sale_report.html b/templates/ledger/reports/car_sale_report.html index e184d42d..971a3990 100644 --- a/templates/ledger/reports/car_sale_report.html +++ b/templates/ledger/reports/car_sale_report.html @@ -47,7 +47,7 @@

{% trans 'Report Date' %}: {{ current_time }}

-
+

{% trans 'Filters' %}

@@ -58,7 +58,8 @@ {% for make in makes %} - {% endfor %} + {% endfor %} +
@@ -111,7 +112,26 @@
- + + {% comment %} 'cars_sold': cars_sold, + 'current_time': current_time, + 'dealer': dealer, + 'total_revenue_from_cars': total_revenue_from_cars, + 'total_revenue_from_additonals':total_revenue_from_additonals, + 'total_revenue_collected': total_revenue_collected, + 'total_vat_on_cars':total_vat_on_cars, + 'total_vat_from_additonals':total_vat_from_additonals, + 'total_vat_collected':total_vat_collected, + 'total_discount': total_discount, + 'makes': makes, + 'models': models_qs, + 'series': series, + 'years': years, + 'selected_make': selected_make, + 'selected_model': selected_model, + 'selected_serie': selected_serie, + 'selected_year': selected_year, {% endcomment %} +

{% trans 'Report Summary' %}

@@ -267,13 +287,13 @@ {{ car.discount }} - {{ car.final_price }} + {{ car.final_price }} {{ car.vat_amount|floatformat:2 }} - {{ car.get_additional_services.total|floatformat:2 }} + {{ car.get_additional_services.total|floatformat:2 }} {{ car.get_additional_services.services_vat|floatformat:2 }}