Apply suggestion from @raphaelm

src/pretix/api/serializers/media.py

@@ -197,8 +197,6 @@ class ReusableMediaSerializer(I18nAwareModelSerializer):
             'linked_giftcard',
             'info',
             'notes',
-            # When adding fields, check if they should be hidden in ReusableMediaViewSet
-            # for cross-organizer lookups
         )
 
 

src/pretix/api/views/media.py

@@ -183,18 +183,9 @@ class ReusableMediaViewSet(viewsets.ModelViewSet):
                         type=s.validated_data["type"],
                         identifier=s.validated_data["identifier"],
                     )
+                m.customer = None  # not relevant for cross-organizer
                 s = self.get_serializer(m)
-                data = s.data
-                # Remove fields that are not relevant for cross-organizer usage
-                data["customer"] = None
-                data["linked_orderposition"] = None
-                data["linked_orderpositions"] = []
-                data["info"] = {}
-                data["notes"] = None
-                data["claim_token"] = None
-                data["label"] = None
-
-                return Response({"result": data})
+                return Response({"result": s.data})
             except ReusableMedium.DoesNotExist:
                 mt = MEDIA_TYPES.get(s.validated_data["type"])
                 if mt:

src/pretix/presale/templates/pretixpresale/event/checkout_customer.html

@@ -55,7 +55,7 @@
                             <div class="col-md-6 col-md-offset-3">
                                 {% for provider in request.organizer.sso_providers.all %}
                                     {% if provider.is_active %}
-                                        <a href="{% abseventurl request.organizer "presale:organizer.customer.login" provider=provider.pk %}?next={% if request.domain_mode == 'event' or request.domain_mode == 'organizer_alternative' %}{{ request.scheme }}://{{ request.get_host }}{% endif %}{{ request.get_full_path|urlencode }}"
+                                        <a href="{% eventurl request.organizer "presale:organizer.customer.login" provider=provider.pk %}?next={% if request.domain_mode == 'event' or request.domain_mode == 'organizer_alternative' %}{{ request.scheme }}://{{ request.get_host }}{% endif %}{{ request.get_full_path|urlencode }}"
                                            class="btn btn-primary btn-lg btn-block" data-open-in-popup-window>
                                             {{ provider.button_label }}
                                         </a>

src/pretix/presale/views/order.py

