From 31080bddbc0b9f68d2cdd00fd5f229f0fc2e631b Mon Sep 17 00:00:00 2001 From: omarMoatz Date: Thu, 19 Sep 2024 17:06:11 +0300 Subject: [PATCH] added pre commit and linter --- .envs/.local/.postgres | 4 +- .gitignore | 186 ++-- .pre-commit-config.yaml | 49 + .readthedocs.yml | 20 + apps/booking/admin.py | 9 +- apps/booking/apps.py | 4 +- apps/booking/forms.py | 13 +- apps/booking/models.py | 99 +- apps/booking/templates/booking/checkout.html | 473 ++++----- .../includes/total_after_desount.html | 89 +- apps/booking/tests.py | 2 - apps/booking/urls.py | 39 +- apps/booking/views.py | 360 +++---- apps/home/admin.py | 8 +- apps/home/apps.py | 4 +- apps/home/models.py | 27 +- apps/home/site_context_processor.py | 2 +- apps/home/templates/home.html | 938 ++++++++++-------- apps/home/tests.py | 2 - apps/home/urls.py | 4 +- apps/home/views.py | 5 +- apps/hotel/admin.py | 33 +- apps/hotel/api/serializers.py | 84 +- apps/hotel/api/views.py | 28 +- apps/hotel/apps.py | 4 +- apps/hotel/management/commands/populate.py | 54 +- apps/hotel/models.py | 163 +-- apps/hotel/templates/hotel/hotel_detail.html | 697 ++++++------- apps/hotel/templates/hotel/hotel_list.html | 500 +++++----- .../hotel/templates/hotel/rooms_selected.html | 348 +++---- .../templates/hotel/roomtype_detail.html | 382 +++---- apps/hotel/templates/includes/rooms.html | 408 ++++---- apps/hotel/tests.py | 16 +- apps/hotel/urls.py | 27 +- apps/hotel/views.py | 55 +- apps/static/css/style.css | 4 +- apps/static/js/bootstrap.bundle.min.js | 2 +- apps/static/js/bootstrap.min.js | 2 +- apps/static/js/custom.js | 38 +- apps/static/js/main.js | 17 +- apps/static/scss/bootstrap.scss | 2 +- apps/templates/403.html | 4 +- apps/templates/403_csrf.html | 4 +- apps/templates/404.html | 4 +- apps/templates/500.html | 4 +- .../account/base_manage_password.html | 1 - apps/templates/allauth/layouts/entrance.html | 9 +- apps/templates/base.html | 434 ++++---- apps/templates/pages/about.html | 2 - apps/templates/pages/home.html | 2 - apps/templates/users/user_detail.html | 50 +- apps/templates/users/user_form.html | 32 +- apps/users/admin.py | 17 +- apps/users/forms.py | 106 +- apps/users/models.py | 31 +- apps/users/templates/auth_base.html | 99 +- apps/users/templates/users/activation.html | 47 +- apps/users/templates/users/login.html | 60 +- apps/users/templates/users/register.html | 80 +- apps/users/urls.py | 15 +- apps/users/views.py | 103 +- config/settings/base.py | 23 +- config/settings/local.py | 5 +- config/urls.py | 6 +- docker-compose.local.yml | 4 +- docker-compose.production.yml | 8 +- 66 files changed, 3346 insertions(+), 3005 deletions(-) create mode 100644 .pre-commit-config.yaml create mode 100644 .readthedocs.yml diff --git a/.envs/.local/.postgres b/.envs/.local/.postgres index 814fdeb..f6044eb 100644 --- a/.envs/.local/.postgres +++ b/.envs/.local/.postgres @@ -3,5 +3,5 @@ POSTGRES_HOST=postgres POSTGRES_PORT=5432 POSTGRES_DB=hotel_hub -POSTGRES_USER=debug -POSTGRES_PASSWORD=debug \ No newline at end of file +POSTGRES_USER=debug +POSTGRES_PASSWORD=debug diff --git a/.gitignore b/.gitignore index 0833597..a2ad9ad 100644 --- a/.gitignore +++ b/.gitignore @@ -6,10 +6,10 @@ __pycache__ db.sqlite3 media -# Backup files # -*.bak +# Backup files # +*.bak -# If you are using PyCharm # +# If you are using PyCharm # # User-specific stuff .idea/**/workspace.xml .idea/**/tasks.xml @@ -45,94 +45,94 @@ out/ # JIRA plugin atlassian-ide-plugin.xml -# Python # -*.py[cod] -*$py.class - -# Distribution / packaging -.Python build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ +# Python # +*.py[cod] +*$py.class + +# Distribution / packaging +.Python build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ *.whl -*.egg-info/ -.installed.cfg -*.egg -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.coverage -.coverage.* -.cache -.pytest_cache/ -nosetests.xml -coverage.xml -*.cover -.hypothesis/ - -# Jupyter Notebook -.ipynb_checkpoints - -# pyenv -.python-version - -# celery -celerybeat-schedule.* - -# SageMath parsed files -*.sage.py - -# Environments -.env -.venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ - -# mkdocs documentation -/site - -# mypy -.mypy_cache/ - -# Sublime Text # -*.tmlanguage.cache -*.tmPreferences.cache -*.stTheme.cache -*.sublime-workspace -*.sublime-project - -# sftp configuration file -sftp-config.json - -# Package control specific files Package -Control.last-run -Control.ca-list -Control.ca-bundle -Control.system-ca-bundle -GitHub.sublime-settings - -# Visual Studio Code # -.vscode/* -.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json -.history \ No newline at end of file +*.egg-info/ +.installed.cfg +*.egg +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.coverage.* +.cache +.pytest_cache/ +nosetests.xml +coverage.xml +*.cover +.hypothesis/ + +# Jupyter Notebook +.ipynb_checkpoints + +# pyenv +.python-version + +# celery +celerybeat-schedule.* + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ + +# Sublime Text # +*.tmlanguage.cache +*.tmPreferences.cache +*.stTheme.cache +*.sublime-workspace +*.sublime-project + +# sftp configuration file +sftp-config.json + +# Package control specific files Package +Control.last-run +Control.ca-list +Control.ca-bundle +Control.system-ca-bundle +GitHub.sublime-settings + +# Visual Studio Code # +.vscode/* +.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +.history diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..eaa8939 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,49 @@ +exclude: '^docs/|/migrations/|devcontainer.json' +default_stages: [commit] + +default_language_version: + python: python3.12 + +repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.6.0 + hooks: + - id: trailing-whitespace + - id: end-of-file-fixer + - id: check-json + - id: check-toml + - id: check-xml + - id: check-yaml + - id: debug-statements + - id: check-builtin-literals + - id: check-case-conflict + - id: check-docstring-first + - id: detect-private-key + + - repo: https://github.com/adamchainz/django-upgrade + rev: '1.21.0' + hooks: + - id: django-upgrade + args: ['--target-version', '5.0'] + + # Run the Ruff linter. + - repo: https://github.com/astral-sh/ruff-pre-commit + rev: v0.6.4 + hooks: + # Linter + - id: ruff + args: [--fix, --exit-non-zero-on-fix] + # Formatter + - id: ruff-format + + - repo: https://github.com/Riverside-Healthcare/djLint + rev: v1.35.2 + hooks: + - id: djlint-reformat-django + - id: djlint-django + +# sets up .pre-commit-ci.yaml to ensure pre-commit dependencies stay up to date +ci: + autoupdate_schedule: weekly + skip: [] + submodules: false diff --git a/.readthedocs.yml b/.readthedocs.yml new file mode 100644 index 0000000..5564388 --- /dev/null +++ b/.readthedocs.yml @@ -0,0 +1,20 @@ +# Read the Docs configuration file +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details + +# Required +version: 2 + +# Set the version of Python and other tools you might need +build: + os: ubuntu-22.04 + tools: + python: '3.12' + +# Build documentation in the docs/ directory with Sphinx +sphinx: + configuration: docs/conf.py + +# Python requirements required to build your docs +python: + install: + - requirements: requirements/local.txt diff --git a/apps/booking/admin.py b/apps/booking/admin.py index cd1a194..b75d5e8 100644 --- a/apps/booking/admin.py +++ b/apps/booking/admin.py @@ -1,10 +1,13 @@ from django.contrib import admin -from apps.booking.models import Booking,Coupon +from apps.booking.models import Booking +from apps.booking.models import Coupon + @admin.register(Booking) class HotelAdmin(admin.ModelAdmin): - list_display = ('user', 'hotel', 'full_name') - search_fields = ('hotel', 'user') + list_display = ("user", "hotel", "full_name") + search_fields = ("hotel", "user") + admin.site.register(Coupon) diff --git a/apps/booking/apps.py b/apps/booking/apps.py index 0741ea7..1173726 100644 --- a/apps/booking/apps.py +++ b/apps/booking/apps.py @@ -2,5 +2,5 @@ class BookingConfig(AppConfig): - default_auto_field = 'django.db.models.BigAutoField' - name = 'apps.booking' + default_auto_field = "django.db.models.BigAutoField" + name = "apps.booking" diff --git a/apps/booking/forms.py b/apps/booking/forms.py index 778cce6..82d2df2 100644 --- a/apps/booking/forms.py +++ b/apps/booking/forms.py @@ -2,12 +2,18 @@ from apps.booking.models import Booking + class BokingForm(forms.ModelForm): class Meta: model = Booking - fields = ('full_name', 'email', - 'check_in_date', 'check_out_date', - 'num_adults', 'num_children' ) + fields = ( + "full_name", + "email", + "check_in_date", + "check_out_date", + "num_adults", + "num_children", + ) # widgets = { # 'user': forms.Select(attrs={'class': 'form-control'}), # 'event': forms.Select(attrs={'class': 'form-control'}), @@ -18,4 +24,3 @@ class Meta: # # 'invoice_id': forms.TextInput(attrs={'class': 'form-control'}), # 'payment_url': forms.URLInput(attrs={'class': 'form-control'}), # } - \ No newline at end of file diff --git a/apps/booking/models.py b/apps/booking/models.py index 19c38ea..40105fb 100644 --- a/apps/booking/models.py +++ b/apps/booking/models.py @@ -1,65 +1,80 @@ +from datetime import timedelta + from django.db import models -from django.utils.crypto import get_random_string from django.utils import timezone -from datetime import timedelta +from django.utils.crypto import get_random_string from django.utils.translation import gettext_lazy as _ -from model_utils.models import TimeStampedModel, TimeFramedModel +from model_utils.models import TimeFramedModel +from model_utils.models import TimeStampedModel +from apps.hotel.models import Hotel +from apps.hotel.models import Room +from apps.hotel.models import RoomType from apps.users.models import User -from apps.hotel.models import Hotel, Room, RoomType + class Booking(TimeStampedModel): class PAYMENT_METHOD(models.TextChoices): - CASH = 'cash', _('Cash') - VISA = 'visa', _('Visa') - STRIPE = 'stripe', _('Stripe') - PAYPAL = 'paypal', _('Paypal') - - user = models.ForeignKey(User, related_name='booked_user', on_delete=models.CASCADE) - payment_method = models.CharField( max_length=10, choices=PAYMENT_METHOD.choices, blank=True, null=True) - - full_name = models.CharField( max_length=500, blank=True, null=True) - phone = models.CharField( max_length=500, blank=True, null=True) - email = models.EmailField( max_length=900, blank=True, null=True) - - hotel = models.ForeignKey( Hotel, related_name='hotel_booked', on_delete=models.CASCADE) - room_type = models.ManyToManyField( RoomType ) - room = models.ManyToManyField( Room ) - before_discount = models.DecimalField( max_digits=9, decimal_places=2, blank=True, null=True) - total = models.DecimalField( max_digits=9, decimal_places=2, blank=True, null=True) - money_saved = models.DecimalField( max_digits=7, decimal_places=2, blank=True, null=True) - - check_in_date = models.DateField( default=timezone.now, blank=True, null=True) - check_out_date = models.DateField( default=timezone.now, blank=True, null=True) + CASH = "cash", _("Cash") + VISA = "visa", _("Visa") + STRIPE = "stripe", _("Stripe") + PAYPAL = "paypal", _("Paypal") + + user = models.ForeignKey(User, related_name="booked_user", on_delete=models.CASCADE) + payment_method = models.CharField( + max_length=10, choices=PAYMENT_METHOD.choices, blank=True, null=True + ) + + full_name = models.CharField(max_length=500, blank=True, null=True) + phone = models.CharField(max_length=500, blank=True, null=True) + email = models.EmailField(max_length=900, blank=True, null=True) + + hotel = models.ForeignKey( + Hotel, related_name="hotel_booked", on_delete=models.CASCADE + ) + room_type = models.ManyToManyField(RoomType) + room = models.ManyToManyField(Room) + before_discount = models.DecimalField( + max_digits=9, decimal_places=2, blank=True, null=True + ) + total = models.DecimalField(max_digits=9, decimal_places=2, blank=True, null=True) + money_saved = models.DecimalField( + max_digits=7, decimal_places=2, blank=True, null=True + ) + + check_in_date = models.DateField(default=timezone.now, blank=True, null=True) + check_out_date = models.DateField(default=timezone.now, blank=True, null=True) total_days = models.PositiveIntegerField(blank=True, null=True) num_adults = models.PositiveIntegerField(blank=True, null=True) num_children = models.PositiveIntegerField(blank=True, null=True) check_in = models.BooleanField(default=False) check_out = models.BooleanField(default=False) - - booking_code = models.CharField( max_length=500, blank=True, null=True) - coupon = models.ForeignKey('Coupon', on_delete=models.CASCADE, blank=True, null=True) + + booking_code = models.CharField(max_length=500, blank=True, null=True) + coupon = models.ForeignKey( + "Coupon", on_delete=models.CASCADE, blank=True, null=True + ) def __str__(self): - return f'booking{self.id} for {str(self.user)}' - + return f"booking{self.id} for {self.user!s}" + def save(self, *args, **kwargs): - self.booking_code = get_random_string(10) - return super().save(*args, **kwargs) - + self.booking_code = get_random_string(10) + return super().save(*args, **kwargs) + class Meta: - ordering = ['-created'] - + ordering = ["-created"] + class Coupon(TimeFramedModel): - code = models.CharField( max_length=100, blank=True, null=True) - discount = models.PositiveIntegerField( blank=True, null=True) - quantity = models.PositiveIntegerField( blank=True, null=True) + code = models.CharField(max_length=100, blank=True, null=True) + discount = models.PositiveIntegerField(blank=True, null=True) + quantity = models.PositiveIntegerField(blank=True, null=True) def __str__(self): return f"{self.code} - {self.discount}% off" - + def save(self, *args, **kwargs): if not self.end: week = timedelta(days=7) @@ -67,8 +82,8 @@ def save(self, *args, **kwargs): if not self.code: self.code = get_random_string(10) - - return super(Coupon, self).save(*args, **kwargs) + + return super(Coupon, self).save(*args, **kwargs) class Meta: - ordering = ['-start'] + ordering = ["-start"] diff --git a/apps/booking/templates/booking/checkout.html b/apps/booking/templates/booking/checkout.html index 4d5fb63..66ca007 100644 --- a/apps/booking/templates/booking/checkout.html +++ b/apps/booking/templates/booking/checkout.html @@ -1,264 +1,275 @@ {% extends 'base.html' %} + {% load static %} -{% block body %} - -
-
-
-
Selected Rooms
- +
+
+
+
Selected Rooms
+ +
+
+
+ +
+
+
+ +
+
+
+

