CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Revert "PayPal: Add postfix-field and pass information to custom-field (#2137)"

Browse Source 
This reverts commit 32f690e9d0.
This commit is contained in:
Raphael Michel
2021-07-02 13:50:01 +02:00
parent f127cfc46a
commit ef70209ba8
1 changed files with 24 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/pretix/plugins/paypal/payment.py
View File

@@ -141,14 +141,7 @@ 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(
@@ -295,11 +288,11 @@ class Paypal(BasePaymentProvider):
"item_list": { "item_list": {
"items": [ "items": [
{ {
"name": '{prefix}{orderstring}{postfix}'.format( "name": ('{} '.format(self.settings.prefix) if self.settings.prefix else '') +
prefix='{} '.format(self.settings.prefix) if self.settings.prefix else '', __('Order for %s') % str(request.event),
orderstring=__('Order for %s') % str(request.event), "quantity": 1,
postfix=' {}'.format(self.settings.postfix) if self.settings.postfix else '' "price": self.format_price(cart['total']),
), "currency": request.event.currency
} }
] ]
}, },
@@ -308,12 +301,7 @@ 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 ''
)
} }
] ]
}) })
@@ -410,13 +398,9 @@ class Paypal(BasePaymentProvider):
"value": { "value": {
"items": [ "items": [
{ {
"name": '{prefix}{orderstring}{postfix}'.format( "name": ('{} '.format(self.settings.prefix) if self.settings.prefix else '') +
prefix='{} '.format(self.settings.prefix) if self.settings.prefix else '', __('Order {slug}-{code}').format(
orderstring=__('Order {slug}-{code}').format( slug=self.event.slug.upper(), 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),
@@ -428,14 +412,11 @@ class Paypal(BasePaymentProvider):
{ {
"op": "replace", "op": "replace",
"path": "/transactions/0/description", "path": "/transactions/0/description",
"value": '{prefix}{orderstring}{postfix}'.format( "value": ('{} '.format(self.settings.prefix) if self.settings.prefix else '') +
prefix='{} '.format(self.settings.prefix) if self.settings.prefix else '', __('Order {order} for {event}').format(
orderstring=__('Order {order} for {event}').format( event=request.event.name,
event=request.event.name, order=payment_obj.order.code
order=payment_obj.order.code )
),
postfix=' {}'.format(self.settings.postfix) if self.settings.postfix else ''
),
} }
]) ])
try: try:
@@ -634,13 +615,10 @@ class Paypal(BasePaymentProvider):
"item_list": { "item_list": {
"items": [ "items": [
{ {
"name": '{prefix}{orderstring}{postfix}'.format( "name": ('{} '.format(self.settings.prefix) if self.settings.prefix else '') +
prefix='{} '.format(self.settings.prefix) if self.settings.prefix else '', __('Order {slug}-{code}').format(
orderstring=__('Order {slug}-{code}').format( slug=self.event.slug.upper(),
slug=self.event.slug.upper(), code=payment_obj.order.code
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),
@@ -652,21 +630,12 @@ 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": '{prefix}{orderstring}{postfix}'.format( "description": ('{} '.format(self.settings.prefix) if self.settings.prefix else '') +
prefix='{} '.format(self.settings.prefix) if self.settings.prefix else '', __('Order {order} for {event}').format(
orderstring=__('Order {order} for {event}').format( event=request.event.name,
event=request.event.name, order=payment_obj.order.code
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
} }
] ]
}) })