Add comment

src/pretix/base/invoice.py

@@ -388,6 +388,15 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
             except:
                 logger.exception("Can not resize image")
                 pass
+            try:
+                # Valid ZUGFeRD invoices must be compliant with PDF/A-3. pretix-zugferd ensures this by passing them
+                # through ghost script. Unfortunately, if the logo contains transparency, this will still fail.
+                # I was unable to figure out a way to fix this in GhostScript, so the easy fix is to remove the
+                # transparency, as our invoices always have a white background anyways.
+                ir.remove_transparency()
+            except:
+                logger.exception("Can not remove transparency from logo")
+                pass
             canvas.drawImage(ir,
                              self.logo_left,
                              self.pagesize[1] - self.logo_height - self.logo_top,

src/pretix/base/payment.py

@@ -957,19 +957,12 @@ class BasePaymentProvider:
 
     def cancel_payment(self, payment: OrderPayment):
         """
-        Will be called to cancel a payment. The default implementation fails if the payment is
-        ``OrderPayment.PAYMENT_STATE_PENDING`` and ``abort_pending_allowed`` is false. Otherwise, it just sets the
-        payment state to canceled. In some cases you might want to modify this behaviour to notify the external provider
-        of the cancellation.
+        Will be called to cancel a payment. The default implementation just sets the payment state to canceled,
+        but in some cases you might want to notify an external provider.
 
         On success, you should set ``payment.state = OrderPayment.PAYMENT_STATE_CANCELED`` (or call the super method).
         On failure, you should raise a PaymentException.
         """
-        if payment.state == OrderPayment.PAYMENT_STATE_PENDING and not self.abort_pending_allowed:
-            raise PaymentException(_(
-                "This payment is already being processed and can not be canceled any more."
-            ))
-
         payment.state = OrderPayment.PAYMENT_STATE_CANCELED
         payment.save(update_fields=['state'])
 

src/pretix/helpers/reportlab.py

@@ -39,6 +39,12 @@ class ThumbnailingImageReader(ImageReader):
         self._data = None
         return width, height
 
+    def remove_transparency(self, background_color="WHITE"):
+        if "A" in self._image.mode:
+            new_image = Image.new("RGBA", self._image.size, background_color)
+            new_image.paste(self._image, mask=self._image)
+            self._image = new_image.convert("RGB")
+
     def _jpeg_fh(self):
         # Bypass a reportlab-internal optimization that falls back to the original
         # file handle if the file is a JPEG, and therefore does not respect the

src/tests/plugins/banktransfer/test_import.py

@@ -574,7 +574,7 @@ def test_pending_paypal_drop_fee(env, job):
         env[2].save()
         p = env[2].payments.create(
             provider='paypal',
-            state=OrderPayment.PAYMENT_STATE_CREATED,
+            state=OrderPayment.PAYMENT_STATE_PENDING,
             fee=fee,
             amount=env[2].total
         )