CGM_Public/pretix_original
3
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-09-14 16:24:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert the revertion + Fix "PayPal: Add postfix-field and pass information to custom-field"

Browse Source
This commit is contained in:
Martin Gross
2021-07-02 13:58:03 +02:00
parent ef70209ba8
commit d04f93d45c
1 changed files with 55 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pretix/plugins/paypal/payment.py
+55 -21
View File
@@ -141,7 +141,14 @@ class Paypal(BasePaymentProvider):
help_text=_('Any value entered here will be added in front of the regular booking reference ' help_text=_('Any value entered here will be added in front of the regular booking reference '
'containing the order number.'), 'containing the order number.'),
required=False, required=False,
)) )),
('postfix',
forms.CharField(
label=_('Reference postfix'),
help_text=_('Any value entered here will be added behind the regular booking reference '
'containing the order number.'),
required=False,
)),
] ]
d = OrderedDict( d = OrderedDict(
@@ -288,8 +295,11 @@ class Paypal(BasePaymentProvider):
"item_list": { "item_list": {
"items": [ "items": [
{ {
"name": ('{} '.format(self.settings.prefix) if self.settings.prefix else '') + "name": '{prefix}{orderstring}{postfix}'.format(
__('Order for %s') % str(request.event), prefix='{} '.format(self.settings.prefix) if self.settings.prefix else '',
orderstring=__('Order for %s') % str(request.event),
postfix=' {}'.format(self.settings.postfix) if self.settings.postfix else ''
),
"quantity": 1, "quantity": 1,
"price": self.format_price(cart['total']), "price": self.format_price(cart['total']),
"currency": request.event.currency "currency": request.event.currency
@@ -301,7 +311,12 @@ class Paypal(BasePaymentProvider):
"total": self.format_price(cart['total']) "total": self.format_price(cart['total'])
}, },
"description": __('Event tickets for {event}').format(event=request.event.name), "description": __('Event tickets for {event}').format(event=request.event.name),
"payee": payee "payee": payee,
"custom": '{prefix}{slug}{postfix}'.format(
prefix='{} '.format(self.settings.prefix) if self.settings.prefix else '',
slug=request.event.slug.upper(),
postfix=' {}'.format(self.settings.postfix) if self.settings.postfix else ''
)
} }
] ]
}) })
@@ -398,9 +413,13 @@ class Paypal(BasePaymentProvider):
"value": { "value": {
"items": [ "items": [
{ {
"name": ('{} '.format(self.settings.prefix) if self.settings.prefix else '') + "name": '{prefix}{orderstring}{postfix}'.format(
__('Order {slug}-{code}').format( prefix='{} '.format(self.settings.prefix) if self.settings.prefix else '',
slug=self.event.slug.upper(), code=payment_obj.order.code orderstring=__('Order {slug}-{code}').format(
slug=self.event.slug.upper(),
code=payment_obj.order.code
),
postfix=' {}'.format(self.settings.postfix) if self.settings.postfix else ''
), ),
"quantity": 1, "quantity": 1,
"price": self.format_price(payment_obj.amount), "price": self.format_price(payment_obj.amount),
@@ -412,11 +431,14 @@ class Paypal(BasePaymentProvider):
{ {
"op": "replace", "op": "replace",
"path": "/transactions/0/description", "path": "/transactions/0/description",
"value": ('{} '.format(self.settings.prefix) if self.settings.prefix else '') + "value": '{prefix}{orderstring}{postfix}'.format(
__('Order {order} for {event}').format( prefix='{} '.format(self.settings.prefix) if self.settings.prefix else '',
event=request.event.name, orderstring=__('Order {order} for {event}').format(
order=payment_obj.order.code event=request.event.name,
) order=payment_obj.order.code
),
postfix=' {}'.format(self.settings.postfix) if self.settings.postfix else ''
),
} }
]) ])
try: try:
@@ -615,10 +637,13 @@ class Paypal(BasePaymentProvider):
"item_list": { "item_list": {
"items": [ "items": [
{ {
"name": ('{} '.format(self.settings.prefix) if self.settings.prefix else '') + "name": '{prefix}{orderstring}{postfix}'.format(
__('Order {slug}-{code}').format( prefix='{} '.format(self.settings.prefix) if self.settings.prefix else '',
slug=self.event.slug.upper(), orderstring=__('Order {slug}-{code}').format(
code=payment_obj.order.code slug=self.event.slug.upper(),
code=payment_obj.order.code
),
postfix=' {}'.format(self.settings.postfix) if self.settings.postfix else ''
), ),
"quantity": 1, "quantity": 1,
"price": self.format_price(payment_obj.amount), "price": self.format_price(payment_obj.amount),
@@ -630,12 +655,21 @@ class Paypal(BasePaymentProvider):
"currency": request.event.currency, "currency": request.event.currency,
"total": self.format_price(payment_obj.amount) "total": self.format_price(payment_obj.amount)
}, },
"description": ('{} '.format(self.settings.prefix) if self.settings.prefix else '') + "description": '{prefix}{orderstring}{postfix}'.format(
__('Order {order} for {event}').format( prefix='{} '.format(self.settings.prefix) if self.settings.prefix else '',
event=request.event.name, orderstring=__('Order {order} for {event}').format(
order=payment_obj.order.code event=request.event.name,
order=payment_obj.order.code
),
postfix=' {}'.format(self.settings.postfix) if self.settings.postfix else ''
),
"payee": payee,
"custom": '{prefix}{slug}-{code}{postfix}'.format(
prefix='{} '.format(self.settings.prefix) if self.settings.prefix else '',
slug=self.event.slug.upper(),
code=payment_obj.order.code,
postfix=' {}'.format(self.settings.postfix) if self.settings.postfix else ''
), ),
"payee": payee
} }
] ]
}) })