Backend UX: Restructure payment settings

src/pretix/plugins/banktransfer/payment.py

@@ -32,9 +32,12 @@ class BankTransfer(BasePaymentProvider):
                 )
             }}
         )
-        return OrderedDict(
+        d = OrderedDict(
             list(super().settings_form_fields.items()) + [('bank_details', form_field)]
         )
+        d.move_to_end('bank_details', last=False)
+        d.move_to_end('_enabled', last=False)
+        return d
 
     def payment_form_render(self, request) -> str:
         template = get_template('pretixplugins/banktransfer/checkout_payment_form.html')

src/pretix/plugins/paypal/payment.py

@@ -41,8 +41,8 @@ class Paypal(BasePaymentProvider):
 
     @property
     def settings_form_fields(self):
-        return OrderedDict(
-            list(super().settings_form_fields.items()) + [
+        d = OrderedDict(
+            [
                 ('endpoint',
                  forms.ChoiceField(
                      label=_('Endpoint'),
@@ -68,8 +68,10 @@ class Paypal(BasePaymentProvider):
                      max_length=80,
                      min_length=80,
                  ))
-            ]
+            ] + list(super().settings_form_fields.items())
         )
+        d.move_to_end('_enabled', False)
+        return d
 
     def settings_content_render(self, request):
         return "<div class='alert alert-info'>%s<br /><code>%s</code></div>" % (

src/pretix/plugins/stripe/payment.py

@@ -74,24 +74,24 @@ class StripeSettingsHolder(BasePaymentProvider):
 
     @property
     def settings_form_fields(self):
-        return OrderedDict(
-            list(super().settings_form_fields.items()) + [
-                ('secret_key',
+        d = OrderedDict(
+            [
+                ('publishable_key',
                  forms.CharField(
-                     label=_('Secret key'),
+                     label=_('Publishable key'),
                      help_text=_('<a target="_blank" rel="noopener" href="{docs_url}">{text}</a>').format(
                          text=_('Click here for a tutorial on how to obtain the required keys'),
                          docs_url='https://docs.pretix.eu/en/latest/user/payments/stripe.html'
                      ),
                      validators=(
-                         StripeKeyValidator('sk_'),
+                         StripeKeyValidator('pk_'),
                      ),
                  )),
-                ('publishable_key',
+                ('secret_key',
                  forms.CharField(
-                     label=_('Publishable key'),
+                     label=_('Secret key'),
                      validators=(
-                         StripeKeyValidator('pk_'),
+                         StripeKeyValidator('sk_'),
                      ),
                  )),
                 ('ui',
@@ -144,9 +144,12 @@ class StripeSettingsHolder(BasePaymentProvider):
                                  'payments are not immediately confirmed but might take some time.'),
                      required=False,
                  )),
-            ]
+            ] + list(super().settings_form_fields.items())
         )
 
+        d.move_to_end('_enabled', last=False)
+        return d
+
 
 class StripeMethod(BasePaymentProvider):
     identifier = ''