version 1.0.3-snapshot

Author: adamspd

MANIFEST.in

@@ -3,6 +3,7 @@ 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 *.py

README.md

@@ -17,60 +17,60 @@ Detailed documentation is in the ["docs"](docs/README.md) directory.
 
 1. Add "appointment" to your INSTALLED_APPS setting like this:
 
-```python
-INSTALLED_APPS = [
-    ...
-    'appointment',
-]
-```
+   ```python
+   INSTALLED_APPS = [
+       # other apps
+       'appointment',
+   ]
+   ```
 
 2. Include the appointment URLconf in your project urls.py like this:
 
-```python
-from django.urls import path, include
-
-urlpatterns = [
-    ...
-    path('appointment/', include('appointment.urls')),
-]
-```
+   ```python
+   from django.urls import path, include
+   
+   urlpatterns = [
+       # other urls
+       path('appointment/', include('appointment.urls')),
+   ]
+   ```
 
 3. In your Django's settings.py, add the following:
 
-```python
-APPOINTMENT_CLIENT_MODEL = file.UserModel  # Not optional (e.g. auth.User, or client.UserClient)
-```
+   ```python
+   APPOINTMENT_CLIENT_MODEL = models.UserModel  # Not optional (e.g. auth.User, or client.UserClient)
+   ```
 
-for example if you use the default Django user model:
+   For example, if you use the default Django user model:
 
-```python
-APPOINTMENT_CLIENT_MODEL = auth.User
-```
+   ```python
+   APPOINTMENT_CLIENT_MODEL = auth.User
+   ```
 
-or if you use a custom user model:
+   Or, if you use a custom user model:
 
-```python
-APPOINTMENT_CLIENT_MODEL = client.UserClient
-```
+   ```python
+   APPOINTMENT_CLIENT_MODEL = client.UserClient
+   ```
 
-Now if you have a custom user model, in your function create_user, you have to have the following arguments even if you
-don't use all of them:
+   If you have a custom user model, make sure your create_user function includes the following arguments, even if you
+   don't use all of them:
 
-```python
-def create_user(first_name, email, username, **extra_fields):
-    pass
-```
+   ```python
+   def create_user(first_name, email, username, **extra_fields):
+       pass
+   ```
 
-This will create a user with the password = f"{APPOINTMENT_WEBSITE_NAME}{current_year}"
+   This will create a user with a password in the format: f"{APPOINTMENT_WEBSITE_NAME}{current_year}"
 
-For example if you put in your settings.py:
+   For example, if you add this to your settings.py:
 
-```python
-APPOINTMENT_WEBSITE_NAME = 'Chocolates'
-```
+   ```python
+   APPOINTMENT_WEBSITE_NAME = 'Chocolates'
+   ```
 
-and the current year is 2023, the password will be "Chocolates2023" if you don't provide an APPOINTMENT_WEBSITE_NAME,
-the default value is "Website", so the password will be "Website2023".
+   And the current year is 2023, the password will be "Chocolates2023". If you don't provide an
+   APPOINTMENT_WEBSITE_NAME, the default value is "Website", so the password will be "Website2023".
 
 4. Run `python manage.py migrate` to create the appointment models.
 
@@ -90,18 +90,18 @@ the default value is "Website", so the password will be "Website2023".
 
 1. In your Django project's settings.py, you can override the default values for the appointment scheduler:
 
-```python
-# Default values
-APPOINTMENT_SLOT_DURATION = 30  # minutes
-APPOINTMENT_LEAD_TIME = (9, 0)  # (hour, minute) 24-hour format
-APPOINTMENT_FINISH_TIME = (16, 30)  # (hour, minute) 24-hour format
-
-# Additional configuration options
-APPOINTMENT_BASE_TEMPLATE = 'base_templates/base.html'  # your base template
-APPOINTMENT_WEBSITE_NAME = 'Website'
-APPOINTMENT_PAYMENT_URL = None
-APPOINTMENT_THANK_YOU_URL = None
-```
+   ```python
+   # Default values
+   APPOINTMENT_SLOT_DURATION = 30  # minutes
+   APPOINTMENT_LEAD_TIME = (9, 0)  # (hour, minute) 24-hour format
+   APPOINTMENT_FINISH_TIME = (16, 30)  # (hour, minute) 24-hour format
+   
+   # Additional configuration options
+   APPOINTMENT_BASE_TEMPLATE = 'base_templates/base.html'  # your base template
+   APPOINTMENT_WEBSITE_NAME = 'Website'
+   APPOINTMENT_PAYMENT_URL = None # example of pattern 'payment:payment_linked
+   APPOINTMENT_THANK_YOU_URL = None # example of pattern 'payment:thank_you'
+   ```
 
 2. Modify these values as needed for your application, and the scheduler will adapt to the new settings.
 

