Merge branch 'fix/external-payment' into 'master'

fix for api assuming non external registration

Closes #822

See merge request !1162

website/events/api/viewsets.py

@@ -181,7 +181,7 @@ class RegistrationViewSet(GenericViewSet, RetrieveModelMixin,
 
     def get_object(self):
         instance = super().get_object()
-        if (instance.member.pk != self.request.member.pk and
+        if ((instance.name or instance.member.pk != self.request.member.pk) and
                 not services.is_organiser(self.request.member,
                                           instance.event)):
             raise NotFound()

website/events/services.py

@@ -254,12 +254,17 @@ def update_registration_by_organiser(registration, member, data):
             registration.payment.save()
         elif (data['payment']['type'] != Payment.NONE
               and registration.payment is None):
+
+            note = f'Event registration {registration.event.title_en}. '
+            if registration.name:
+                note += f'Paid by {registration.name}. '
+            note += (f'{registration.event.start}. '
+                     f'Registration date: {registration.date}.')
+
             registration.payment = Payment.objects.create(
                 amount=registration.event.price,
                 paid_by=registration.member,
-                notes=(f'Event registration {registration.event.title_en}'
-                       f'{registration.event.start}. '
-                       f'Registration date: {registration.date}.'),
+                notes=note,
                 processed_by=member,
                 type=data['payment']['type']
             )

website/payments/admin.py

@@ -48,8 +48,12 @@ class PaymentAdmin(admin.ModelAdmin):
 
     @staticmethod
     def _member_link(member):
-        return format_html("<a href='{}'>{}</a>", member.get_absolute_url(),
-                           member.get_full_name())
+        if member:
+            return format_html("<a href='{}'>{}</a>",
+                               member.get_absolute_url(),
+                               member.get_full_name())
+        else:
+            return "-"
 
     def paid_by_link(self, obj):
         return self._member_link(obj.paid_by)