From 319721d5eede06428f4cfb546787b215da9f4d3b Mon Sep 17 00:00:00 2001 From: Sanskar Soni Date: Fri, 13 Mar 2026 14:20:15 +0530 Subject: [PATCH] feat(boot): consider invoice_due_date for site expiration Signed-off-by: Sanskar Soni --- clientside/boot.py | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/clientside/boot.py b/clientside/boot.py index 4c54e6e..aa9d082 100644 --- a/clientside/boot.py +++ b/clientside/boot.py @@ -1,23 +1,32 @@ import frappe + def extend_bootinfo(bootinfo): from frappe.utils import today, getdate, add_days + today_date = getdate(today()) + subscription_ends_on = frappe.conf.subscription_ends_on subscription_status = frappe.conf.subscription_status + invoice_due_date = frappe.conf.invoice_due_date + expiry_date = getdate(invoice_due_date or subscription_ends_on) bootinfo.subscription_expired = False - if subscription_status in ["unpaid", "canceled", "incomplete", "incomplete_expired", "paused"]: + if subscription_status in [ + "unpaid", + "canceled", + "incomplete", + "incomplete_expired", + "paused", + ]: bootinfo.subscription_expired = True - elif subscription_status in ["past_due", "trialing"]: - if subscription_ends_on: - today_date = getdate(today()) - expiry_date = getdate(subscription_ends_on) - - if subscription_status != "trialing" and today_date > add_days(expiry_date, 5): + if expiry_date: + if subscription_status != "trialing" and today_date > add_days( + expiry_date, 5 + ): bootinfo.subscription_expired = True bootinfo.chat_widget_base_url = frappe.conf.chat_widget_base_url