mirror of
https://github.com/pretix/pretix.git
synced 2026-03-13 14:12:28 +00:00
Compare commits
5 Commits
db-ro-user
...
fix-log-di
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f44765cc88 | ||
|
|
3352ee2bbe | ||
|
|
af28785fb9 | ||
|
|
54e4957e89 | ||
|
|
f3597f1a44 |
@@ -315,8 +315,9 @@ class OrderListExporter(MultiSheetListExporter):
|
||||
for id, vn in payment_methods:
|
||||
headers.append(_('Paid by {method}').format(method=vn))
|
||||
|
||||
# get meta_data labels from first cached event
|
||||
headers += next(iter(self.event_object_cache.values())).meta_data.keys()
|
||||
if self.event_object_cache:
|
||||
# get meta_data labels from first cached event if any
|
||||
headers += next(iter(self.event_object_cache.values())).meta_data.keys()
|
||||
yield headers
|
||||
|
||||
full_fee_sum_cache = {
|
||||
@@ -503,8 +504,9 @@ class OrderListExporter(MultiSheetListExporter):
|
||||
headers.append(_('External customer ID'))
|
||||
headers.append(_('Payment providers'))
|
||||
|
||||
# get meta_data labels from first cached event
|
||||
headers += next(iter(self.event_object_cache.values())).meta_data.keys()
|
||||
if self.event_object_cache:
|
||||
# get meta_data labels from first cached event if any
|
||||
headers += next(iter(self.event_object_cache.values())).meta_data.keys()
|
||||
yield headers
|
||||
|
||||
yield self.ProgressSetTotal(total=qs.count())
|
||||
@@ -707,9 +709,9 @@ class OrderListExporter(MultiSheetListExporter):
|
||||
_('Position order link')
|
||||
]
|
||||
|
||||
# get meta_data labels from first cached event
|
||||
meta_data_labels = next(iter(self.event_object_cache.values())).meta_data.keys()
|
||||
if has_subevents:
|
||||
# get meta_data labels from first cached event
|
||||
meta_data_labels = next(iter(self.event_object_cache.values())).meta_data.keys()
|
||||
headers += meta_data_labels
|
||||
yield headers
|
||||
|
||||
|
||||
@@ -334,7 +334,8 @@ def _check_position_constraints(
|
||||
raise CartPositionError(error_messages['voucher_invalid_subevent'])
|
||||
|
||||
# Voucher expired
|
||||
if voucher and voucher.valid_until and voucher.valid_until < time_machine_now_dt:
|
||||
# (checked using real_now_dt as vouchers influence quota calculations)
|
||||
if voucher and voucher.valid_until and voucher.valid_until < real_now_dt:
|
||||
raise CartPositionError(error_messages['voucher_expired'])
|
||||
|
||||
# Subevent has been disabled
|
||||
|
||||
@@ -641,6 +641,7 @@ class TeamMembershipLogEntryType(LogEntryType):
|
||||
'pretix.team.member.added': _('{user} has been added to the team.'),
|
||||
'pretix.team.member.removed': _('{user} has been removed from the team.'),
|
||||
'pretix.team.invite.created': _('{user} has been invited to the team.'),
|
||||
'pretix.team.invite.deleted': _('Invite for {user} has been deleted.'),
|
||||
'pretix.team.invite.resent': _('Invite for {user} has been resent.'),
|
||||
})
|
||||
class CoreTeamMembershipLogEntryType(TeamMembershipLogEntryType):
|
||||
|
||||
@@ -38,7 +38,7 @@ var pretixpaypal = {
|
||||
credit: gettext('PayPal Credit'),
|
||||
card: gettext('Credit Card'),
|
||||
paylater: gettext('PayPal Pay Later'),
|
||||
ideal: gettext('iDEAL'),
|
||||
ideal: gettext('iDEAL | Wero'),
|
||||
sepa: gettext('SEPA Direct Debit'),
|
||||
bancontact: gettext('Bancontact'),
|
||||
giropay: gettext('giropay'),
|
||||
|
||||
@@ -92,70 +92,89 @@ logger = logging.getLogger('pretix.plugins.stripe')
|
||||
# State of the payment methods
|
||||
#
|
||||
# Source: https://stripe.com/docs/payments/payment-methods/overview
|
||||
# Last Update: 2023-12-20
|
||||
# Last Update: 2026-06-12
|
||||
#
|
||||
# pretix Staff: Do not forget to enable/"On by default" newly added payment methods in
|
||||
# Stripe's managed payment methods configuration for the Stripe/pretix.eu connect platform.
|
||||
#
|
||||
# The categorization and order of payment methods is based on the list of the managed payment method configration
|
||||
# in the Stripe Dashboard.
|
||||
|
||||
# Cards
|
||||
# - Credit and Debit Cards: ✓
|
||||
# - Apple, Google Pay: ✓
|
||||
# * Cartes Bancaires: ✓
|
||||
# * Korean cards: ✓
|
||||
# * Japan installments: ✗
|
||||
# * JCB: ✓
|
||||
# * Meses sin intereses: ✗
|
||||
#
|
||||
# Bank debits
|
||||
# - ACH Debit: ✗
|
||||
# - Canadian PADs: ✗
|
||||
# - BACS Direct Debit: ✗
|
||||
# - SEPA Direct Debit: ✓
|
||||
# - BECS Direct Debit: ✗
|
||||
# Wallets
|
||||
# - Apple: ✓ (Cards)
|
||||
# - Google Pay: ✓ (Cards)
|
||||
# - Link: ✓ (PaymentRequestButton/Cards)
|
||||
# - Alipay: ✓
|
||||
# - Stablecoins and Crypto: ✗
|
||||
# - Kakao Pay: ✗
|
||||
# - Naver Pay: ✗
|
||||
# - MB Way: ✗
|
||||
# - Satis Pay: ✗
|
||||
# - WeChat Pay: ✓
|
||||
# - PAYCO: ✗
|
||||
# - PayPal: ✓ (No settings UI yet; incompatible with Connect+Direct Charges)
|
||||
# - Samsung pay: ✗
|
||||
# - MobilePay: ✓
|
||||
# - Revolut Pay: ✓
|
||||
# - Amazon Pay: ✗
|
||||
# - PayPay: ✗
|
||||
# - GrabPay: ✗
|
||||
# - Cash App Pay: ✗
|
||||
# - Secure Remote Commerce: ✗
|
||||
#
|
||||
# Bank redirects
|
||||
# - Bancontact: ✓
|
||||
# - BLIK: ✗
|
||||
# - EPS: ✓
|
||||
# - giropay: (deprecated)
|
||||
# - iDEAL: ✓
|
||||
# - P24: ✓
|
||||
# - Sofort: (deprecated)
|
||||
# - FPX: ✗
|
||||
# - PayNow: ✗
|
||||
# - UPI: ✗
|
||||
# - Netbanking: ✗
|
||||
# - Przelewy24: ✓
|
||||
# - BLIK: ✗
|
||||
# - Pay By Bank: ✓
|
||||
# - TWINT: ✓
|
||||
# - Wero: ✓ (No settings UI yet)
|
||||
#
|
||||
# Bank transfers
|
||||
# - ACH Bank Transfer: ✗
|
||||
# - SEPA Bank Transfer: ✗
|
||||
# - UK Bank Transfer: ✗
|
||||
# - Multibanco: ✗
|
||||
# - Furikomi (Japan): ✗
|
||||
# - Mexico Bank Transfer: ✗
|
||||
# - giropay: ✗ (deprecated)
|
||||
# - Sofort: ✗ (deprecated)
|
||||
#
|
||||
# Buy now, pay later
|
||||
# - Affirm: ✓
|
||||
# - Afterpay/Clearpay: ✗
|
||||
# - Billie: ✗
|
||||
# - Klarna: ✓
|
||||
# - Afterpay/Clearpay: ✗
|
||||
# - Zip: ✗
|
||||
# - Alma: ✗
|
||||
# - Affirm: ✓
|
||||
#
|
||||
# Bank debits
|
||||
# - SEPA Direct Debit: ✓
|
||||
# - ACH Direct Debit: ✗
|
||||
# - Australian BECS Direct Debit: ✗
|
||||
# - Canadian pre-authorized debits: ✗
|
||||
# - BACS Direct Debit: ✗
|
||||
# - FPX: ✗
|
||||
# - NZ BECS Direct Debit: ✗
|
||||
#
|
||||
# Bank transfers
|
||||
# - Bank Transfer: ✗
|
||||
#
|
||||
# Vouchers
|
||||
# - Multibanco: ✓
|
||||
# - Boleto: ✗
|
||||
# - Konbini: ✗
|
||||
# - OXXO: ✗
|
||||
#
|
||||
# Real-time payments
|
||||
# - Swish: ✓
|
||||
# - UPI: ✗
|
||||
# - Pix: ✗
|
||||
# - PayTo: ✗
|
||||
# - PayNow: ✗
|
||||
# - PromptPay: ✓
|
||||
# - Pix: ✗
|
||||
#
|
||||
# Vouchers
|
||||
# - Konbini: ✗
|
||||
# - OXXO: ✗
|
||||
# - Boleto: ✗
|
||||
#
|
||||
# Wallets
|
||||
# - Apple Pay: ✓ (Cards)
|
||||
# - Google Pay: ✓ (Cards)
|
||||
# - Secure Remote Commerce: ✗
|
||||
# - Link: ✓ (PaymentRequestButton)
|
||||
# - Cash App Pay: ✗
|
||||
# - PayPal: ✓ (No settings UI yet)
|
||||
# - MobilePay: ✓
|
||||
# - Alipay: ✓
|
||||
# - WeChat Pay: ✓
|
||||
# - GrabPay: ✓
|
||||
|
||||
|
||||
class StripeSettingsHolder(BasePaymentProvider):
|
||||
@@ -1550,7 +1569,7 @@ class StripeGiropay(StripeRedirectWithAccountNamePaymentIntentMethod):
|
||||
class StripeIdeal(StripeRedirectMethod):
|
||||
identifier = 'stripe_ideal'
|
||||
verbose_name = _('iDEAL via Stripe')
|
||||
public_name = _('iDEAL')
|
||||
public_name = _('iDEAL | Wero')
|
||||
method = 'ideal'
|
||||
explanation = _(
|
||||
'iDEAL is an online payment method available to customers of Dutch banks. Please keep your online '
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
{% bootstrap_form_errors timemachine_form "all" %}
|
||||
|
||||
<p>{% trans "Test your shop as if it were a different date and time." %}</p>
|
||||
<p>{% trans "Please note that the changed time is not taken into account for aspects of the shop that affect quotas, such as the validity period of carts and vouchers." %}</p>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
@@ -44,4 +45,4 @@
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% endblock %}
|
||||
|
||||
Reference in New Issue
Block a user