+ NOTE! + Review Your Rooms Before Payment + +

+
+
    +
  • + + Selected Rooms ({{ booking.room.all|length }}) +
    • + {% for item in booking.room.all %} +
  • +
    {{ item.room_type }} Room
    +
    +
    +

    + beds : {{ item.beds_num }} +

    +

    + view : {{ item.view }} +

    +

    + room size : {{ item.room_size }} m +

    +

    + room no. : {{ item.room_num }} +

    +
    +
    +
    +

    {{ item.price }} $

    +
    +
    +
    • + {% endfor %} +
+
+
+ + +
+
+ + + Billing Information +
+
+ {% csrf_token %} +
+
+
+ + +
+
+
+
+ + +
+
+
+
+ +
+
+
+ +
+
- - -
- -
-
- - - -
- -
-
-

- NOTE! - Review Your Rooms Before Payment - -

-
-
    -
  • - - Selected Rooms ({{booking.room.all|length}}) -
    • - - {% for item in booking.room.all %} -
  • -
    {{item.room_type}} Room
    -
    -
    -

    beds : {{item.beds_num}}

    -

    view : {{item.view}}

    -

    room size : {{item.room_size}} m

    -

    room no. : {{item.room_num}}

    -
    -
    -
    -

    {{item.price}} $

    -
    -
    -
    • - {% endfor %} - -
-
- -
- - - - -
-
- - - Billing Information -
- -
- {% csrf_token %} -
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
- -
- -
-
-
- -
- + +
+
+ +
+
+
+ ... +
+
{{ booking.hotel.name }}
+
+

+ {{ booking.hotel.address }} +

+

+ {{ booking.hotel.phone }} +

- - -
- -
-
-
- ... - -
-
{{booking.hotel.name}}
-
-

{{booking.hotel.address}}

-

{{booking.hotel.phone}}

-
-
- - - - - - -
- -
-
- - -
- - Booking Summery -
-
-
-
-
    -
  • Checkin
    • -
  • Checkout
    • -
  • Total Days
    • -
  • Adults
    • -
  • Childern
    • -
  • Before Discount
    • -
  • Money Saved
    • -
    -
  • Total Cost
    • -
-
- - -
-
    -
  • {{booking.check_in_date}}
    • -
  • {{booking.check_out_date}}
    • -
  • {{booking.total_days}} Days
    • -
  • {{booking.num_adults}} Adults
    • -
  • {{booking.num_children}} Childern
    • -
  • $ {{ booking.before_discount }}
    • -
  • $ {{ booking.money_saved }}
    • -
    -
  • $ {{booking.total}}
    • -
-
-
- {% csrf_token %} - - - -
- -
-

