Merge branch '5-add-a-possibility-to-change-the-payment-method-of-an-invoice'...

Merge branch '5-add-a-possibility-to-change-the-payment-method-of-an-invoice' of edugit.org:AlekSIS/onboarding/AlekSIS-App-Tezor into 5-add-a-possibility-to-change-the-payment-method-of-an-invoice

aleksis/apps/tezor/rules.py

@@ -11,7 +11,12 @@ from aleksis.core.util.predicates import (
 
 from .models.base import Client
 from .models.invoice import InvoiceGroup
-from .predicates import has_no_payment_variant, has_payment_variant, is_in_payment_status, is_own_invoice
+from .predicates import (
+    has_no_payment_variant,
+    has_payment_variant,
+    is_in_payment_status,
+    is_own_invoice,
+)
 
 # View clients
 view_clients_predicate = has_person & (
@@ -97,7 +102,10 @@ change_payment_variant_predicate = (
     has_person
     & is_in_payment_status(PaymentStatus.WAITING)
     & (
-        (is_own_invoice & (has_no_payment_variant | has_payment_variant("pledge")))
+        (
+            (is_own_invoice | is_site_preference_set("payments", "public_payments"))
+            & (has_no_payment_variant | has_payment_variant("pledge"))
+        )
         | has_global_perm("tezor.change_payment_variant")
         | has_object_perm("tezor.change_payment_variant")
     )

aleksis/apps/tezor/views.py

 from django.conf import settings
 from django.core.exceptions import PermissionDenied, SuspiciousOperation
-from django.http import HttpResponseBadRequest
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse_lazy
 from django.utils.decorators import method_decorator