appointment/models.py

@@ -19,6 +19,7 @@ class Service(models.Model):
     description = models.TextField(blank=True, null=True)
     duration = models.DurationField()
     price = models.DecimalField(max_digits=6, decimal_places=2)
+    down_payment = models.DecimalField(max_digits=6, decimal_places=2, default=0)
     currency = models.CharField(max_length=3, default='USD')
     image = models.ImageField(upload_to='services/', blank=True, null=True)
 
@@ -41,6 +42,9 @@ def get_duration(self):
     def get_price(self):
         return self.price
 
+    def get_down_payment(self):
+        return self.down_payment
+
     def get_currency(self):
         return self.currency
 
@@ -100,6 +104,9 @@ def get_service_duration(self):
     def get_service_price(self):
         return self.service.get_price()
 
+    def get_service_down_payment(self):
+        return self.service.get_down_payment()
+
     def get_service_image(self):
         return self.service.get_image()
 
@@ -159,6 +166,9 @@ def get_service_name(self):
     def get_service_price(self):
         return self.appointment_request.get_service_price()
 
+    def get_service_down_payment(self):
+        return self.appointment_request.get_service_down_payment()
+
     def get_service_img(self):
         return self.appointment_request.get_service_image()
 
@@ -201,6 +211,10 @@ def get_created_at(self):
     def get_updated_at(self):
         return self.updated_at
 
+    def set_appointment_paid_status(self, status: bool):
+        self.paid = status
+        self.save()
+
 
 class Config(models.Model):
     slot_duration = models.PositiveIntegerField(
@@ -253,3 +267,8 @@ def get_name(self):
 
     def get_img_url(self):
         return self.appointment.get_service_img_url()
+
+    def set_paid_status(self, status: bool):
+        self.appointment.set_appointment_paid_status(status)
+
+

appointment/settings.py

@@ -1,6 +1,6 @@
 from django.conf import settings
 
-APPOINTMENT_CLIENT_MODEL = getattr(settings, 'APPOINTMENT_CLIENT_MODEL')
+APPOINTMENT_CLIENT_MODEL = getattr(settings, 'APPOINTMENT_CLIENT_MODEL', 'auth.User')
 APPOINTMENT_BASE_TEMPLATE = getattr(settings, 'APPOINTMENT_BASE_TEMPLATE', 'base_templates/base.html')
 APPOINTMENT_WEBSITE_NAME = getattr(settings, 'APPOINTMENT_WEBSITE_NAME', 'Website')
 APPOINTMENT_PAYMENT_URL = getattr(settings, 'APPOINTMENT_PAYMENT_URL', None)

appointment/templates/appointment/appointment_client_information.html

@@ -105,9 +105,21 @@ <h1 class="description-title">{% trans "Tell us a bit about yourself" %}</h1>
                                 <div>{% trans "Total" %}</div>
                                 <div>${{ ar.get_service_price }}</div>
                             </div>
+                            <div class="payment-options">
+                                <button type="submit" class="btn btn-dark btn-pay-full" name="payment_type"
+                                        value="full_payment">
+                                    {% trans "Pay" %}
+                                </button>
+                                <button type="submit" class="btn btn-dark btn-pay-down-payment" name="payment_type"
+                                        value="down_payment">
+                                    {% trans "Pay DP" %} (${{ ar.get_service_down_payment }})
+                                </button>
+                            </div>
                         </div>
+                    {% else %}
+                        <button type="submit" class="btn btn-dark btn-submit-appointment">{{ buttonNext }}</button>
                     {% endif %}
-                    <button type="submit" class="btn btn-dark btn-submit-appointment">{{ buttonNext }}</button>
+
                 </div>
             </form>
         </div>

appointment/templates/email_sender/thank_you_email.html

@@ -0,0 +1,82 @@
+{% load i18n %}
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            background-color: #f5f5f5;
+            margin: 0;
+            padding: 0;
+        }
+
+        .email-container {
+            max-width: 600px;
+            margin: 0 auto;
+            padding: 20px;
+            background-color: #ffffff;
+            border-radius: 4px;
+        }
+
+        .header {
+            text-align: center;
+            padding: 20px;
+        }
+
+        .header h1 {
+            font-size: 24px;
+            color: #333333;
+            margin: 0;
+        }
+
+        .content {
+            padding: 20px;
+            line-height: 1.5;
+            color: #333333;
+        }
+
+        .footer {
+            text-align: center;
+            padding: 20px;
+            font-size: 12px;
+            color: #999999;
+        }
+    </style>
+</head>
+<body>
+<div class="email-container">
+    <div class="header">
+        <h1>{% trans "Your booking session request has been accepted" %}!</h1>
+    </div>
+    <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 %}
+        </p>
+        <p>
+            {% blocktranslate %}
+                If you have any questions or need assistance, please don't hesitate to reach out to our support team.
+            {% endblocktranslate %}
+        </p>
+        <p>{% trans "Best regards" %},</p>
+        <p>{% trans "The Team" %}</p>
+    </div>
+    <div class="footer">
+        &copy; {{ current_year }} {{ company }}. {% trans "All rights reserved" %}.
+    </div>
+</div>
+</body>
+</html>

appointment/views.py

@@ -13,6 +13,7 @@
 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 .settings import (APPOINTMENT_CLIENT_MODEL, APPOINTMENT_BASE_TEMPLATE, APPOINTMENT_WEBSITE_NAME,
                        APPOINTMENT_PAYMENT_URL, APPOINTMENT_THANK_YOU_URL)
 
@@ -132,6 +133,7 @@ def appointment_client_information(request, appointment_request_id, id_request):
             'name': request.POST.get('name'),
             'email': request.POST.get('email'),
         }
+        payment_type = request.POST.get('payment_type')
         logger.info(f"Form data: {appointment_data} {client_data}")
 
         # Check if email is already in the database
@@ -148,10 +150,24 @@ def appointment_client_information(request, appointment_request_id, id_request):
         password = f"{APPOINTMENT_WEBSITE_NAME}{Utility.get_current_year()}"
         user.password = make_password(password=password)
         user.save()
+
+        # Email the user
+        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()},
+        )
         messages.success(request, _("An account was created for you."))
 
         # Create a new appointment
         appointment = Appointment.objects.create(client=user, appointment_request=ar, **appointment_data)
+        if payment_type == 'full_payment':
+            appointment.amount_to_pay = appointment.get_service_price()
+        elif payment_type == 'down_payment':
+            appointment.amount_to_pay = appointment.get_service_down_payment()
         appointment.save()
 
         logger.info(

email_sender/__init__.py

@@ -0,0 +1,39 @@
+from django.core.mail import mail_admins, send_mail
+from django.template import loader
+
+
+def send_email(recipient_list, subject: str, template_url: str = None, context: dict = None, from_email=None,
+               message: str = None):
+    if from_email is None:
+        from_email = '[email protected]'
+
+    html_message = ""
+
+    if template_url:
+        html_message = loader.render_to_string(
+            template_name=template_url,
+            context=context
+        )
+
+    send_mail(
+        subject=subject,
+        message=message if not template_url else "",
+        html_message=html_message if template_url else None,
+        from_email=from_email,
+        recipient_list=recipient_list,
+        fail_silently=False,
+    )
+
+
+def notify_admin(subject: str, template_url: str = None, context: dict = None, message: str = None):
+    html_message = ""
+    if template_url:
+        html_message = loader.render_to_string(
+            template_name=template_url,
+            context=context
+        )
+    mail_admins(
+        subject=subject,
+        message=message if not template_url else "",
+        html_message=html_message if template_url else None
+    )