Merge branch 'main' into 'brodybranch'

# Conflicts:
#   myproject/myapp/payments.py
#   myproject/myapp/urls.py

myproject/myapp/payments.py

@@ -46,7 +46,6 @@ def create_payment(request):
         }]
     })
 
-
     # Successfully communicated with API 
     if payment.create():
         print("Payment created successfully!")

myproject/myapp/urls.py

 from django.urls import path
-
-
 from .views import InstrumentDetectionView, index, users, maintenance, handler404, handler500, terms_conditions, privacy_policy, handling_music_file, pricing, generate_pdf, admin_table
 from .payments import create_payment, execute_payment, payment_cancelled, payment_success
 from django.contrib.auth import views as auth_views
@@ -29,6 +27,10 @@ urlpatterns = [
     path('password_change/', auth_views.PasswordChangeView.as_view(template_name='password_change_form.html'), name='password_change'),
     path('password_change/done/', auth_views.PasswordChangeDoneView.as_view(template_name='password_change_done.html'), name='password_change_done'),
     # path('user_logout/', auth_views.LogoutView.as_view(next_page='index'), name='user_logout'),
+    path('payment/create/', create_payment, name='create_payment'),
+    path('payment/execute/', execute_payment, name='execute_payment'),
+    path('payment/cancel/', payment_cancelled, name='payment_cancelled'),
+    path('payment_success/', payment_success, name='success'),
 
     # Authentication
     path('login/', CustomLoginView.as_view(), name='login'),