diff --git a/car_inventory/__pycache__/settings.cpython-311.pyc b/car_inventory/__pycache__/settings.cpython-311.pyc index e1c0b3e0..7a4cc307 100644 Binary files a/car_inventory/__pycache__/settings.cpython-311.pyc and b/car_inventory/__pycache__/settings.cpython-311.pyc differ diff --git a/car_inventory/settings.py b/car_inventory/settings.py index 147db327..cb585d69 100644 --- a/car_inventory/settings.py +++ b/car_inventory/settings.py @@ -134,13 +134,17 @@ AUTH_PASSWORD_VALIDATORS = [ ] # Authentications -LOGIN_REDIRECT_URL = '/' -ACCOUNT_LOGOUT_REDIRECT_URL = '/' -ACCOUNT_EMAIL_VERIFICATION = "none" + + ACCOUNT_AUTHENTICATION_METHOD = "email" ACCOUNT_EMAIL_REQUIRED = True ACCOUNT_UNIQUE_EMAIL = True ACCOUNT_USERNAME_REQUIRED = False +LOGIN_REDIRECT_URL = '/' +LOGOUT_REDIRECT_URL = '/' +ACCOUNT_SIGNUP_REDIRECT_URL = '/' +ACCOUNT_USER_MODEL_USERNAME_FIELD = None +ACCOUNT_EMAIL_VERIFICATION = "mandatory" AUTHENTICATION_BACKENDS = [ "django.contrib.auth.backends.ModelBackend", diff --git a/inventory/__pycache__/models.cpython-311.pyc b/inventory/__pycache__/models.cpython-311.pyc index 5283ab05..9de9d791 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 59fba1de..a97bf298 100644 Binary files a/inventory/__pycache__/urls.cpython-311.pyc and b/inventory/__pycache__/urls.cpython-311.pyc differ diff --git a/inventory/__pycache__/views.cpython-311.pyc b/inventory/__pycache__/views.cpython-311.pyc index db7686c7..615db312 100644 Binary files a/inventory/__pycache__/views.cpython-311.pyc and b/inventory/__pycache__/views.cpython-311.pyc differ diff --git a/inventory/migrations/0018_additionalservices_taxable.py b/inventory/migrations/0018_additionalservices_taxable.py new file mode 100644 index 00000000..2f9b8f65 --- /dev/null +++ b/inventory/migrations/0018_additionalservices_taxable.py @@ -0,0 +1,18 @@ +# Generated by Django 5.1.4 on 2024-12-25 17:06 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('inventory', '0017_dealer_email'), + ] + + operations = [ + migrations.AddField( + model_name='additionalservices', + name='taxable', + field=models.BooleanField(default=True, verbose_name='Taxable'), + ), + ] diff --git a/inventory/urls.py b/inventory/urls.py index fdc8ca11..28c933af 100644 --- a/inventory/urls.py +++ b/inventory/urls.py @@ -15,15 +15,16 @@ urlpatterns = [ 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/', + path('password/change/', allauth_views.PasswordChangeView.as_view(template_name='account/password_change.html'), - name='change_password'), - path('reset-password/', + name='account_change_password'), + path('password/reset/', allauth_views.PasswordResetView.as_view(template_name='account/password_reset.html'), - name='reset_password'), - path('password-reset-done/', + name='account_reset_password'), + path('password/reset/done/', allauth_views.PasswordResetDoneView.as_view(template_name='account/password_reset_done.html'), - name='password_reset_done'), + name='account_password_reset_done'), + path('login/code/', allauth_views.RequestLoginCodeView.as_view(template_name='account/request_login_code.html')), # Dealer URLs path('dealers/', views.DealerListView.as_view(), name='dealer_list'), diff --git a/inventory/views.py b/inventory/views.py index 614bc7e5..7ff0a591 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -98,7 +98,7 @@ def switch_language(request): class HomeView(LoginRequiredMixin, TemplateView): - template_name = "crm.html" + template_name = "dashboards/accounting.html" def dispatch(self, request, *args, **kwargs): if ( diff --git a/templates/account/confirm_email_verification_code.html b/templates/account/confirm_email_verification_code.html new file mode 100644 index 00000000..d99adc58 --- /dev/null +++ b/templates/account/confirm_email_verification_code.html @@ -0,0 +1,18 @@ +{% extends "base.html" %} + +{% block title %}Confirm Email Verification Code{% endblock %} + +{% block content %} +
+

