diff --git a/car_inventory/__pycache__/settings.cpython-311.pyc b/car_inventory/__pycache__/settings.cpython-311.pyc
index 398c131a..165fdde1 100644
Binary files a/car_inventory/__pycache__/settings.cpython-311.pyc and b/car_inventory/__pycache__/settings.cpython-311.pyc differ
diff --git a/inventory/__pycache__/forms.cpython-311.pyc b/inventory/__pycache__/forms.cpython-311.pyc
index b7d0f1a6..eb66006b 100644
Binary files a/inventory/__pycache__/forms.cpython-311.pyc and b/inventory/__pycache__/forms.cpython-311.pyc differ
diff --git a/inventory/__pycache__/mixins.cpython-311.pyc b/inventory/__pycache__/mixins.cpython-311.pyc
index a098233c..6bcef338 100644
Binary files a/inventory/__pycache__/mixins.cpython-311.pyc and b/inventory/__pycache__/mixins.cpython-311.pyc differ
diff --git a/inventory/__pycache__/models.cpython-311.pyc b/inventory/__pycache__/models.cpython-311.pyc
index 17a6662e..68d5f230 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 df997e16..2f40588c 100644
Binary files a/inventory/__pycache__/urls.cpython-311.pyc and b/inventory/__pycache__/urls.cpython-311.pyc differ
diff --git a/inventory/__pycache__/utils.cpython-311.pyc b/inventory/__pycache__/utils.cpython-311.pyc
index 6aa2a8a8..24d1001e 100644
Binary files a/inventory/__pycache__/utils.cpython-311.pyc and b/inventory/__pycache__/utils.cpython-311.pyc differ
diff --git a/inventory/__pycache__/views.cpython-311.pyc b/inventory/__pycache__/views.cpython-311.pyc
index e52deaf8..04480929 100644
Binary files a/inventory/__pycache__/views.cpython-311.pyc and b/inventory/__pycache__/views.cpython-311.pyc differ
diff --git a/inventory/mixins.py b/inventory/mixins.py
index b7762382..966a8666 100644
--- a/inventory/mixins.py
+++ b/inventory/mixins.py
@@ -2,17 +2,16 @@ from django import forms
from django.utils.translation import get_language
-
class AddClassMixin:
"""
- Mixin for adding classes to form fields and wrapping them in a div with class 'form-floating'.
+ Mixin for adding classes to a model.
"""
def add_class_to_fields(self):
"""
- Adds the class to the fields of the form and wraps them in a div with class 'form-floating'.
+ Adds the class to the fields of the model.
+ :return: class names form-control or form-select
"""
for field_name, field in self.fields.items():
- # Add classes to the field
if isinstance(field.widget, forms.Select):
existing_classes = field.widget.attrs.get('class', '')
field.widget.attrs['class'] = f"{existing_classes} form-select form-select-sm".strip()
@@ -20,23 +19,6 @@ class AddClassMixin:
existing_classes = field.widget.attrs.get('class', '')
field.widget.attrs['class'] = f"{existing_classes} form-control form-control-sm".strip()
- # Wrap the field in a div with class 'form-floating'
- field.widget.attrs['wrapper_class'] = 'form-floating'
-
- def __init__(self, *args, **kwargs):
- super().__init__(*args, **kwargs)
- self.add_class_to_fields()
-
- def __getitem__(self, name):
- """
- Overrides the __getitem__ method to wrap the field in a div with class 'form-floating'.
- """
- field = super().__getitem__(name)
- wrapper_class = field.field.widget.attrs.pop('wrapper_class', None)
- if wrapper_class:
- field = forms.utils.safety.mark_safe(f'
');
+ }
+ }
+});
+
+$('#staff_id').on('change', function () {
+ staffId = $(this).val() || null; // If staffId is an empty string, set it to null
+ let currentDate = null
+ if (selectedDate == null) {
+ currentDate = moment.tz(timezone).format('YYYY-MM-DD');
+ } else {
+ currentDate = selectedDate;
+ }
+ fetchNonWorkingDays(staffId, function (newNonWorkingDays) {
+ nonWorkingDays = newNonWorkingDays; // Update the nonWorkingDays array
+ calendar.render(); // Re-render the calendar to apply changes
+
+ // Fetch available slots for the current date
+ getAvailableSlots(currentDate, staffId);
+ });
+});
+
+
+function fetchNonWorkingDays(staffId, callback) {
+ if (!staffId || staffId === 'none') {
+ nonWorkingDays = []; // Reset nonWorkingDays
+ calendar.render(); // Re-render the calendar
+ callback([]);
+ return; // Exit the function early
+ }
+ let ajaxData = {
+ 'staff_member': staffId,
+ };
+
+ $.ajax({
+ url: getNonWorkingDaysURL,
+ data: ajaxData,
+ dataType: 'json',
+ success: function (data) {
+ if (data.error) {
+ console.error('Error fetching non-working days:', data.message);
+ callback([]);
+ } else {
+ nonWorkingDays = data.non_working_days;
+ calendar.render();
+ callback(data.non_working_days);
+ }
+ }
+ });
+}
+
+function getDateWithoutTime(dt) {
+ dt.setHours(0, 0, 0, 0);
+ return dt;
+}
+
+function convertTo24Hour(time12h) {
+ const [time, modifier] = time12h.split(' ');
+ let [hours, minutes] = time.split(':');
+
+ if (hours === '12') {
+ hours = '00';
+ }
+
+ if (modifier.toUpperCase() === 'PM') {
+ hours = parseInt(hours, 10) + 12;
+ }
+
+ return `${hours}:${minutes}`;
+}
+
+function formatTime(date) {
+ const hours = date.getHours();
+ const minutes = date.getMinutes();
+ return (hours < 10 ? '0' + hours : hours) + ':' + (minutes < 10 ? '0' + minutes : minutes);
+}
+
+function getAvailableSlots(selectedDate, staffId = null) {
+ // Update the slot list with the available slots for the selected date
+ const slotList = $('#slot-list');
+ const slotContainer = $('.slot-container');
+ const errorMessageContainer = $('.error-message');
+
+ // Clear previous error messages and slots
+ slotList.empty();
+ errorMessageContainer.find('.djangoAppt_no-availability-text').remove();
+
+ // Remove the "Next available date" message
+ nextAvailableDateSelector = $('.djangoAppt_next-available-date'); // Update the selector
+ nextAvailableDateSelector.remove();
+
+ // Correctly check if staffId is 'none', null, or undefined and exit the function if true
+ // Check if 'staffId' is 'none', null, or undefined and display an error message
+ if (staffId === 'none' || staffId === null || staffId === undefined) {
+ console.log('No staff ID provided, displaying error message.');
+ const errorMessage = $('
' + noStaffMemberSelectedTxt + '
');
+ errorMessageContainer.append(errorMessage);
+ // Optionally disable the "submit" button here
+ $('.btn-submit-appointment').attr('disabled', 'disabled');
+ return; // Exit the function early
+ }
+
+ let ajaxData = {
+ 'selected_date': selectedDate,
+ 'staff_member': staffId,
+ };
+ fetchNonWorkingDays(staffId, function (nonWorkingDays) {
+ // Check if nonWorkingDays is an array
+ if (Array.isArray(nonWorkingDays)) {
+ // Update the FullCalendar configuration
+ // calendar.setOption('hiddenDays', nonWorkingDays);
+ } else {
+ // Handle the case where there's an error or no data
+ // For now, we'll just log it, but you can handle it more gracefully if needed
+ console.error('Failed to get non-working days:', nonWorkingDays);
+ }
+ });
+
+ // Send an AJAX request to get the available slots for the selected date
+ if (isRequestInProgress) {
+ return; // Exit the function if a request is already in progress
+ }
+ isRequestInProgress = true;
+ $.ajax({
+ url: availableSlotsAjaxURL,
+ data: ajaxData,
+ dataType: 'json',
+ success: function (data) {
+ if (data.available_slots.length === 0) {
+ const selectedDateObj = moment.tz(selectedDate, timezone);
+ const selectedD = selectedDateObj.toDate();
+ const today = new Date();
+ today.setHours(0, 0, 0, 0);
+
+ if (selectedD < today) {
+ // Show an error message
+ errorMessageContainer.append('
+
+
+
+
+ {% trans "Days off are days you're not working, you need to set them for holidays as well so clients don't book you those days." %}
+
+
+
+
+
+
{% trans 'Start date' %}
+
{% trans 'End date' %}
+
{% trans 'Description' %}
+
{% trans 'Action' %}
+
+
+
+ {% for day_off in days_off %}
+
+
{{ day_off.start_date }}
+
{{ day_off.end_date }}
+
{{ day_off.description }}
+
+
+ {% if superuser %}
+
+
+
+ {% else %}
+
+
+
+ {% endif %}
+ {% translate "Are you sure you want to delete this working hours?" as d_modal_message %}
+ {% if superuser %}
+
+
+
+ {% else %}
+
+
+
+ {% endif %}
+
+
+
+ {% empty %}
+
+
{% trans 'No days off have been set' %}.
+
+ {% endfor %}
+
+
+
+
+
+
+
+
{% trans 'Working Hours' %}
+
+
+
+
+ {% trans "Note: If you are a staff member, your working hours will be used to determine when you are available for appointments." %}
+
+
+
+
+
+
{% trans 'Day' %}
+
{% trans 'Start time' %}
+
{% trans 'End time' %}
+
{% trans 'Action' %}
+
+
+
+ {% for working_hour in working_hours %}
+
+
{{ working_hour.get_day_of_week_str }}
+
{{ working_hour.start_time|time:"g:i A" }}
+
{{ working_hour.end_time|time:"g:i A" }}
+
+
+ {% if superuser %}
+
+
+
+ {% else %}
+
+
+
+ {% endif %}
+ {% translate "Are you sure you want to delete this working hours?" as w_modal_message %}
+ {% if superuser %}
+
+
+
+ {% else %}
+
+
+
+ {% endif %}
+
+
+
+ {% empty %}
+
+
{% trans 'No working hours have been set' %}.
+
+ {% endfor %}
+
+
+
+
+
+
+
+
{% trans 'Service Offered' %}
+
+ {% if not superuser %}
+ {% trans "To add/modify a new service, make a request to an admin." %}
+ {% trans "Changes made in one service will change it for every staff member." %}
+ {% endif %}
+
+
+
+
+
+
{% trans 'Name' %}
+
{% trans 'Description' %}
+
{% trans 'Duration' %}
+
{% trans 'Price' %}
+
{% trans 'Down payment' %}
+
+
+
+ {% for service in services_offered %}
+
+
{{ service.name }}
+
{{ service.description|default:"N/A" }}
+
{{ service.get_duration }}
+
{{ service.get_price_text }}
+
{{ service.get_down_payment_text }}
+
+ {% empty %}
+
+
{% trans 'No service offered yet' %}.
+
+ {% endfor %}
+
+
+
+
+
+
+ {% include 'modal/confirm_modal.html' %}
+
+{% endblock %}
+{% block customJS %}
+
+
+
+
+
+
+
+
+
+{% endblock %}
+
diff --git a/templates/appointment/appointment_client_information.html b/templates/appointment/appointment_client_information.html
new file mode 100644
index 00000000..acac34a0
--- /dev/null
+++ b/templates/appointment/appointment_client_information.html
@@ -0,0 +1,165 @@
+{% extends BASE_TEMPLATE %}
+{% load i18n %}
+{% load static %}
+{% block customCSS %}
+
+{% endblock %}
+{% block title %}
+ {% translate 'Client Information' %} - {{ ar.get_service_name }}
+{% endblock %}
+{% block description %}
+ {% blocktranslate with service_name=ar.get_service_name %}
+ Your appointment request for {{ service_name }} has been submitted.
+ Please provide your information to create an account and complete the payment process.
+ {% endblocktranslate %}
+{% endblock %}
+{% block body %}
+
+
+ {% if messages %}
+ {% for message in messages %}
+
{% trans "We've successfully scheduled your appointment! Please check your email for all the details" %}.
+
{% trans "Appointment details" %}:
+
+
{% trans 'Service' %}: {{ appointment.get_service_name }}
+
{% trans 'Appointment Date' %}: {{ appointment.get_appointment_date }}
+
{% trans 'Appointment Time' %}: {{ appointment.get_start_time }}
+
{% trans 'Duration' %}: {{ appointment.get_service_duration }}
+
+ {% if messages %}
+ {% for message in messages %}
+
{{ message }}
+ {% endfor %}
+ {% endif %}
+
+
+{% endblock %}
+{% block customJS %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/appointment/enter_verification_code.html b/templates/appointment/enter_verification_code.html
new file mode 100644
index 00000000..6b157a11
--- /dev/null
+++ b/templates/appointment/enter_verification_code.html
@@ -0,0 +1,39 @@
+{% extends BASE_TEMPLATE %}
+{% load i18n %}
+{% load static %}
+
+{% block customCSS %}
+
+{% endblock %}
+
+{% block title %}{% trans 'Enter Verification Code' %}{% endblock %}
+{% block description %}{% trans 'Enter Verification Code' %}{% endblock %}
+
+{% block body %}
+
+
+
{% trans 'Enter Verification Code' %}
+
{% trans "We've sent a verification code to your email. Please enter it below" %}:
+
+
+
+ {% if messages %}
+ {% for message in messages %}
+
+ {{ message }}
+
+ {% endfor %}
+ {% endif %}
+
+
+{% endblock %}
+
+{% block customJS %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/appointment/rescheduling_thank_you.html b/templates/appointment/rescheduling_thank_you.html
new file mode 100644
index 00000000..715c917a
--- /dev/null
+++ b/templates/appointment/rescheduling_thank_you.html
@@ -0,0 +1,79 @@
+{% extends BASE_TEMPLATE %}
+{% load i18n %}
+{% load static %}
+{% block customCSS %}
+
+{% endblock %}
+{% block title %}
+ {% trans "Rescheduling Successful" %}
+{% endblock %}
+{% block description %}
+ {% trans "Your appointment rescheduling was successful. Please confirm via email." %}
+{% endblock %}
+{% block body %}
+
+
+
+
{% trans "Rescheduling Successful" %}
+
{% trans "Your appointment rescheduling request has been successfully submitted. Please check your email and click on the confirmation link to finalize the rescheduling process." %}
+ {% blocktranslate with link=activation_link %}
+ To activate your account and set your password, please use the following secure
+ link: Set Your Password. Please
+ note that this link will expire in 2 days for your security.
+ {% endblocktranslate %}
+
+ {% blocktranslate %}
+ Should you have any inquiries or require further assistance, our support team is here to
+ help. You can reach us anytime.
+ {% endblocktranslate %}
+
+
+ {% trans "We look forward to serving you and ensuring that your experience with us is both rewarding and satisfactory." %}
+