@@ -76,7 +76,7 @@ from pretix.base.models.tax import TaxedPrice
 from pretix.base.payment import PaymentException
 from pretix.base.services.invoices import (
     generate_cancellation, generate_invoice, invoice_pdf, invoice_pdf_task,
-    invoice_qualified, transmit_invoice,
+    invoice_qualified,
 )
 from pretix.base.services.orders import (
     OrderChangeManager, OrderError, _try_auto_refund, cancel_order,
@@ -907,9 +907,6 @@ class OrderModify(EventViewMixin, OrderDetailMixin, OrderQuestionsViewMixin, Tem
                         self.order.log_action('pretix.event.order.invoice.reissued', data={
                             'invoice': inv.pk
                         })
-                        transmit_invoice.apply_async(args=(c.event_id, c.pk, True))
-                        if c.pk != inv.pk:
-                            transmit_invoice.apply_async(args=(inv.event_id, inv.pk, True))
                         messages.success(self.request, _('The invoice has been reissued.'))
                 except Exception as e:
                     self.order.log_action("pretix.event.order.invoice.failed", data={

src/tests/api/test_reusable_media.py

@@ -696,7 +696,7 @@ def test_medium_autocreate_giftcard(token_client, organizer, team):
 
 
 @pytest.mark.django_db
-def test_medium_lookup_cross_organizer(token_client, organizer, customer, organizer2, org2_event, medium2, giftcard2):
+def test_medium_lookup_cross_organizer(token_client, organizer, organizer2, org2_event, medium2, giftcard2):
     with scopes_disabled():
         o = Order.objects.create(
             code='FOO', event=org2_event, email='dummy@dummy.test',
@@ -708,12 +708,7 @@ def test_medium_lookup_cross_organizer(token_client, organizer, customer, organi
                                          personalized=True)
         op = o.positions.create(item=ticket, price=Decimal("14"))
         medium2.linked_orderpositions.add(op)
-        medium2.customer = customer
         medium2.linked_giftcard = giftcard2
-        medium2.claim_token = "1234"
-        medium2.info = {"foo": "bar"}
-        medium2.notes = "Internal notes"
-        medium2.label = "Max Muster"
         medium2.save()
 
     resp = token_client.post(
@@ -760,9 +755,3 @@ def test_medium_lookup_cross_organizer(token_client, organizer, customer, organi
     assert resp.data["result"]["organizer"] == "partner"
     assert resp.data["result"]["linked_giftcard"] is not None
     assert resp.data["result"]["linked_orderposition"] is None
-    assert resp.data["result"]["linked_orderpositions"] == []
-    assert resp.data["result"]["customer"] is None
-    assert resp.data["result"]["info"] == {}
-    assert resp.data["result"]["notes"] is None
-    assert resp.data["result"]["claim_token"] is None
-    assert resp.data["result"]["label"] is None

src/tests/presale/test_orders.py

@@ -422,42 +422,37 @@ class OrdersTest(BaseOrdersTest):
         with scopes_disabled():
             assert self.order.invoices.count() == 1
 
-        with self.captureOnCommitCallbacks(execute=True):
-            response = self.client.post(
-                '/%s/%s/order/%s/%s/modify' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret), {
-                    '%s-question_%s' % (self.ticket_pos.id, self.question.id): 'ABC',
-                    'zipcode': '12345',
-                    'street': 'Main Street',
-                    'city': 'Heidelberg',
-                    'country': 'DE',
-                    'transmission_type': 'email',
-                }, follow=True)
-            self.assertRedirects(response,
-                                 '/%s/%s/order/%s/%s/' % (self.orga.slug, self.event.slug, self.order.code,
-                                                          self.order.secret),
-                                 target_status_code=200)
+        response = self.client.post(
+            '/%s/%s/order/%s/%s/modify' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret), {
+                '%s-question_%s' % (self.ticket_pos.id, self.question.id): 'ABC',
+                'zipcode': '12345',
+                'street': 'Main Street',
+                'city': 'Heidelberg',
+                'country': 'DE',
+                'transmission_type': 'email',
+            }, follow=True)
+        self.assertRedirects(response,
+                             '/%s/%s/order/%s/%s/' % (self.orga.slug, self.event.slug, self.order.code,
+                                                      self.order.secret),
+                             target_status_code=200)
         with scopes_disabled():
             assert self.order.invoices.count() == 3
-            last_two = self.order.invoices.order_by('-pk')[:2]
-            for inv in last_two:
-                assert inv.transmission_status != Invoice.TRANSMISSION_STATUS_PENDING
 
         self.event.settings.set('invoice_reissue_after_modify', False)
 
-        with self.captureOnCommitCallbacks(execute=True):
-            response = self.client.post(
-                '/%s/%s/order/%s/%s/modify' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret), {
-                    '%s-question_%s' % (self.ticket_pos.id, self.question.id): 'ABC',
-                    'zipcode': '54321',
-                    'street': 'Main Street',
-                    'city': 'Heidelberg',
-                    'country': 'DE',
-                    'transmission_type': 'email',
-                }, follow=True)
-            self.assertRedirects(response,
-                                 '/%s/%s/order/%s/%s/' % (self.orga.slug, self.event.slug, self.order.code,
-                                                          self.order.secret),
-                                 target_status_code=200)
+        response = self.client.post(
+            '/%s/%s/order/%s/%s/modify' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret), {
+                '%s-question_%s' % (self.ticket_pos.id, self.question.id): 'ABC',
+                'zipcode': '54321',
+                'street': 'Main Street',
+                'city': 'Heidelberg',
+                'country': 'DE',
+                'transmission_type': 'email',
+            }, follow=True)
+        self.assertRedirects(response,
+                             '/%s/%s/order/%s/%s/' % (self.orga.slug, self.event.slug, self.order.code,
+                                                      self.order.secret),
+                             target_status_code=200)
         with scopes_disabled():
             assert self.order.invoices.count() == 3