Skip to content
Snippets Groups Projects
Commit 7b269bc7 authored by Tom Teichler's avatar Tom Teichler :beers:
Browse files

Reformat and make lint clean

parent 0d15546f
No related branches found
No related tags found
No related merge requests found
...@@ -81,9 +81,6 @@ class Invoice(BasePayment, PureDjangoModel): ...@@ -81,9 +81,6 @@ class Invoice(BasePayment, PureDjangoModel):
) )
items = models.ManyToManyField("InvoiceItem", verbose_name=_("Invoice items")) items = models.ManyToManyField("InvoiceItem", verbose_name=_("Invoice items"))
class Meta:
permissions = (("send_invoice_email", _("Can send invoice by email")),)
@classmethod @classmethod
def get_variant_choices(cls): def get_variant_choices(cls):
choices = [] choices = []
...@@ -126,6 +123,7 @@ class Invoice(BasePayment, PureDjangoModel): ...@@ -126,6 +123,7 @@ class Invoice(BasePayment, PureDjangoModel):
name="object_or_person", name="object_or_person",
), ),
] ]
permissions = (("send_invoice_email", _("Can send invoice by email")),)
def get_billing_email_recipients(self): def get_billing_email_recipients(self):
if hasattr(self.for_object, "get_billing_email_recipients"): if hasattr(self.for_object, "get_billing_email_recipients"):
......
...@@ -9,14 +9,15 @@ payments = Section("payments", verbose_name=_("Payments")) ...@@ -9,14 +9,15 @@ payments = Section("payments", verbose_name=_("Payments"))
@site_preferences_registry.register @site_preferences_registry.register
class EnablePledge(BooleanPreference): class PublicPayments(BooleanPreference):
"""Allow payments to be made by anyone, not only invoice recipient.""" """Allow payments to be made by anyone, not only invoice recipient."""
section = payments section = payments
name = "public_payments" name = "public_payments"
verbose_name = _("Public payments") verbose_name = _("Public payments")
help_text = _( help_text = _(
"Allow anyone (including guests) to make payments. Basic invoice information will be visible to anyone who knows the invoice token." "Allow anyone (including guests) to make payments. "
"Basic invoice information will be visible to anyone who knows the invoice token."
) )
default = True default = True
required = False required = False
...@@ -94,7 +95,7 @@ class EnablePledge(BooleanPreference): ...@@ -94,7 +95,7 @@ class EnablePledge(BooleanPreference):
section = payments section = payments
name = "pledge_enabled" name = "pledge_enabled"
verbose_name = _("Enabledp ledged payments") verbose_name = _("Enable pledged payments")
default = False default = False
required = False required = False
......
...@@ -10,7 +10,7 @@ from aleksis.core.util.predicates import ( ...@@ -10,7 +10,7 @@ from aleksis.core.util.predicates import (
) )
from .models.base import Client from .models.base import Client
from .models.invoice import Invoice, InvoiceGroup from .models.invoice import InvoiceGroup
from .predicates import has_no_payment_variant, is_in_payment_status, is_own_invoice from .predicates import has_no_payment_variant, is_in_payment_status, is_own_invoice
# View clients # View clients
......
from django.shortcuts import get_object_or_404, redirect, render from django.shortcuts import get_object_or_404, redirect, render
from django.urls import reverse, reverse_lazy from django.urls import reverse_lazy
from django.utils.decorators import method_decorator from django.utils.decorators import method_decorator
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from django.views.decorators.cache import never_cache from django.views.decorators.cache import never_cache
from django.views.generic import FormView, TemplateView, View from django.views.generic import View
from django.views.generic.detail import DetailView from django.views.generic.detail import DetailView
from django_tables2.views import RequestConfig, SingleTableView from django_tables2.views import RequestConfig, SingleTableView
from payments import PaymentStatus, RedirectNeeded, get_payment_model from payments import PaymentStatus, RedirectNeeded
from rules.contrib.views import PermissionRequiredMixin from rules.contrib.views import PermissionRequiredMixin
from templated_email import InlineImage, send_templated_mail
from aleksis.core.mixins import AdvancedCreateView, AdvancedDeleteView, AdvancedEditView from aleksis.core.mixins import AdvancedCreateView, AdvancedDeleteView, AdvancedEditView
from aleksis.core.util.pdf import generate_pdf_from_template
from aleksis.core.views import RenderPDFView from aleksis.core.views import RenderPDFView
from .forms import EditClientForm, EditInvoiceGroupForm from .forms import EditClientForm, EditInvoiceGroupForm
......
...@@ -55,7 +55,7 @@ commands = ...@@ -55,7 +55,7 @@ commands =
[flake8] [flake8]
max_line_length = 100 max_line_length = 100
exclude = migrations,tests exclude = migrations,tests
ignore = BLK100,E203,E231,W503,D100,D101,D102,D103,D104,D105,D106,D107,RST215,RST214,F821,F841,S106,T100,T101,DJ05 ignore = A002,A003,BLK100,E203,E231,W503,D100,D101,D102,D103,D104,D105,D106,D107,RST215,RST214,F821,F841,S106,T100,T101,DJ05
[isort] [isort]
profile = black profile = black
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment