From e2528f5ad7724247051f33cac8ffdaf304f65dc1 Mon Sep 17 00:00:00 2001 From: Marwan Alwali Date: Sun, 26 Jan 2025 16:58:49 +0300 Subject: [PATCH] update --- .../__pycache__/settings.cpython-311.pyc | Bin 7358 -> 7358 bytes templates/plans/current.html | 78 +++--- templates/plans/plan_table.html | 227 ++++++++---------- .../subscriptions/subscription_plan.html | 2 +- 4 files changed, 155 insertions(+), 152 deletions(-) diff --git a/car_inventory/__pycache__/settings.cpython-311.pyc b/car_inventory/__pycache__/settings.cpython-311.pyc index 599aa15d1e40d00ef894ac23e117f2251983d073..81c8ff388d77d30d5b61a1a7e4c1dd8ac2a7ca17 100644 GIT binary patch delta 29 jcmdmIxzCb!IWI340}y{% trans "Your account" %} + +
+
+
+
+
{% trans "Your Account" %}
+
+
+
+
{% trans "Account" %}:
+
{{ user.dealer.get_local_name }}
-
-
{% trans "Account" %}:
-
{{ user }}
-
{% trans "State" %}:
-
{% if userplan.active %} {% trans "active" %} {% else %} - {% trans "expired" %} {% endif %}
-
{% trans "Expire" %}:
-
{{ userplan.expire }}
-
{% trans "Plan" %}:
-
{{ userplan.plan }} {% trans "upgrade" %}
-
- {% endblock %} +
{% trans "State" %}:
+
+ {% if userplan.active %} + {% trans "Active" %} + {% else %} + {% trans "Expired" %} + {% endif %} +
- {% block plan_details %} -

{% trans "Plan details" %}

+
{% trans "Expire" %}:
+
{{ userplan.expire }}
- -
-
- {% include "plans/plan_table.html" %} +
{% trans "Plan" %}:
+
+ {{ userplan.plan }} + {% trans "Upgrade" %} +
+
+
+
- {% endblock %} - {% block need_more %} -

{% trans "Need more?" %}

- - {% url 'upgrade_plan' as upgrade_url %} - {% blocktrans %} - Please see other currently available plans. - {% endblocktrans %} - {% endblock %} + +
+
+
+
+
{% trans "Plan Details" %}
+
+
+
+
+ {% include "plans/plan_table.html" %} +
+
+
+
+
+
-{% endblock %} + +{% endblock %} \ No newline at end of file diff --git a/templates/plans/plan_table.html b/templates/plans/plan_table.html index d6603577..c6bdd0e0 100644 --- a/templates/plans/plan_table.html +++ b/templates/plans/plan_table.html @@ -1,127 +1,112 @@ {% load i18n %} -
- - - - - {% for plan in plan_list %} - - {% endfor %} - - - - - {% for quota_row in plan_table %} - - - - - {% for plan_quota in quota_row.1 %} - - + {% endif %} + + + {% for plan in plan_list %} + + {% endfor %} + + +
- {% if plan.url %}{% endif %} - {{ plan.name }} - - {% if plan == userplan.plan %} - {% trans "your current plan" %} - {% endif %} - {% if plan.url %}{% endif %} -
- {% if quota_row.0.url %}{% endif %} - {{ quota_row.0.name }} - {{ quota_row.0.description }} - {% if quota_row.0.url %}{% endif %} - - {% if plan_quota != None %} - {% if quota_row.0.is_boolean %} - {% if plan_quota.value %} + {% else %} - {% endif %} - {% else %} - {% if plan_quota.value == None %}{% trans 'no limit' %}{% else %}{{ plan_quota.value }} {{ quota_row.0.unit }}{% endif %} +
+ + + + + {% for plan in plan_list %} + - {% endfor %} - - - - - - - - {% if user.is_authenticated %} - - - - {% for plan in plan_list %} - - {% endfor %} - - - {% endif %} - - - - {% for plan in plan_list %} - + {% endfor %} + + + + {% for quota_row in plan_table %} + + + {% for plan_quota in quota_row.1 %} + + {% endfor %} + + {% endfor %} + + + + + + + {% if user.is_authenticated %} + + + {% for plan in plan_list %} + - {% endfor %} - - - -
+ {% if plan.url %}{% endif %} + {{ plan.name }} + {% if plan == userplan.plan %} + {% trans "Current Plan" %} {% endif %} - {% endif %} - - {% endfor %} - -
{% trans 'Pricing' %}
- {% if plan != userplan.plan and not userplan.is_expired and not userplan.plan.is_free %} - {% trans "Change" %}{% endif %} -
- {% if plan.available %} -
+ {% if quota_row.0.url %}{% endif %} + {{ quota_row.0.name }} + {{ quota_row.0.description }} + {% if quota_row.0.url %}{% endif %} + + {% if plan_quota != None %} + {% if quota_row.0.is_boolean %} + {% if plan_quota.value %}{% else %}{% endif %} + {% else %} + {% if plan_quota.value == None %}{% trans 'No Limit' %}{% else %}{{ plan_quota.value }} {{ quota_row.0.unit }}{% endif %} {% endif %} {% endif %} - {% endfor %} - {% else %} - {# Allow selecting plans with no pricings #} -
  • - {% trans "Free" %} - ({% trans "no expiry" %}) - 0 {{ CURRENCY }} - {% if plan != userplan.plan or userplan.is_expired %} - - {% if userplan.is_expired %} - {% trans "Select" %} - {% else %} - {% trans "Change" %} - {% endif %} - +
    • {% trans 'Pricing' %}
    + {% if plan != userplan.plan and not userplan.is_expired and not userplan.plan.is_free %} + {% trans "Change" %} {% endif %} - - {% endif %} - - - {% else %} - - {% url 'upgrade_plan' as upgrade_url %} - {% blocktrans %} - This plan is not available anymore and cannot be extended.

    - You need to upgrade your account to any of currently available plans. - {% endblocktrans %} - - - {% endif %} -

    + + {% endfor %} +
    + {% if plan.available %} + + {% else %} + + {% url 'upgrade_plan' as upgrade_url %} + {% blocktrans %} + This plan is not available anymore and cannot be extended.
    + You need to upgrade your account to any of currently available plans. + {% endblocktrans %} +     + {% endif %} +
    -

    - {% trans "Net prices" %} - -

    +

    * {% trans "Net prices" %}

    \ No newline at end of file diff --git a/templates/subscriptions/subscription_plan.html b/templates/subscriptions/subscription_plan.html index 3f0eefa0..40a965f0 100644 --- a/templates/subscriptions/subscription_plan.html +++ b/templates/subscriptions/subscription_plan.html @@ -4,7 +4,7 @@ {% block content %}
    -

    Pricing

    +

    {{ _('Pricing') }}