beenull/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[mobile][web] Ignore cancelled subscriptions while computing past-due status

Browse source
This commit is contained in:
vishnukvmd 2024-03-27 16:11:03 +05:30
parent a15e9b0c9a
commit 1020366c3a
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mobile/lib/models/subscription.dart
View file

@ -30,8 +30,13 @@ class Subscription {
return expiryTime > DateTime.now().microsecondsSinceEpoch;
}
bool isCancelled() {
return attributes?.isCancelled ?? false;
}
bool isPastDue() {
return expiryTime < DateTime.now().microsecondsSinceEpoch &&
return !isCancelled() &&
expiryTime < DateTime.now().microsecondsSinceEpoch &&
expiryTime >=
DateTime.now()
.subtract(const Duration(days: 30))

1
web/apps/photos/src/utils/billing/index.ts
View file

@ -155,6 +155,7 @@ export function hasExceededStorageQuota(userDetails: UserDetails) {
export function isSubscriptionPastDue(subscription: Subscription) {
const currentTime = Date.now() * 1000;
return (
!isSubscriptionCancelled(subscription) &&
subscription.expiryTime < currentTime &&
subscription.expiryTime > currentTime - THIRTY_DAYS_IN_MICROSECONDS
);