Pay With Strip

-
- -
- -
- -
- -
- -
+
--> +
+ + Booking Summery +
+
+
+
+
    +
  • Checkin
    • +
  • Checkout
    • +
  • Total Days
    • +
  • Adults
    • +
  • Childern
    • +
  • Before Discount
    • +
  • Money Saved
    • +
    +
  • Total Cost
    • +
- +
+
    +
  • {{ booking.check_in_date }}
    • +
  • {{ booking.check_out_date }}
    • +
  • {{ booking.total_days }} Days
    • +
  • {{ booking.num_adults }} Adults
    • +
  • {{ booking.num_children }} Childern
    • +
  • $ {{ booking.before_discount }}
    • +
  • $ {{ booking.money_saved }}
    • +
    +
  • $ {{ booking.total }}
    • +
+
+
+
+ {% csrf_token %} + + + +
+
+

+ Pay With Strip +

+
+
+ +
- +
- - +
+
+
{% endblock body %} - - {% block script %} - - // client id i broughth it from making an app in a real paypal bussines account from developers page - + // client id i broughth it from making an app in a real paypal bussines account from developers page + - -{% endblock script %} + }) + }, - \ No newline at end of file + style: { + layout: 'vertical', + color: 'gold', + shape: 'rect', + label: 'paypal' + } + }).render('#paypal-button-container'); + +{% endblock script %} diff --git a/apps/booking/templates/includes/total_after_desount.html b/apps/booking/templates/includes/total_after_desount.html index 88e9db9..ee44040 100644 --- a/apps/booking/templates/includes/total_after_desount.html +++ b/apps/booking/templates/includes/total_after_desount.html @@ -1,46 +1,49 @@
-
-
-
    -
  • Checkin
    • -
  • Checkout
    • -
  • Total Days
    • -
  • Adults
    • -
  • Childern
    • -
  • Before Discount
    • -
  • Money Saved
    • -
    -
  • Total Cost
    • -
-
- - -
-
    -
  • {{booking.check_in_date}}
    • -
  • {{booking.check_out_date}}
    • -
  • {{booking.total_days}} Days
    • -
  • {{booking.num_adults}} Adults
    • -
  • {{booking.num_children}} Childern
    • -
  • $ {{ booking.before_discount }}
    • -
  • $ {{ booking.money_saved }}
    • -
    -
  • $ {{booking.total}}
    • -
-
+
+
+
    +
  • Checkin
    • +
  • Checkout
    • +
  • Total Days
    • +
  • Adults
    • +
  • Childern
    • +
  • Before Discount
    • +
  • Money Saved
    • +
    +
  • Total Cost
    • +
-
- - - -
- -
-

Pay With Strip

+
+
    +
  • {{ booking.check_in_date }}
    • +
  • {{ booking.check_out_date }}
    • +
  • {{ booking.total_days }} Days
    • +
  • {{ booking.num_adults }} Adults
    • +
  • {{ booking.num_children }} Childern
    • +
  • $ {{ booking.before_discount }}
    • +
  • $ {{ booking.money_saved }}
    • +
    +
  • $ {{ booking.total }}
    • +
- -
-

Pay With Paypal

-
- -
\ No newline at end of file +
+
+ + + +
+
+

