From 9f20d1cd032c2d3751a6865b47982213665f2eb3 Mon Sep 17 00:00:00 2001 From: Martin Gross Date: Mon, 6 Aug 2018 22:33:17 +0200 Subject: [PATCH] update to 2.0; remove segno/qrcode --- README.rst | 10 +++++++++- pretix_cashpayment/__init__.py | 2 +- pretix_cashpayment/payment.py | 6 ------ .../templates/pretix_cashpayment/pending.html | 3 --- setup.py | 4 ++-- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/README.rst b/README.rst index abc27d9..7bf52d2 100644 --- a/README.rst +++ b/README.rst @@ -15,6 +15,14 @@ In the plugin settings you can set a custom text which will not only be displaye Please note, that you will have to mark the orders as payed by hand using the pretix backend. You may also - at your own risk - use the `pretix-cashpoint`_ in conjunction with the `de.pccoholic.pretix.cashpoint`_ android app to mark tickets as payed. +Compatibility +------------- +As major versions in pretix tend to also include major changes, compatibility can be difficult to maintain. + +In order to make things simpler, the versioning of this plugin is also orienting itself on the versioning of pretix. + +On other words: If you are running pretix 1.x, you should only install this plugin in a 1.x-version. The 2.x-version *might* work just fine, but is implementing pretix 2.x-functionality, which might not be available on legacy systems or might even break it. + Production setup - pip method ----------------------------- @@ -57,7 +65,7 @@ Development setup License ------- -Copyright 2017 Martin Gross +Copyright 2018 Martin Gross Released under the terms of the Apache License 2.0 diff --git a/pretix_cashpayment/__init__.py b/pretix_cashpayment/__init__.py index 2b36362..619fee5 100644 --- a/pretix_cashpayment/__init__.py +++ b/pretix_cashpayment/__init__.py @@ -10,7 +10,7 @@ class PretixPluginMeta: author = 'Martin Gross' description = _('This plugin allows you to offer your customers a "pay with cash at the venue" option.') visible = True - version = '1.0.2' + version = '2.0.0' def ready(self): from . import signals # NOQA diff --git a/pretix_cashpayment/payment.py b/pretix_cashpayment/payment.py index 53bd158..a497792 100644 --- a/pretix_cashpayment/payment.py +++ b/pretix_cashpayment/payment.py @@ -1,6 +1,5 @@ from collections import OrderedDict -import segno from django.http import HttpRequest from django.template.loader import get_template from django.utils.translation import ugettext_lazy as _ @@ -54,16 +53,11 @@ def order_pending_mail_render(self, order) -> str: return template.render(ctx) def payment_pending_render(self, request: HttpRequest, payment: OrderPayment): - if 'pretix_cashpoint' in self.event.get_plugins(): - qrcode = segno.make_qr(payment.order.full_code, error='H').png_data_uri(scale=10, border=0) - else: - qrcode = None template = get_template('pretix_cashpayment/pending.html') ctx = { 'event': self.event, 'order': payment.order, 'information_text': self.settings.get('information_text', as_type=LazyI18nString), - 'qrcode': qrcode, } return template.render(ctx) diff --git a/pretix_cashpayment/templates/pretix_cashpayment/pending.html b/pretix_cashpayment/templates/pretix_cashpayment/pending.html index d328d70..faba2b7 100644 --- a/pretix_cashpayment/templates/pretix_cashpayment/pending.html +++ b/pretix_cashpayment/templates/pretix_cashpayment/pending.html @@ -10,7 +10,4 @@
{% trans "Amount:" %} {{ order.total|localize }} {{ event.currency }}
{% trans "Reference code (important):" %} {{ order.full_code }}
- {% if qrcode %} - - {% endif %} diff --git a/setup.py b/setup.py index 81050a2..2cd6ff1 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ def run(self): setup( name='pretix-cashpayment', - version='1.0.2', + version='2.0.0', description='pretix plugin that allows you to offer your customers a "pay with cash at the venue" option.', long_description=long_description, url='http://www.github.com/pc-coholic/pretix-cashpayment', @@ -33,7 +33,7 @@ def run(self): author_email='martin@pc-coholic.de', license='Apache Software License', - install_requires=['segno'], + install_requires=[], packages=find_packages(exclude=['tests', 'tests.*']), include_package_data=True, cmdclass=cmdclass,