diff --git a/inventory/__pycache__/models.cpython-311.pyc b/inventory/__pycache__/models.cpython-311.pyc index 9740f565..5283ab05 100644 Binary files a/inventory/__pycache__/models.cpython-311.pyc and b/inventory/__pycache__/models.cpython-311.pyc differ diff --git a/inventory/__pycache__/urls.cpython-311.pyc b/inventory/__pycache__/urls.cpython-311.pyc index ca079c86..59fba1de 100644 Binary files a/inventory/__pycache__/urls.cpython-311.pyc and b/inventory/__pycache__/urls.cpython-311.pyc differ diff --git a/inventory/models.py b/inventory/models.py index ed06a68f..00b16eb6 100644 --- a/inventory/models.py +++ b/inventory/models.py @@ -523,7 +523,7 @@ class Dealer(models.Model, LocalizedNameMixin): return None @property - def get_plan_price(self): + def get_plan(self): """Get the price of the active subscription plan for the dealer.""" active_plan = self.get_active_plan if active_plan: @@ -531,7 +531,7 @@ class Dealer(models.Model, LocalizedNameMixin): name=active_plan.plan ).first() if subscription_plan: - return subscription_plan.price + return subscription_plan return None diff --git a/inventory/urls.py b/inventory/urls.py index c615e343..fdc8ca11 100644 --- a/inventory/urls.py +++ b/inventory/urls.py @@ -12,17 +12,17 @@ urlpatterns = [ path('welcome/', views.WelcomeView.as_view(), name='welcome'), # Accounts URLs - path('login/', allauth_views.LoginView.as_view(template_name='accounts/login.html'), name='login'), - path('logout/', allauth_views.LogoutView.as_view(template_name='accounts/logout.html'), name='logout'), - path('signup/', allauth_views.SignupView.as_view(template_name='accounts/signup.html'), name='signup'), + path('login/', allauth_views.LoginView.as_view(template_name='account/login.html'), name='account_login'), + path('logout/', allauth_views.LogoutView.as_view(template_name='account/logout.html'), name='account_logout'), + path('signup/', allauth_views.SignupView.as_view(template_name='account/signup.html'), name='account_signup'), path('change-password/', - allauth_views.PasswordChangeView.as_view(template_name='accounts/password_change.html'), + allauth_views.PasswordChangeView.as_view(template_name='account/password_change.html'), name='change_password'), path('reset-password/', - allauth_views.PasswordResetView.as_view(template_name='accounts/password_reset.html'), + allauth_views.PasswordResetView.as_view(template_name='account/password_reset.html'), name='reset_password'), path('password-reset-done/', - allauth_views.PasswordResetDoneView.as_view(template_name='accounts/password_reset_done.html'), + allauth_views.PasswordResetDoneView.as_view(template_name='account/password_reset_done.html'), name='password_reset_done'), # Dealer URLs diff --git a/static/css/theme.css b/static/css/theme.css index 7e3e3884..40b6b7b0 100644 --- a/static/css/theme.css +++ b/static/css/theme.css @@ -880,7 +880,7 @@ } [data-bs-theme=dark] .table-dark { - --phoenix-table-bg: $ value; + --phoenix-table-bg: #141824; } /*----------------------------------------------- @@ -4022,10 +4022,7 @@ progress { -webkit-box-shadow: inset 0 1px 2px transparent; box-shadow: inset 0 1px 2px transparent; -webkit-transition: border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out; - transition: border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out; -o-transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; - transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; - transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out; } @media (prefers-reduced-motion: reduce) { @@ -42350,7 +42347,7 @@ a[href].bg-body-secondary:hover, a[href].bg-body-secondary:focus { --phoenix-navbar-vertical-link-hover-bg: #31374a; --phoenix-navbar-vertical-link-active-color: #fff; --phoenix-navbar-vertical-link-disable-color: #8a94ad; - --phoenix-navbar-vertical-hr-color: $ gray-800; + --phoenix-navbar-vertical-hr-color: #6e7891; --phoenix-navbar-vertical-collapsed-menu-bg: #222834; --phoenix-logo-text: #eff2f6; --phoenix-navbar-footer-border-color: #31374a; diff --git a/templates/accounts/2FA.html b/templates/account/2FA.html similarity index 100% rename from templates/accounts/2FA.html rename to templates/account/2FA.html diff --git a/templates/accounts/forgot-password.html b/templates/account/forgot-password.html similarity index 100% rename from templates/accounts/forgot-password.html rename to templates/account/forgot-password.html diff --git a/templates/accounts/lock-screen.html b/templates/account/lock-screen.html similarity index 100% rename from templates/accounts/lock-screen.html rename to templates/account/lock-screen.html diff --git a/templates/accounts/login.html b/templates/account/login.html similarity index 89% rename from templates/accounts/login.html rename to templates/account/login.html index 618f7c6b..dd203b6f 100644 --- a/templates/accounts/login.html +++ b/templates/account/login.html @@ -21,7 +21,7 @@ {% include "socialaccount/snippets/login.html" with page_layout="entrance" %} {% endif %} {% if not SOCIALACCOUNT_ONLY %} -
+ {% csrf_token %} {{ redirect_field }} {{ form|crispy }} @@ -30,7 +30,7 @@
{% endif %} -
{% trans 'If you have not created an account yet, then please' %} {% trans 'signup'|capfirst %}
+
{% trans 'If you have not created an account yet, then please' %} {% trans 'signup'|capfirst %}
diff --git a/templates/accounts/logout.html b/templates/account/logout.html similarity index 91% rename from templates/accounts/logout.html rename to templates/account/logout.html index 47f349b8..8d70e023 100644 --- a/templates/accounts/logout.html +++ b/templates/account/logout.html @@ -12,7 +12,7 @@

{{ _("Are you sure you want to sign out?") }}

-
+ {% csrf_token %} {{ redirect_field }}
diff --git a/templates/accounts/password_change.html b/templates/account/password_change.html similarity index 100% rename from templates/accounts/password_change.html rename to templates/account/password_change.html diff --git a/templates/accounts/password_reset.html b/templates/account/password_reset.html similarity index 100% rename from templates/accounts/password_reset.html rename to templates/account/password_reset.html diff --git a/templates/accounts/password_reset_done.html b/templates/account/password_reset_done.html similarity index 100% rename from templates/accounts/password_reset_done.html rename to templates/account/password_reset_done.html diff --git a/templates/accounts/reset-password.html b/templates/account/reset-password.html similarity index 100% rename from templates/accounts/reset-password.html rename to templates/account/reset-password.html diff --git a/templates/accounts/signup.html b/templates/account/signup.html similarity index 94% rename from templates/accounts/signup.html rename to templates/account/signup.html index 585bfbc3..a35f3c32 100644 --- a/templates/accounts/signup.html +++ b/templates/account/signup.html @@ -33,7 +33,7 @@ {% if not SOCIALACCOUNT_ONLY %} - + {% csrf_token %} {{ redirect_field }}
@@ -72,7 +72,7 @@
-
{% trans 'Already have an account?' %} {{ _("Sign In") }}
+
{% trans 'Already have an account?' %} {{ _("Sign In") }}
{% endif %}
diff --git a/templates/accounts/sign-in.html b/templates/accounts/sign-in.html deleted file mode 100644 index a5fbaa15..00000000 --- a/templates/accounts/sign-in.html +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - - - - - - - Phoenix - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
-
phoenix -
- -
-

Sign In

-

Get access to your account

-
- - -
-
-
or use email
-
-
- -
- -
-
-
- -
- - -
-
-
-
-
- - -
-
-
Forgot Password?
-
- -
Create an account
-
-
-
- -
-
-
-
-
Demo widget
-
- -
Request a callbackSearch in chatShow historyReport to AdminClose Support
-
-
-
-
-
-

I need help with something

- -

I can’t reorder a product I previously ordered

- -

How do I place an order?

- -

My payment method not working

- -
-
-
-
Eric
-

Ask us anything – we’ll get back to you here or by email within 24 hours.

-
-
-
-
-
- - - - - -
- -
-
-
- -
-
- - - - - -
-
-
-
-
Theme Customizer
-

Explore different styles according to your preferences

-
- -
- -
-
-
-
Color Scheme
-
-
- - -
-
- - -
-
- - -
-
-
-
-
-
RTL
-
- -
-
-

Change text direction

-
-
-
-
Support Chat
-
- -
-
-

Toggle support chat

-
-
-
Navigation Type
-
-
- - -
-
- - -
-
- - -
-
- - -
-
-

You can't update navigation type in this page

-
-
-
Vertical Navbar Appearance
-
-
- - -
-
- - -
-
-

You can't update vertical navbar appearance in this page

-
-
-
Horizontal Navbar Shape
-
-
- - -
-
- - -
-
-

You can't update horizontal navbar shape in this page

-
-
-
Horizontal Navbar Appearance
-
-
- - -
-
- - -
-
-

You can't update horizontal navbar appearance in this page

-
Purchase template -
-
-
-
-
- - -
-
customize -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/templates/accounts/sign-out.html b/templates/accounts/sign-out.html deleted file mode 100644 index 961e67f1..00000000 --- a/templates/accounts/sign-out.html +++ /dev/null @@ -1,281 +0,0 @@ - - - - - - - - - - - - - Phoenix - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
-
phoenixphoenix -
-

Come back soon!

-

Thanks for using Phoenix.
You are now successfully signed out.

-
-
Go to sign in page
-
-
-
-
- -
-
-
-
-
Demo widget
-
- -
Request a callbackSearch in chatShow historyReport to AdminClose Support
-
-
-
-
-
-

I need help with something

- -

I can’t reorder a product I previously ordered

- -

How do I place an order?

- -

My payment method not working

- -
-
-
-
Eric
-

Ask us anything – we’ll get back to you here or by email within 24 hours.

-
-
-
-
-
- - - - - -
- -
-
-
- -
-
- - - - - -
-
-
-
-
Theme Customizer
-

Explore different styles according to your preferences

-
- -
- -
-
-
-
Color Scheme
-
-
- - -
-
- - -
-
- - -
-
-
-
-
-
RTL
-
- -
-
-

Change text direction

-
-
-
-
Support Chat
-
- -
-
-

Toggle support chat

-
-
-
Navigation Type
-
-
- - -
-
- - -
-
- - -
-
- - -
-
-

You can't update navigation type in this page

-
-
-
Vertical Navbar Appearance
-
-
- - -
-
- - -
-
-

You can't update vertical navbar appearance in this page

-
-
-
Horizontal Navbar Shape
-
-
- - -
-
- - -
-
-

You can't update horizontal navbar shape in this page

-
-
-
Horizontal Navbar Appearance
-
-
- - -
-
- - -
-
-

You can't update horizontal navbar appearance in this page

-
Purchase template -
-
-
-
-
- - -
-
customize -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/templates/accounts/sign-up.html b/templates/accounts/sign-up.html deleted file mode 100644 index de9d7a01..00000000 --- a/templates/accounts/sign-up.html +++ /dev/null @@ -1,319 +0,0 @@ - - - - - - - - - - - - - Phoenix - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
-
phoenix -
- -
-

Sign Up

-

Create your account today

-
- - -
-
-
or use email
-
-
-
- - -
-
- - -
-
-
- -
- - -
-
-
- -
- - -
-
-
-
- - -
- -
Sign in to an existing account
-
-
-
-
- -
-
-
-
-
Demo widget
-
- -
Request a callbackSearch in chatShow historyReport to AdminClose Support
-
-
-
-
-
-

I need help with something

- -

I can’t reorder a product I previously ordered

- -

How do I place an order?

- -

My payment method not working

- -
-
-
-
Eric
-

Ask us anything – we’ll get back to you here or by email within 24 hours.

-
-
-
-
-
- - - - - -
- -
-
-
- -
-
- - - - - -
-
-
-
-
Theme Customizer
-

Explore different styles according to your preferences

-
- -
- -
-
-
-
Color Scheme
-
-
- - -
-
- - -
-
- - -
-
-
-
-
-
RTL
-
- -
-
-

Change text direction

-
-
-
-
Support Chat
-
- -
-
-

Toggle support chat

-
-
-
Navigation Type
-
-
- - -
-
- - -
-
- - -
-
- - -
-
-

You can't update navigation type in this page

-
-
-
Vertical Navbar Appearance
-
-
- - -
-
- - -
-
-

You can't update vertical navbar appearance in this page

-
-
-
Horizontal Navbar Shape
-
-
- - -
-
- - -
-
-

You can't update horizontal navbar shape in this page

-
-
-
Horizontal Navbar Appearance
-
-
- - -
-
- - -
-
-

You can't update horizontal navbar appearance in this page

-
Purchase template -
-
-
-
-
- - -
-
customize -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index 3e595344..602520b6 100644 --- a/templates/base.html +++ b/templates/base.html @@ -448,10 +448,10 @@
  • Add another account
    • -
    {% trans 'Sign Out' %}
    +
    {% trans 'Sign Out' %}
    Privacy policy•Terms•Cookies
    {% else %} -
    {% trans 'Sign In' %}
    +
    {% trans 'Sign Up' %}
    {% endif %}
    diff --git a/templates/dealers/dealer_detail.html b/templates/dealers/dealer_detail.html index e2f8dbc3..53c6fa74 100644 --- a/templates/dealers/dealer_detail.html +++ b/templates/dealers/dealer_detail.html @@ -78,8 +78,12 @@

    {{ dealer.get_active_plan.users.count }} / {{ dealer.get_active_plan.max_users }}

    -
    {% trans 'Subscription Type' %}
    - +
    {% trans 'Subscription' %}
    + {% if dealer.get_active_plan.is_active %} + {% trans 'Active' %} + {% else %} + {% trans 'Expired' %} + {% endif %}
    @@ -140,11 +144,11 @@
    -

    {{ dealer.get_active_plan.plan }}

    recommended +

    {{ dealer.get_active_plan.plan }}

    {% trans 'most valuable'|upper %}

    {% trans 'Active until' %}: {{ dealer.get_active_plan.end_date|date}}

    -

    {{ dealer.get_plan_price }} {% trans 'SAR' %}

    +

    {{ dealer.get_plan.price }} {% trans 'SAR' %}

    Per month
    @@ -153,10 +157,7 @@
      -
    • Technical Supports
      • -
    • Up to 4 Members
      • -
    • Create & Share libraries
      • -
    • Unlimited Collaboration
      • +
    • {{ dealer.get_plan.description}}
    diff --git a/templates/default.html b/templates/default.html index 48ad30cb..760c68e3 100644 --- a/templates/default.html +++ b/templates/default.html @@ -97,7 +97,7 @@
    - {{ _("Sign In") }}{{ _("Sign Up") }} + {{ _("Sign In") }}{{ _("Sign Up") }}