+ Pay With Strip +

+
+
+

+ Pay With Paypal +

+
+
diff --git a/apps/booking/tests.py b/apps/booking/tests.py index 7ce503c..a39b155 100644 --- a/apps/booking/tests.py +++ b/apps/booking/tests.py @@ -1,3 +1 @@ -from django.test import TestCase - # Create your tests here. diff --git a/apps/booking/urls.py b/apps/booking/urls.py index a83f8fc..d97d5a7 100644 --- a/apps/booking/urls.py +++ b/apps/booking/urls.py @@ -1,25 +1,26 @@ from django.urls import path -from apps.booking.views import ( -selected_rooms, -delete_room_from_session, -check_coupun, -check_avilability, -room_selection_view, -create_booking, -checkout, -) +from apps.booking.views import check_avilability +from apps.booking.views import check_coupun +from apps.booking.views import checkout +from apps.booking.views import create_booking +from apps.booking.views import delete_room_from_session +from apps.booking.views import room_selection_view +from apps.booking.views import selected_rooms +app_name = "booking" -app_name = 'booking' - - # booking/ +# booking/ urlpatterns = [ - path('selected_rooms/', selected_rooms, name='selected_rooms' ), - path('delete_room_from_session/', delete_room_from_session, name='delete_room_from_session' ), - path('check_coupun/', check_coupun, name='check_coupun' ), - path('/check_avilabilty/', check_avilability, name='check_avilabilty' ), - path('room_selection/', room_selection_view, name='room_selection' ), - path('create_booking/', create_booking, name='create_booking' ), - path('checkout/', checkout, name='checkout' ), + path("selected_rooms/", selected_rooms, name="selected_rooms"), + path( + "delete_room_from_session/", + delete_room_from_session, + name="delete_room_from_session", + ), + path("check_coupun/", check_coupun, name="check_coupun"), + path("/check_avilabilty/", check_avilability, name="check_avilabilty"), + path("room_selection/", room_selection_view, name="room_selection"), + path("create_booking/", create_booking, name="create_booking"), + path("checkout/", checkout, name="checkout"), ] diff --git a/apps/booking/views.py b/apps/booking/views.py index cc71fc3..f5efeb9 100644 --- a/apps/booking/views.py +++ b/apps/booking/views.py @@ -1,33 +1,39 @@ -from django.shortcuts import render, get_object_or_404, redirect -from django.contrib import messages from datetime import datetime -from django.views import generic -from django.urls import reverse -from django.http import HttpResponseRedirect, JsonResponse +from decimal import Decimal + +from django.contrib import messages +from django.http import HttpResponseRedirect +from django.http import JsonResponse +from django.shortcuts import get_object_or_404 +from django.shortcuts import redirect +from django.shortcuts import render from django.template.loader import render_to_string +from django.urls import reverse from django.views.decorators.csrf import csrf_exempt -from decimal import Decimal -from .models import Booking,Hotel,Room,RoomType,Coupon +from .models import Booking +from .models import Coupon +from .models import Hotel +from .models import Room +from .models import RoomType -def check_avilability(request,slug): - if request.method == 'POST': - name = request.POST.get('name','') - email = request.POST.get('email','') - checkin = request.POST.get('checkin','') - checkout = request.POST.get('checkout','') - adults = request.POST.get('adults','') - children = request.POST.get('children','') - room_type = request.POST.get('room_type','') +def check_avilability(request, slug): + if request.method == "POST": + name = request.POST.get("name", "") + email = request.POST.get("email", "") + checkin = request.POST.get("checkin", "") + checkout = request.POST.get("checkout", "") + adults = request.POST.get("adults", "") + children = request.POST.get("children", "") + room_type = request.POST.get("room_type", "") - hotel = get_object_or_404(Hotel,slug=slug) + hotel = get_object_or_404(Hotel, slug=slug) room_type = get_object_or_404(RoomType, hotel=hotel, slug=room_type) - - url = reverse('hotel:room_type_detail', args=(slug, room_type.slug)) - url_with_params = f'{url}?hotel_id={hotel.id}&name={name}&email={email}&checkin={checkin}&checkout={checkout}&adults={adults}&children={children}&room_type={room_type}' - return HttpResponseRedirect(url_with_params) + url = reverse("hotel:room_type_detail", args=(slug, room_type.slug)) + url_with_params = f"{url}?hotel_id={hotel.id}&name={name}&email={email}&checkin={checkin}&checkout={checkout}&adults={adults}&children={children}&room_type={room_type}" + return HttpResponseRedirect(url_with_params) # it tooks its data from jQuery, AJAX @@ -35,182 +41,181 @@ def room_selection_view(request): data = request.GET room_selection = {} - room_selection['room-selection' + str(data['room_id'])] = { - 'hotel_id' : data['hotel_id'], - 'hotel_name' : data['hotel_name'], - 'room_id' : data['room_id'], - 'room_type' : data['room_type'], - 'room_price' : data['room_price'], - 'room_num' : data['room_num'], - 'room_view' : data['room_view'], - 'num_of_beds' : data['num_of_beds'], - 'checkin' : data['checkin'], - 'checkout' : data['checkout'], - 'adults' : data['adults'], - 'children' : data['children'], + room_selection["room-selection" + str(data["room_id"])] = { + "hotel_id": data["hotel_id"], + "hotel_name": data["hotel_name"], + "room_id": data["room_id"], + "room_type": data["room_type"], + "room_price": data["room_price"], + "room_num": data["room_num"], + "room_view": data["room_view"], + "num_of_beds": data["num_of_beds"], + "checkin": data["checkin"], + "checkout": data["checkout"], + "adults": data["adults"], + "children": data["children"], } - - if 'room_selection_obj' in request.session: - current_id = data['room_id'] - if current_id in request.session['room_selection_obj']: - old_data = request.session['room_selection_obj'] - old_data[current_id]['adults'] = int(room_selection[current_id]['adults']) - old_data[current_id]['children'] = int(room_selection[current_id]['children']) - request.session['room_selection_obj'] = old_data + if "room_selection_obj" in request.session: + current_id = data["room_id"] + if current_id in request.session["room_selection_obj"]: + old_data = request.session["room_selection_obj"] + old_data[current_id]["adults"] = int(room_selection[current_id]["adults"]) + old_data[current_id]["children"] = int( + room_selection[current_id]["children"] + ) + request.session["room_selection_obj"] = old_data else: - old_data = request.session['room_selection_obj'] + old_data = request.session["room_selection_obj"] old_data.update(room_selection) - request.session['room_selection_obj'] = old_data + request.session["room_selection_obj"] = old_data else: - request.session['room_selection_obj'] = room_selection + request.session["room_selection_obj"] = room_selection json_data = { - 'data': request.session['room_selection_obj'], - 'name' : 'omar moataz', - 'rooms_len' : len(request.session['room_selection_obj']) + "data": request.session["room_selection_obj"], + "name": "omar moataz", + "rooms_len": len(request.session["room_selection_obj"]), } return JsonResponse(json_data) - - def selected_rooms(request): rooms_price = 0 rooms_list = [] - if 'room_selection_obj' in request.session: - if len(request.session['room_selection_obj']) == 0: - messages.warning(request, 'You deleted all your booked rooms!') - return redirect('/') - - for id, item in request.session['room_selection_obj'].items(): - hotel_id = int(item['hotel_id']) - room_id = int(item['room_id']) - checkin = item['checkin'] - checkout = item['checkout'] - adults = int(item['adults']) - children = int(item['children']) + if "room_selection_obj" in request.session: + if len(request.session["room_selection_obj"]) == 0: + messages.warning(request, "You deleted all your booked rooms!") + return redirect("/") + + for id, item in request.session["room_selection_obj"].items(): + hotel_id = int(item["hotel_id"]) + room_id = int(item["room_id"]) + checkin = item["checkin"] + checkout = item["checkout"] + adults = int(item["adults"]) + children = int(item["children"]) room = get_object_or_404(Room, id=room_id) rooms_list.append(room) - rooms_price += float(room.price ) - - hotel = Hotel.objects.get(id=hotel_id) + rooms_price += float(room.price) - date_format = '%Y-%m-%d' - chickin_date = datetime.strptime( checkin, date_format) - chickout_date = datetime.strptime( checkout, date_format) - total_days = (chickout_date - chickin_date).days + hotel = Hotel.objects.get(id=hotel_id) + date_format = "%Y-%m-%d" + chickin_date = datetime.strptime(checkin, date_format) + chickout_date = datetime.strptime(checkout, date_format) + total_days = (chickout_date - chickin_date).days - total_cost = float(rooms_price * total_days) + total_cost = float(rooms_price * total_days) context = { - 'selected_rooms': request.session['room_selection_obj'], - 'hotel': hotel, - 'rooms_list': rooms_list, - 'checkin': checkin , - 'checkout': checkout , - 'total_days': total_days, - 'adults' : adults, - 'children': children, - 'total_cost': round(total_cost,2) + "selected_rooms": request.session["room_selection_obj"], + "hotel": hotel, + "rooms_list": rooms_list, + "checkin": checkin, + "checkout": checkout, + "total_days": total_days, + "adults": adults, + "children": children, + "total_cost": round(total_cost, 2), } - return render(request, 'hotel/rooms_selected.html', context) - - else: - messages.warning(request, 'You Dont Have Any Booked Rooms Yet!') - return redirect('/') + return render(request, "hotel/rooms_selected.html", context) + + messages.warning(request, "You Dont Have Any Booked Rooms Yet!") + return redirect("/") # it tooks its data from jQuery, AJAX def delete_room_from_session(request): - room_id = 'room-selection'+str(request.GET['room_id']) + room_id = "room-selection" + str(request.GET["room_id"]) rooms_price = 0 rooms_list = [] - if 'room_selection_obj' in request.session: - - if room_id in request.session['room_selection_obj']: - existing_data = request.session['room_selection_obj'] - del request.session['room_selection_obj'][room_id] - request.session['room_selection_obj'] = existing_data - - - if len(request.session['room_selection_obj']) == 0: - return JsonResponse({'rooms_len': len(request.session['room_selection_obj'])}) - - for id, item in request.session['room_selection_obj'].items(): - hotel_id = int(item['hotel_id']) - room_id = int(item['room_id']) - checkin = item['checkin'] - checkout = item['checkout'] - adults = int(item['adults']) - children = int(item['children']) + if "room_selection_obj" in request.session: + if room_id in request.session["room_selection_obj"]: + existing_data = request.session["room_selection_obj"] + del request.session["room_selection_obj"][room_id] + request.session["room_selection_obj"] = existing_data + + if len(request.session["room_selection_obj"]) == 0: + return JsonResponse( + {"rooms_len": len(request.session["room_selection_obj"])} + ) + + for id, item in request.session["room_selection_obj"].items(): + hotel_id = int(item["hotel_id"]) + room_id = int(item["room_id"]) + checkin = item["checkin"] + checkout = item["checkout"] + adults = int(item["adults"]) + children = int(item["children"]) room = Room.objects.get(id=room_id) rooms_list.append(room) - rooms_price += float(room.price ) - - hotel = Hotel.objects.get(id=hotel_id) + rooms_price += float(room.price) - date_format = '%Y-%m-%d' - chickin_date = datetime.strptime( checkin, date_format) - chickout_date = datetime.strptime( checkout, date_format) - total_days = (chickout_date - chickin_date).days + hotel = Hotel.objects.get(id=hotel_id) + date_format = "%Y-%m-%d" + chickin_date = datetime.strptime(checkin, date_format) + chickout_date = datetime.strptime(checkout, date_format) + total_days = (chickout_date - chickin_date).days - total_cost = float(rooms_price * total_days) + total_cost = float(rooms_price * total_days) rendered_data = render_to_string( - 'includes/rooms.html', - { - 'selected_rooms': request.session['room_selection_obj'], - 'hotel': hotel, - 'rooms_list': rooms_list, - 'checkin': checkin , - 'checkout': checkout , - 'total_days': total_days, - 'adults' : adults, - 'children': children, - 'total_cost': round(total_cost,2) - } - ) - return JsonResponse( {'rendered_data': rendered_data , 'rooms_len': len(request.session['room_selection_obj'])}) - - else: - messages.warning(request, 'You deleted all your booked rooms!') - return redirect('/') - - - -def checkout(request,booking_code): + "includes/rooms.html", + { + "selected_rooms": request.session["room_selection_obj"], + "hotel": hotel, + "rooms_list": rooms_list, + "checkin": checkin, + "checkout": checkout, + "total_days": total_days, + "adults": adults, + "children": children, + "total_cost": round(total_cost, 2), + }, + ) + return JsonResponse( + { + "rendered_data": rendered_data, + "rooms_len": len(request.session["room_selection_obj"]), + } + ) + + messages.warning(request, "You deleted all your booked rooms!") + return redirect("/") + + +def checkout(request, booking_code): booking = Booking.objects.get(booking_code=booking_code) - return render(request, 'booking/checkout.html', {'booking':booking}) + return render(request, "booking/checkout.html", {"booking": booking}) @csrf_exempt def create_booking(request): total_rooms_price = 0 rooms_obj = [] - if 'room_selection_obj' in request.session: - if request.method == 'POST': - for id, item in request.session['room_selection_obj'].items(): - hotel_id = item['hotel_id'] - room_id = item['room_id'] - checkin = item['checkin'] - checkout = item['checkout'] - adults = item['adults'] - children = item['children'] + if "room_selection_obj" in request.session: + if request.method == "POST": + for id, item in request.session["room_selection_obj"].items(): + hotel_id = item["hotel_id"] + room_id = item["room_id"] + checkin = item["checkin"] + checkout = item["checkout"] + adults = item["adults"] + children = item["children"] room = Room.objects.get(id=room_id) total_rooms_price += room.price rooms_obj.append(room) hotel = Hotel.objects.get(id=hotel_id) - - date_format = '%Y-%m-%d' + + date_format = "%Y-%m-%d" checkin_date = datetime.strptime(checkin, date_format) checkout_date = datetime.strptime(checkout, date_format) total_days = (checkout_date - checkin_date).days @@ -218,9 +223,9 @@ def create_booking(request): total_price = total_rooms_price * total_days user = request.user - full_name = request.POST['full_name'] - email = request.POST['email'] - phone = request.POST['phone'] + full_name = request.POST["full_name"] + email = request.POST["email"] + phone = request.POST["phone"] booking = Booking.objects.create( user=user, @@ -234,7 +239,7 @@ def create_booking(request): check_out_date=checkout, total_days=total_days, num_adults=adults, - num_children=children + num_children=children, ) for item in rooms_obj: @@ -243,35 +248,36 @@ def create_booking(request): booking.room.add(item) booking.room_type.add(room_type) - messages.success(request, 'You Booked Sucesfully') - return redirect('booking:checkout', booking.booking_code) + messages.success(request, "You Booked Sucesfully") + return redirect("booking:checkout", booking.booking_code) @csrf_exempt def check_coupun(request): - if request.method == 'POST': - booking_id = request.POST['booking_id'] - code = request.POST['coupon_code'] + if request.method == "POST": + booking_id = request.POST["booking_id"] + code = request.POST["coupon_code"] try: coupon = Coupon.objects.get(code=code) except: - return JsonResponse({'status':'error', 'message':'Invalid coupon code.'}) - + return JsonResponse({"status": "error", "message": "Invalid coupon code."}) + booking = Booking.objects.get(id=booking_id) if booking.coupon == coupon: - return JsonResponse({'status':'error', 'message':'you already used this coupon'}) + return JsonResponse( + {"status": "error", "message": "you already used this coupon"} + ) - if coupon and coupon.quantity > 0 : + if coupon and coupon.quantity > 0: today = datetime.today().date() start_date = coupon.start_date.date() expire_date = coupon.end_date.date() if today >= start_date and today <= expire_date: - discount_decimal = Decimal(coupon.discount) / 100 discount = discount_decimal * booking.total - booking.total -= discount + booking.total -= discount booking.money_saved = discount booking.coupon = coupon @@ -280,26 +286,22 @@ def check_coupun(request): booking.save() coupon.save() - html = render_to_string('includes/total_after_desount.html',{'booking':booking,}) - return JsonResponse({'status': 'success', - 'message': 'Coupon applied successfully!', - 'html':html}) - - else: - return JsonResponse({'status':'error', 'message':'Expired coupon'}) - - - else: - return JsonResponse({'status':'error', 'message':'Cupon quntity is empty'}) - - - return JsonResponse({'status':'error', 'message':'Invalid request method.'}) - - - + html = render_to_string( + "includes/total_after_desount.html", {"booking": booking} + ) + return JsonResponse( + { + "status": "success", + "message": "Coupon applied successfully!", + "html": html, + } + ) + return JsonResponse({"status": "error", "message": "Expired coupon"}) + return JsonResponse({"status": "error", "message": "Cupon quntity is empty"}) + return JsonResponse({"status": "error", "message": "Invalid request method."}) # class CheckAvilability(generic.CreateView): @@ -312,7 +314,7 @@ def check_coupun(request): # # context = super().get_context_data(**kwargs) # # context["room_type"] = models.RoomType.objects.filter(hotel =self.get_object()) # # return context - + # def form_valid(self, form): # slug = self.kwargs['slug'] @@ -334,4 +336,4 @@ def check_coupun(request): # form.instance.user = user # # self.success_url = f'/hotels/{slug}/ckeck_avilability/' -# return super().form_valid(form) +# return super().form_valid(form) diff --git a/apps/home/admin.py b/apps/home/admin.py index 5f02274..0dfe68d 100644 --- a/apps/home/admin.py +++ b/apps/home/admin.py @@ -1,26 +1,26 @@ from django.contrib import admin from django.contrib import messages -from django.core.exceptions import ValidationError from django.http import HttpRequest from django.utils.html import format_html from apps.home.models import MainSettings + @admin.register(MainSettings) class MainSettingsAdmin(admin.ModelAdmin): - list_display = ( 'name', 'email', 'phone', 'img_tag') + list_display = ("name", "email", "phone", "img_tag") def has_delete_permission(self, request, obj=None): # disable the delete button in the admin return False - + def has_add_permission(self, request: HttpRequest) -> bool: # disable the Create button in the admin if MainSettings.objects.exists(): messages.set_level(request, messages.ERROR) return False return super().has_add_permission(request) - + def img_tag(self, obj): if obj.logo: return format_html(f'') diff --git a/apps/home/apps.py b/apps/home/apps.py index c11732f..d764319 100644 --- a/apps/home/apps.py +++ b/apps/home/apps.py @@ -2,5 +2,5 @@ class HomeConfig(AppConfig): - default_auto_field = 'django.db.models.BigAutoField' - name = 'apps.home' + default_auto_field = "django.db.models.BigAutoField" + name = "apps.home" diff --git a/apps/home/models.py b/apps/home/models.py index 869ad02..905a2d0 100644 --- a/apps/home/models.py +++ b/apps/home/models.py @@ -1,32 +1,33 @@ from django.db import models -from django.utils.html import mark_safe from model_utils.models import TimeStampedModel class MainSettings(TimeStampedModel): - name = models.CharField( max_length=150) - logo = models.ImageField( upload_to='company/') - description = models.TextField( max_length=1000, default='', blank=True, null=True) + name = models.CharField(max_length=150) + logo = models.ImageField(upload_to="company/") + description = models.TextField(max_length=1000, default="", blank=True, null=True) - email = models.EmailField( max_length=500, default='default@default.com', blank=True, null=True) - phone = models.CharField( max_length=150, default='01099999', blank=True, null=True) + email = models.EmailField( + max_length=500, default="default@default.com", blank=True, null=True + ) + phone = models.CharField(max_length=150, default="01099999", blank=True, null=True) - facebook = models.URLField( max_length=500, blank=True, null=True) - linkedin = models.URLField( max_length=500, blank=True, null=True) + facebook = models.URLField(max_length=500, blank=True, null=True) + linkedin = models.URLField(max_length=500, blank=True, null=True) def delete(self, *args, **kwargs): raise Exception("You can't delete this object") - - def save(self,*args, **kwargs): + + def save(self, *args, **kwargs): if MainSettings.objects.exists() and not self.pk: - raise Exception('You can not create more than one object') + raise Exception("You can not create more than one object") return super(MainSettings, self).save(*args, **kwargs) def __str__(self): return self.name class Meta: - verbose_name_plural = 'MainSettings' + verbose_name_plural = "MainSettings" # def logo_tag(self): - # return mark_safe(f'') \ No newline at end of file + # return mark_safe(f'') diff --git a/apps/home/site_context_processor.py b/apps/home/site_context_processor.py index 6066a8c..98d9a36 100644 --- a/apps/home/site_context_processor.py +++ b/apps/home/site_context_processor.py @@ -3,4 +3,4 @@ def main_data(request): data = MainSettings.objects.last() - return {'data':data} \ No newline at end of file + return {"data": data} diff --git a/apps/home/templates/home.html b/apps/home/templates/home.html index 3a75859..49b281e 100644 --- a/apps/home/templates/home.html +++ b/apps/home/templates/home.html @@ -1,455 +1,519 @@ {% extends 'base.html' %} + {% load static %} + {% block body %} - -
- + +
+