diff --git a/src/pretix/plugins/paypal/payment.py b/src/pretix/plugins/paypal/payment.py index 0977864110..071d273654 100644 --- a/src/pretix/plugins/paypal/payment.py +++ b/src/pretix/plugins/paypal/payment.py @@ -141,14 +141,7 @@ class Paypal(BasePaymentProvider): help_text=_('Any value entered here will be added in front of the regular booking reference ' 'containing the order number.'), 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( @@ -295,11 +288,11 @@ class Paypal(BasePaymentProvider): "item_list": { "items": [ { - "name": '{prefix}{orderstring}{postfix}'.format( - 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 '' - ), + "name": ('{} '.format(self.settings.prefix) if self.settings.prefix else '') + + __('Order for %s') % str(request.event), + "quantity": 1, + "price": self.format_price(cart['total']), + "currency": request.event.currency } ] }, @@ -308,12 +301,7 @@ class Paypal(BasePaymentProvider): "total": self.format_price(cart['total']) }, "description": __('Event tickets for {event}').format(event=request.event.name), - "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 '' - ) + "payee": payee } ] }) @@ -410,13 +398,9 @@ class Paypal(BasePaymentProvider): "value": { "items": [ { - "name": '{prefix}{orderstring}{postfix}'.format( - prefix='{} '.format(self.settings.prefix) if self.settings.prefix else '', - 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 '' + "name": ('{} '.format(self.settings.prefix) if self.settings.prefix else '') + + __('Order {slug}-{code}').format( + slug=self.event.slug.upper(), code=payment_obj.order.code ), "quantity": 1, "price": self.format_price(payment_obj.amount), @@ -428,14 +412,11 @@ class Paypal(BasePaymentProvider): { "op": "replace", "path": "/transactions/0/description", - "value": '{prefix}{orderstring}{postfix}'.format( - prefix='{} '.format(self.settings.prefix) if self.settings.prefix else '', - orderstring=__('Order {order} for {event}').format( - event=request.event.name, - order=payment_obj.order.code - ), - postfix=' {}'.format(self.settings.postfix) if self.settings.postfix else '' - ), + "value": ('{} '.format(self.settings.prefix) if self.settings.prefix else '') + + __('Order {order} for {event}').format( + event=request.event.name, + order=payment_obj.order.code + ) } ]) try: @@ -634,13 +615,10 @@ class Paypal(BasePaymentProvider): "item_list": { "items": [ { - "name": '{prefix}{orderstring}{postfix}'.format( - prefix='{} '.format(self.settings.prefix) if self.settings.prefix else '', - 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 '' + "name": ('{} '.format(self.settings.prefix) if self.settings.prefix else '') + + __('Order {slug}-{code}').format( + slug=self.event.slug.upper(), + code=payment_obj.order.code ), "quantity": 1, "price": self.format_price(payment_obj.amount), @@ -652,21 +630,12 @@ class Paypal(BasePaymentProvider): "currency": request.event.currency, "total": self.format_price(payment_obj.amount) }, - "description": '{prefix}{orderstring}{postfix}'.format( - prefix='{} '.format(self.settings.prefix) if self.settings.prefix else '', - orderstring=__('Order {order} for {event}').format( - 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 '' + "description": ('{} '.format(self.settings.prefix) if self.settings.prefix else '') + + __('Order {order} for {event}').format( + event=request.event.name, + order=payment_obj.order.code ), + "payee": payee } ] })