From e8ea95fc87b48ea0c5b5097d45d9e38c90266e91 Mon Sep 17 00:00:00 2001 From: Ruidy Nemausat Date: Fri, 3 Jan 2020 18:06:04 +0100 Subject: [PATCH] mail templates --- README.md | 4 ++-- rental/bookings.py | 10 ---------- rental/tasks.py | 11 ++++++++++- .../templates/rental/{html => mails}/activation.html | 0 rental/templates/rental/{html => mails}/assigned.html | 0 .../rental/{html => mails}/confirmation.html | 0 rental/templates/rental/{html => mails}/expired.html | 0 rental/templates/rental/{html => mails}/expiring.html | 0 rental/templates/rental/{html => mails}/feedback.html | 0 .../templates/rental/{html => mails}/invitation.html | 0 rental/templates/rental/{html => mails}/launch.html | 0 .../rental/{html => mails}/reactivation.html | 0 rental/templates/rental/{html => mails}/reset.html | 0 rental/templates/rental/{html => mails}/started.html | 0 rental/templates/rental/{html => mails}/ticket.html | 2 +- rental/templates/rental/{html => mails}/weekly.html | 0 rental/templates/rental/{html => mails}/welcome.html | 0 villafleurie/settings.py | 5 +++-- 18 files changed, 16 insertions(+), 16 deletions(-) rename rental/templates/rental/{html => mails}/activation.html (100%) rename rental/templates/rental/{html => mails}/assigned.html (100%) rename rental/templates/rental/{html => mails}/confirmation.html (100%) rename rental/templates/rental/{html => mails}/expired.html (100%) rename rental/templates/rental/{html => mails}/expiring.html (100%) rename rental/templates/rental/{html => mails}/feedback.html (100%) rename rental/templates/rental/{html => mails}/invitation.html (100%) rename rental/templates/rental/{html => mails}/launch.html (100%) rename rental/templates/rental/{html => mails}/reactivation.html (100%) rename rental/templates/rental/{html => mails}/reset.html (100%) rename rental/templates/rental/{html => mails}/started.html (100%) rename rental/templates/rental/{html => mails}/ticket.html (99%) rename rental/templates/rental/{html => mails}/weekly.html (100%) rename rental/templates/rental/{html => mails}/welcome.html (100%) diff --git a/README.md b/README.md index 2cae195..210939b 100644 --- a/README.md +++ b/README.md @@ -99,8 +99,8 @@ Le visiteur doit pouvoir : ## TO DO -- Ajouter un date picker dans le formulaire de réservation, changer les placeholders (j'ai pas envie de jouer avec JQuery) -- Envoyer devis réservation par mail et notification aux hôtes (put it in a background process, personnaliser les htmails : contact, admin et réservation) +- Ajouter un date picker dans le formulaire de réservation +- Envoyer devis réservation par mail et notification aux hôtes (personnaliser les htmails : contact, admin et réservation) - Ajout page/module de paiement - ajouter les témoignages depuis Booking, AirBnb, ajouter le lien - changer l'adresse de l'admin, personnaliser le back-end (design et les infos displayed per model) diff --git a/rental/bookings.py b/rental/bookings.py index 9d10609..ca0832b 100644 --- a/rental/bookings.py +++ b/rental/bookings.py @@ -13,7 +13,6 @@ from villafleurie.settings import BASE_DIR def build_calendar_api_service(): """ Build Google Calendar API service and returns calendar list and service """ - creds = None # If modifying these scopes, delete the file token.pickle. SCOPES = [ @@ -38,9 +37,7 @@ def build_calendar_api_service(): # Save the credentials for the next run with open('token.pickle', 'wb') as token: pickle.dump(creds, token) - service = build('calendar', 'v3', credentials=creds) - calendars = { 'T2': "burik7aclvhc7vsboh06c179uo@group.calendar.google.com", 'T3': "fu7h30p0gk4a2p4nvo7nsbgpok@group.calendar.google.com" @@ -51,7 +48,6 @@ def build_calendar_api_service(): def get_calendar_reservations(place): service, calendars = build_calendar_api_service() now = datetime.datetime.utcnow().isoformat() + 'Z' # 'Z' indicates UTC time - events_result = service.events().list( calendarId=calendars[place.name], timeMin=now, @@ -76,7 +72,6 @@ def synchronize_calendars(place): """ Get a complete list of existing bookings in calendar Creates reservation if not in db, update if already in db Delete from db reservation deleted from cal """ - reservation = get_calendar_reservations(place) place = get_object_or_404(Place, name=place.name) price = get_reservation_price( @@ -86,17 +81,14 @@ def synchronize_calendars(place): ) start = reservation['start'] end = reservation['end'] - guest = Guest.objects.filter(name=reservation['guest']) if not guest.exists(): guest = Guest.objects.create(name=reservation['guest']) else: guest = guest.first() - db_booking = Reservation.objects.filter( guest=guest ) - if not db_booking.exists(): Reservation.objects.create( place=place, @@ -116,7 +108,6 @@ def synchronize_calendars(place): def get_bookings(place): """ Synchronize with Master calendar via a call to synchronize_calendar Returns a list of all related place reservations """ - synchronize_calendars(place) booked_dates = Reservation.objects.filter(place=place) return [booking for booking in booked_dates] @@ -124,7 +115,6 @@ def get_bookings(place): def check_availability(place, start_date, end_date): """ check if the related place is available during a given period """ - bookings = get_bookings(place) for booking in bookings: if (booking.start <= start_date <= booking.end) or (booking.start <= end_date <= booking.end): diff --git a/rental/tasks.py b/rental/tasks.py index bab0bc7..9cf0451 100644 --- a/rental/tasks.py +++ b/rental/tasks.py @@ -1,6 +1,7 @@ from __future__ import absolute_import, unicode_literals from celery import shared_task from django.core.mail import send_mail, mail_admins +from django.shortcuts import render from villafleurie.settings import EMAIL_HOST_USER, BASE_DIR from rental.bookings import build_calendar_api_service import os @@ -11,16 +12,24 @@ def send_confirmation_mail(name, email, template="ticket"): """ Send confirmation message to customer """ subject = "Nous avons reçu votre message" message = f" Merci {name}, Bien reçu nous revenons vers vous rapidement ! - HtmlMessage" - html_path = os.path.join(BASE_DIR, 'rental/templates/rental/html/') with open(os.path.join(html_path, f"{template}.html"), 'r') as html: html_message = html.read() + # html_path = os.path.join( + # 'rental/templates/rental/mails/', f"{template}.html") + # context = { + # "name": name, + # "email": email, + # "message": message + # } + # html_message = render(request, html_path, context) send_mail( subject, message, EMAIL_HOST_USER, [email], + # html_message=html_message.content html_message=html_message ) diff --git a/rental/templates/rental/html/activation.html b/rental/templates/rental/mails/activation.html similarity index 100% rename from rental/templates/rental/html/activation.html rename to rental/templates/rental/mails/activation.html diff --git a/rental/templates/rental/html/assigned.html b/rental/templates/rental/mails/assigned.html similarity index 100% rename from rental/templates/rental/html/assigned.html rename to rental/templates/rental/mails/assigned.html diff --git a/rental/templates/rental/html/confirmation.html b/rental/templates/rental/mails/confirmation.html similarity index 100% rename from rental/templates/rental/html/confirmation.html rename to rental/templates/rental/mails/confirmation.html diff --git a/rental/templates/rental/html/expired.html b/rental/templates/rental/mails/expired.html similarity index 100% rename from rental/templates/rental/html/expired.html rename to rental/templates/rental/mails/expired.html diff --git a/rental/templates/rental/html/expiring.html b/rental/templates/rental/mails/expiring.html similarity index 100% rename from rental/templates/rental/html/expiring.html rename to rental/templates/rental/mails/expiring.html diff --git a/rental/templates/rental/html/feedback.html b/rental/templates/rental/mails/feedback.html similarity index 100% rename from rental/templates/rental/html/feedback.html rename to rental/templates/rental/mails/feedback.html diff --git a/rental/templates/rental/html/invitation.html b/rental/templates/rental/mails/invitation.html similarity index 100% rename from rental/templates/rental/html/invitation.html rename to rental/templates/rental/mails/invitation.html diff --git a/rental/templates/rental/html/launch.html b/rental/templates/rental/mails/launch.html similarity index 100% rename from rental/templates/rental/html/launch.html rename to rental/templates/rental/mails/launch.html diff --git a/rental/templates/rental/html/reactivation.html b/rental/templates/rental/mails/reactivation.html similarity index 100% rename from rental/templates/rental/html/reactivation.html rename to rental/templates/rental/mails/reactivation.html diff --git a/rental/templates/rental/html/reset.html b/rental/templates/rental/mails/reset.html similarity index 100% rename from rental/templates/rental/html/reset.html rename to rental/templates/rental/mails/reset.html diff --git a/rental/templates/rental/html/started.html b/rental/templates/rental/mails/started.html similarity index 100% rename from rental/templates/rental/html/started.html rename to rental/templates/rental/mails/started.html diff --git a/rental/templates/rental/html/ticket.html b/rental/templates/rental/mails/ticket.html similarity index 99% rename from rental/templates/rental/html/ticket.html rename to rental/templates/rental/mails/ticket.html index 7030099..5408644 100644 --- a/rental/templates/rental/html/ticket.html +++ b/rental/templates/rental/mails/ticket.html @@ -100,7 +100,7 @@
-
+
diff --git a/rental/templates/rental/html/weekly.html b/rental/templates/rental/mails/weekly.html similarity index 100% rename from rental/templates/rental/html/weekly.html rename to rental/templates/rental/mails/weekly.html diff --git a/rental/templates/rental/html/welcome.html b/rental/templates/rental/mails/welcome.html similarity index 100% rename from rental/templates/rental/html/welcome.html rename to rental/templates/rental/mails/welcome.html diff --git a/villafleurie/settings.py b/villafleurie/settings.py index fe4574f..7ab7dc1 100644 --- a/villafleurie/settings.py +++ b/villafleurie/settings.py @@ -8,7 +8,8 @@ ADMINS = [ ] SECRET_KEY = os.environ.get('SECRET_KEY') -# SECRET_KEY = "q00_4wqdc^n=7)p2lm)!gy&fms8md_b4#1aqysllvqq==2c9!$" +SECRET_KEY = "q00_4wqdc^n=7)p2lm)!gy&fms8md_b4#1aqysllvqq==2c9!$" + if os.environ.get('ENV') == 'PRODUCTION': DEBUG = False @@ -148,6 +149,6 @@ EMAIL_SUBJECT_PREFIX = "[VillaFleurieGuadeloupe] " DEFAULT_FROM_EMAIL = "'Nilka, VillaFleurie' " EMAIL_HOST_USER = "location.villafleurie@gmail.com" EMAIL_HOST_PASSWORD = os.environ.get('EMAIL_HOST_PASSWORD') -# EMAIL_HOST_PASSWORD = "location229818" +EMAIL_HOST_PASSWORD = "location229818" CELERY_BROKER_URL = "amqp://rabbitmq"