Mirror
/
app-MAIL-temp
mirror of https://github.com/simple-login/app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add next bill date on admin UI (#1154) 

* add subscription next bill date on admin

* small refactor: remove unused param
This commit is contained in:
Son Nguyen Kim 2022-07-12 18:17:39 +02:00 committed by GitHub
parent b742f58829
commit f367acbeaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models.py
View File

@ -690,11 +690,11 @@ class User(Base, ModelMixin, UserMixin, PasswordOracle):
if sub: if sub:
if sub.cancelled: if sub.cancelled:
channels.append( channels.append(
f"Cancelled Paddle Subscription {sub.subscription_id} {sub.plan_name()}" f"Cancelled Paddle Subscription {sub.subscription_id} {sub.plan_name()} {sub.next_bill_date}"
) )
else: else:
channels.append( channels.append(
f"Active Paddle Subscription {sub.subscription_id} {sub.plan_name()}" f"Active Paddle Subscription {sub.subscription_id} {sub.plan_name()} {sub.next_bill_date}"
) )
apple_sub: AppleSubscription = AppleSubscription.get_by(user_id=self.id) apple_sub: AppleSubscription = AppleSubscription.get_by(user_id=self.id)

6
email_handler.py
View File

@ -168,9 +168,7 @@ from init_app import load_pgp_public_keys
from server import create_light_app from server import create_light_app
def get_or_create_contact( def get_or_create_contact(from_header: str, mail_from: str, alias: Alias) -> Contact:
from_header: str, mail_from: str, alias: Alias, msg: Message
) -> Contact:
""" """
contact_from_header is the RFC 2047 format FROM header contact_from_header is the RFC 2047 format FROM header
""" """
@ -626,7 +624,7 @@ def handle_forward(envelope, msg: Message, rcpt_to: str) -> List[Tuple[bool, str
from_header = get_header_unicode(msg[headers.FROM]) from_header = get_header_unicode(msg[headers.FROM])
LOG.d("Create or get contact for from_header:%s", from_header) LOG.d("Create or get contact for from_header:%s", from_header)
try: try:
contact = get_or_create_contact(from_header, envelope.mail_from, alias, msg) contact = get_or_create_contact(from_header, envelope.mail_from, alias)
except ObjectDeletedError: except ObjectDeletedError:
LOG.d("maybe alias was deleted in the meantime") LOG.d("maybe alias was deleted in the meantime")
alias = Alias.get_by(email=alias_address) alias = Alias.get_by(email=alias_address)