Confirm Your Email

+

Please enter the verification code sent to your email.

+
+ {% csrf_token %} +
+ + +
+ +
+
+{% endblock %} \ No newline at end of file diff --git a/templates/account/confirm_login_code..html b/templates/account/confirm_login_code..html new file mode 100644 index 00000000..9cc246e4 --- /dev/null +++ b/templates/account/confirm_login_code..html @@ -0,0 +1,19 @@ +{% extends "base.html" %} + +{% block title %}Confirm Login Code{% endblock %} + +{% block content %} +
+

Confirm Login Code

+

Please enter the login code sent to your email or phone.

+
+ {% csrf_token %} +
+ + +
+ +
+

If you didn’t receive a code, click here to resend it.

+
+{% endblock %} \ No newline at end of file diff --git a/templates/account/email_confirm.html b/templates/account/email_confirm.html new file mode 100644 index 00000000..c662cd44 --- /dev/null +++ b/templates/account/email_confirm.html @@ -0,0 +1,11 @@ +{% extends "base.html" %} + +{% block title %}Email Confirmation{% endblock %} + +{% block content %} +
+

Email Confirmation

+

Your email has been successfully confirmed.

+ Go to Login +
+{% endblock %} \ No newline at end of file diff --git a/templates/account/forgot-password.html b/templates/account/forgot-password.html deleted file mode 100644 index 68acb1c9..00000000 --- a/templates/account/forgot-password.html +++ /dev/null @@ -1,287 +0,0 @@ - - - - - - - - - - - - - Phoenix - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
-
phoenix -
- -
-
-

Forgot your password?

-

Enter your email below and we will send
you a reset link

-
- - -
Still having problems? -
-
-
-
-
- -
-
-
-
-
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/account/login.html b/templates/account/login.html index dd203b6f..9be48027 100644 --- a/templates/account/login.html +++ b/templates/account/login.html @@ -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 'Sign Up'|capfirst %}
diff --git a/templates/account/password_change.html b/templates/account/password_change.html index 941951b8..2af2ac26 100644 --- a/templates/account/password_change.html +++ b/templates/account/password_change.html @@ -14,7 +14,7 @@ -
+ {% csrf_token %} {{ redirect_field }} {{ form|crispy }} @@ -28,7 +28,7 @@
- + {{ _("Forgot Password?") }}
diff --git a/templates/account/password_reset.html b/templates/account/password_reset.html index caf88eb5..9e4ef5d7 100644 --- a/templates/account/password_reset.html +++ b/templates/account/password_reset.html @@ -13,17 +13,20 @@

{{ _("Password Reset") }}

{{ _("Type your new password") }}

- + {% csrf_token %} + {{ redirect_field }} +
+
- +

{{ _("Please contact us if you have any trouble resetting your password.") }} diff --git a/templates/account/request_login_code.html b/templates/account/request_login_code.html new file mode 100644 index 00000000..3c27d170 --- /dev/null +++ b/templates/account/request_login_code.html @@ -0,0 +1,18 @@ +{% extends "base.html" %} + +{% block title %}Request Login Code{% endblock %} + +{% block content %} +

+

Request a Login Code

+

Enter your email address to receive a login code.

+
+ {% csrf_token %} +
+ + +
+ +
+
+{% endblock %} \ No newline at end of file diff --git a/templates/account/reset-password.html b/templates/account/reset-password.html deleted file mode 100644 index 8fb8848f..00000000 --- a/templates/account/reset-password.html +++ /dev/null @@ -1,292 +0,0 @@ - - - - - - - - - - - - - Phoenix - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
-
phoenix -
- -
-

