From 3b56eb5871a29af16048a3802723de908f4cbb3b Mon Sep 17 00:00:00 2001 From: Ivan Ivanov Date: Wed, 20 Mar 2024 03:50:08 +0200 Subject: [PATCH 1/2] Added a way to configure the subscription status --- docker-app/qfieldcloud/subscription/admin.py | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-app/qfieldcloud/subscription/admin.py b/docker-app/qfieldcloud/subscription/admin.py index 3ffb8bb65..04304ca18 100644 --- a/docker-app/qfieldcloud/subscription/admin.py +++ b/docker-app/qfieldcloud/subscription/admin.py @@ -119,6 +119,7 @@ class SubscriptionAdmin(QFieldCloudModelAdmin): fields = ( "plan", "account", + "status", "active_since", "active_until", "billing_cycle_anchor_at", From 8e0df355a3f3452bd3d0cf041062360b05d6f968 Mon Sep 17 00:00:00 2001 From: Ivan Ivanov Date: Wed, 20 Mar 2024 04:15:39 +0200 Subject: [PATCH 2/2] Revert "Fix typo to fix timezones for users from the other side of the world" This reverts commit 8510d2369a5b53fda10c99f7cd683c861a6b0638. Prevents creating subscriptions active in the future. --- docker-app/qfieldcloud/core/middleware/timezone.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-app/qfieldcloud/core/middleware/timezone.py b/docker-app/qfieldcloud/core/middleware/timezone.py index c413b1115..8eca27458 100644 --- a/docker-app/qfieldcloud/core/middleware/timezone.py +++ b/docker-app/qfieldcloud/core/middleware/timezone.py @@ -9,7 +9,7 @@ def __init__(self, get_response): def __call__(self, request): if request.user.is_authenticated and hasattr( - request.user.useraccount, "timezone" + request.user.useraccount, "useraccount" ): user_tz = request.user.useraccount.timezone elif settings.TIME_ZONE: