Fix redirection to thank you when service is free

Author: adamspd

appointment/models.py

@@ -542,6 +542,9 @@ def is_paid(self):
             return True
         return self.paid
 
+    def service_is_paid(self):
+        return self.get_service_price() != 0
+
     def is_paid_text(self):
         return _("Yes") if self.is_paid() else _("No")
 

appointment/utils/db_helpers.py

@@ -240,7 +240,7 @@ def parse_name(name: str):
 def create_user_with_email(client_data: dict):
     CLIENT_MODEL = get_user_model()
     # Valid fields
-    valid_fields = ['email', 'first_name', 'last_name', 'username']
+    valid_fields = ['email', 'first_name', 'last_name']
 
     # Filter client_data to include only valid fields
     user_data = {field: client_data.get(field, '') for field in valid_fields}

appointment/views.py

@@ -265,17 +265,17 @@ def redirect_to_payment_or_thank_you_page(appointment):
     :param appointment: The Appointment instance.
     :return: The redirect response.
     """
-    if APPOINTMENT_PAYMENT_URL is not None and APPOINTMENT_PAYMENT_URL != '':
+    if (APPOINTMENT_PAYMENT_URL is not None and APPOINTMENT_PAYMENT_URL != '') and appointment.service_is_paid():
         payment_url = create_payment_info_and_get_url(appointment)
         return HttpResponseRedirect(payment_url)
-    elif APPOINTMENT_THANK_YOU_URL is not None and APPOINTMENT_THANK_YOU_URL != '':
-        thank_you_url = reverse(APPOINTMENT_THANK_YOU_URL, kwargs={'appointment_id': appointment.id})
-        return HttpResponseRedirect(thank_you_url)
     else:
-        # Redirect to your default thank you page and pass the appointment object ID
-        return HttpResponseRedirect(
-            reverse('appointment:default_thank_you', kwargs={'appointment_id': appointment.id})
-        )
+        # Determine the correct thank-you URL based on whether APPOINTMENT_THANK_YOU_URL is provided and not empty
+        thank_you_url_key = 'appointment:default_thank_you'
+        if APPOINTMENT_THANK_YOU_URL:
+            thank_you_url_key = APPOINTMENT_THANK_YOU_URL
+
+        thank_you_url = reverse(thank_you_url_key, kwargs={'appointment_id': appointment.id})
+        return HttpResponseRedirect(thank_you_url)
 
 
 def create_appointment(request, appointment_request_obj, client_data, appointment_data):