Reset new password

-

Type your new password

-
-
- - -
-
- - -
- -
-
-
-
-
- -
-
-
-
-
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 602520b6..df527f71 100644 --- a/templates/base.html +++ b/templates/base.html @@ -451,7 +451,8 @@
{% trans 'Sign Out' %}
Privacy policy•Terms•Cookies
{% else %} -
{% trans 'Sign Up' %}
+
{% trans 'Sign In' %}
+
{% trans 'Sign Up' %}
{% endif %}
diff --git a/templates/crm.html b/templates/crm.html index f7dcc3e2..d16ff2c1 100644 --- a/templates/crm.html +++ b/templates/crm.html @@ -3,10 +3,6 @@ {% block content %} - - - -
@@ -312,325 +308,6 @@
- - -
-
-
-
-
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
-
-
- - -
-
- - -
-
- - -
-
- - -
-
-
-
-
Vertical Navbar Appearance
-
-
- - -
-
- - -
-
-
-
-
Horizontal Navbar Shape
-
-
- - -
-
- - -
-
-
-
-
Horizontal Navbar Appearance
-
-
- - -
-
- - -
-
-
Purchase template -
-
-
-
-
- - -
-
customize -
- {% endblock %} \ No newline at end of file diff --git a/templates/dashboards/accounting.html b/templates/dashboards/accounting.html new file mode 100644 index 00000000..10ec1216 --- /dev/null +++ b/templates/dashboards/accounting.html @@ -0,0 +1,298 @@ +{% extends 'base.html' %} +{% load i18n static %} + + +{% block content %} +
+
+
+

Travel Agency

+
+
+
New PackageBook Now
+
+
+
+
+
+
+
+
+
Total Value
+
+
+
+

$2,345.00

23.35%From last month +
+
+
+
+
Booked Flights
+
+
+
+

Rain Chances

+

95%

+
+
+
+

1,432

3.98%From last month +
+
+
+
+
Commission
+
+
+
+

$3,339.00

12.21%From last month +
+
+
+
+
Canceled Booking
+
+
+
+

120.00

5.76%From last month +
+
+
+
+
+
+
+
+
+

Financial activities

+

Yearly Balance

+
+
+ +
+
+
+ +
ActionAnother actionSomething else here
+
+
+
+
+ + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+

Visitors

+

Users across countries

+
+
+ +
ActionAnother actionSomething else here
+
+
+
+

0User per second

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
COUNTRY NAMEUSERSSTATUS
+

India

+ 		+
92,896(41.6%)
+ 		15.21%
+

China

+ 		+
50,496(32.8%)
+ 		05.21%
+

USA

+ 		+
45,679(24.3%)
+ 		22.12%
+
+
+
+
+ +

View all +
+
+
+
+
+
+
+
+

Holidays

+

Holidays next month

+
Calender +
+
+
+
+
+
+
+
+
+
+ + +
+
+

Phoenix integrations

+

Phoenix improves efficiency instantly and effortlessly
by allowing easy & simple connection
to other popular programs

Connect Now +
+
+
+
+
+
+
+
+
+
+
+
+
+

Gross Profit

+

Annual income according to the board

+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Flight
+
$162,791,400
+
+
+
+

15.50%

+
+
+
+
+
+
+
+
Flight (Package)
+
$135,659,500
+
+
+
+

11.09%

+
+
+
+
+
+
+
+
Hotel
+
$271,319,000
+
+
+
+

29.98%

+
+
+
+
+
+
+
+
Hotel (Package)
+
$162,791,400
+
+
+
+

03.90%

+
+
+
+
+
+
+
+
+
+
+
+
+
+

Bookings

+

Completed and canceled bookings

+
+ +
+
+
+
+
+
+
+ + +
+ +{% endblock %} \ No newline at end of file