Send invoice to organizer in plain text (Z#23210026)

src/pretix/base/datasync/datasync.py

@@ -391,7 +391,7 @@ class OutboundSyncProvider:
     def sync_order(self, order):
         if not self.should_sync_order(order):
             logger.debug("Skipping order %r", order)
-            return {}
+            return
 
         logger.debug("Syncing order %r", order)
         positions = list(

src/pretix/base/services/invoices.py

@@ -671,6 +671,7 @@ def send_invoices_to_organizer(sender, **kwargs):
                             event=i.event,
                             invoices=[i],
                             auto_email=True,
+                            plain_text_only=True,
                         )
                     i.sent_to_organizer = True
                 else:

src/pretix/base/services/orders.py

@@ -2825,7 +2825,7 @@ class OrderChangeManager:
     def _check_complete_cancel(self):
         current = self.order.positions.count()
         cancels = sum([
-            1 + o.position.addons.filter(canceled=False).count() for o in self._operations if isinstance(o, self.CancelOperation)
+            1 + o.position.addons.count() for o in self._operations if isinstance(o, self.CancelOperation)
         ]) + len([
             o for o in self._operations if isinstance(o, self.SplitOperation)
         ])

src/tests/base/test_datasync.py

@@ -327,26 +327,6 @@ def test_enqueue_order_twice(event):
         SimpleOrderSync.enqueue_order(order, 'testcase_2nd')
 
 
-class DoNothingSync(SimpleOrderSync):
-
-    def should_sync_order(self, order):
-        return False
-
-
-@pytest.mark.django_db
-def test_should_not_sync(event):
-    _register_with_fake_plugin_name(datasync_providers, DoNothingSync, 'testplugin')
-
-    DoNothingSync.fake_api_client = FakeSyncAPI()
-
-    for order in event.orders.order_by("code").all():
-        DoNothingSync.enqueue_order(order, 'testcase')
-
-    sync_all()
-
-    assert DoNothingSync.fake_api_client.fake_database == {}
-
-
 StaticMappingWithAssociations = namedtuple('StaticMappingWithAssociations', (
     'id', 'pretix_model', 'external_object_type', 'pretix_id_field', 'external_id_field', 'property_mappings', 'association_mappings'
 ))