version 1.0.3-snapshot

Author: adamspd

MANIFEST.in

@@ -1,10 +1,10 @@
 include LICENSE
 include README.md
-recursive-include appointment/migrations *.py
 recursive-include appointment/templates/appointment *.html
 recursive-include appointment/templates/base_templates *.html
 recursive-include appointment/templates/email_sender *.html
 recursive-include appointment/static/css *.css
 recursive-include appointment/static/js *.js
+recursive-include appointment/email_sender *.py
 recursive-include appointment *.py
 recursive-include docs *

appointment/email_messages.py

@@ -0,0 +1,5 @@
+thank_you_no_payment = f"We're excited to have you on board! Thank you for booking us. " \
+                       f"We hope you enjoy using our services and find them valuable."
+thank_you_payment = f"We're excited to have you on board! Thank you for booking us. The next step is to pay for " \
+                    f"the booking. You have the choice to pay the whole amount or a down deposit. " \
+                    f"If you choose the deposit, you will have to pay the rest of the amount on the day of the booking."

appointment/email_sender/__init__.py

@@ -0,0 +1 @@
+from .email_sender import send_email, notify_admin

email_sender/email_sender.py renamed to appointment/email_sender/email_sender.py

@@ -271,4 +271,7 @@ def get_img_url(self):
     def set_paid_status(self, status: bool):
         self.appointment.set_appointment_paid_status(status)
 
+    def get_user(self):
+        return self.appointment.get_client()
+
 

appointment/models.py

@@ -53,18 +53,7 @@ <h1>{% trans "Your booking session request has been accepted" %}!</h1>
     <div class="content">
         <p>{% trans "Hello" %} {{ first_name }},</p>
         <p>
-            {% if not payment %}
-                {% blocktranslate %}
-                    We're excited to have you on board! Thank you for booking us. We hope you enjoy using our services
-                    and find them valuable.
-                {% endblocktranslate %}
-            {% else %}
-                {% blocktranslate %}
-                    We're excited to have you on board! Thank you for booking us. The next step is to pay for the
-                    booking. You have the choice to pay the whole amount or a ${{ deposit }} down deposit. If you choose
-                    the deposit, you will have to pay the rest of the amount on the day of the booking.
-                {% endblocktranslate %}
-            {% endif %}
+            {{ message }}
         </p>
         <p>
             {% blocktranslate %}

appointment/templates/email_sender/thank_you_email.html

@@ -13,7 +13,8 @@
 from appointment.forms import AppointmentRequestForm
 from appointment.models import Service, Appointment, AppointmentRequest, PaymentInfo
 from appointment.utils import Utility
-from email_sender.email_sender import send_email
+from appointment.email_sender import send_email
+from . import email_messages
 from .settings import (APPOINTMENT_CLIENT_MODEL, APPOINTMENT_BASE_TEMPLATE, APPOINTMENT_WEBSITE_NAME,
                        APPOINTMENT_PAYMENT_URL, APPOINTMENT_THANK_YOU_URL)
 
@@ -152,13 +153,16 @@ def appointment_client_information(request, appointment_request_id, id_request):
         user.save()
 
         # Email the user
+        message = email_messages.thank_you_no_payment if APPOINTMENT_PAYMENT_URL is None else email_messages.thank_you_payment
+        email_context = {
+            'first_name': user.first_name,
+            'message': message,
+            'current_year': datetime.datetime.now().year,
+            'company': APPOINTMENT_WEBSITE_NAME
+        }
         send_email(
             recipient_list=[client_data['email']], subject="Thank you for booking us.",
-            template_url='email_sender/thank_you_email.html', context={'first_name': user.first_name,
-                                                                       'current_year': datetime.datetime.now().year,
-                                                                       'company': APPOINTMENT_WEBSITE_NAME,
-                                                                       'payment': APPOINTMENT_PAYMENT_URL is not None,
-                                                                       'deposit': ar.get_service_down_payment()},
+            template_url='email_sender/thank_you_email.html', context=email_context
         )
         messages.success(request, _("An account was created for you."))