Fix urljoin, hide Stripe, Banktransfer if not enabled (#522)

Author: HungNgien

src/pretix/control/forms/event.py

@@ -1527,8 +1527,11 @@ def __init__(self, *args, **kwargs):
         )
         kwargs["locales"] = self.locales
         super().__init__(*args, **kwargs)
-        if not self.obj.settings.payment_stripe_connect_client_id:
+        plugins_active = self.obj.get_plugins()
+        if ('eventyay_stripe' not in plugins_active) or (not self.obj.settings.payment_stripe_connect_client_id):
             del self.fields["payment_stripe__enabled"]
+        if ('pretix.plugins.banktransfer' not in plugins_active):
+            del self.fields['payment_banktransfer__enabled']
         self.fields["payment_banktransfer_bank_details"].required = False
         for f in self.fields.values():
             if "data-required-if" in f.widget.attrs:

src/pretix/control/templates/pretixcontrol/event/quick_setup.html

@@ -166,22 +166,23 @@ <h2>{% trans "Congratulations!" %}</h2>
                         Here are just two of them as examples, you can add more in the "Settings" part of your event.
                     {% endblocktrans %}
                 </p>
-                {% bootstrap_field form.payment_banktransfer__enabled layout="control" label_class="sr-only" field_class="col-md-12" %}
-                <div data-display-dependency="#id_payment_banktransfer__enabled">
-                    {% bootstrap_field form.payment_banktransfer_bank_details_type layout="control" %}
-                    {% bootstrap_field form.payment_banktransfer_bank_details_sepa_name layout="control" %}
-                    {% bootstrap_field form.payment_banktransfer_bank_details_sepa_iban layout="control" %}
-                    {% bootstrap_field form.payment_banktransfer_bank_details_sepa_bic layout="control" %}
-                    {% bootstrap_field form.payment_banktransfer_bank_details_sepa_bank layout="control" %}
-                    {% bootstrap_field form.payment_banktransfer_bank_details layout="control" %}
-                </div>
+                {% if form.payment_banktransfer__enabled %}
+                    {% bootstrap_field form.payment_banktransfer__enabled layout="control" label_class="sr-only" field_class="col-md-12" %}
+                    <div data-display-dependency="#id_payment_banktransfer__enabled">
+                        {% bootstrap_field form.payment_banktransfer_bank_details_type layout="control" %}
+                        {% bootstrap_field form.payment_banktransfer_bank_details_sepa_name layout="control" %}
+                        {% bootstrap_field form.payment_banktransfer_bank_details_sepa_iban layout="control" %}
+                        {% bootstrap_field form.payment_banktransfer_bank_details_sepa_bic layout="control" %}
+                        {% bootstrap_field form.payment_banktransfer_bank_details_sepa_bank layout="control" %}
+                        {% bootstrap_field form.payment_banktransfer_bank_details layout="control" %}
+                    </div>
+                {% endif %}
                 {% if form.payment_stripe__enabled %}
                     {% bootstrap_field form.payment_stripe__enabled layout="control" label_class="sr-only" field_class="col-md-12" %}
                     <div data-display-dependency="#id_payment_stripe__enabled">
                         <div class="alert alert-info">
                             {% blocktrans trimmed %}
-                                After you saved this page, we will redirect you to Stripe to create or connect an account
-                                there. Once you completed this, you will be taken back to pretix.
+                                After the setup, please go to the Payment area and set up the Stripe connection.
                             {% endblocktrans %}
                         </div>
                     </div>

src/pretix/eventyay_common/tasks.py

@@ -49,7 +49,7 @@ def send_organizer_webhook(self, user_id, organizer):
     try:
         # Send the POST request with the payload and the headers
         response = requests.post(
-            settings.TALK_HOSTNAME + "/webhook/organiser/",
+            urljoin(settings.TALK_HOSTNAME, "webhook/organiser/"),
             json=payload,
             headers=headers,
         )