From 288c0fe492ee4a562dff8ae86f39e34243cebfd4 Mon Sep 17 00:00:00 2001 From: "ashutosh.nehete" Date: Sat, 16 Aug 2025 17:26:42 +0530 Subject: [PATCH] Adding the days to end date while adding or updating subscription rather than months --- .../Controllers/TenantController.cs | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Marco.Pms.Services/Controllers/TenantController.cs b/Marco.Pms.Services/Controllers/TenantController.cs index d05f0c3..cb5ca10 100644 --- a/Marco.Pms.Services/Controllers/TenantController.cs +++ b/Marco.Pms.Services/Controllers/TenantController.cs @@ -874,10 +874,10 @@ namespace Marco.Pms.Services.Controllers // Prepare subscription dates based on frequency var endDate = subscriptionPlan.Frequency switch { - PLAN_FREQUENCY.MONTHLY => utcNow.AddMonths(1), - PLAN_FREQUENCY.QUARTERLY => utcNow.AddMonths(3), - PLAN_FREQUENCY.HALF_YEARLY => utcNow.AddMonths(6), - PLAN_FREQUENCY.YEARLY => utcNow.AddMonths(12), + PLAN_FREQUENCY.MONTHLY => utcNow.AddDays(30), + PLAN_FREQUENCY.QUARTERLY => utcNow.AddDays(90), + PLAN_FREQUENCY.HALF_YEARLY => utcNow.AddDays(120), + PLAN_FREQUENCY.YEARLY => utcNow.AddDays(360), _ => utcNow // default if unknown }; @@ -1123,10 +1123,10 @@ namespace Marco.Pms.Services.Controllers { newEndDate = subscriptionPlan.Frequency switch { - PLAN_FREQUENCY.MONTHLY => currentSubscription.EndDate.AddMonths(1), - PLAN_FREQUENCY.QUARTERLY => currentSubscription.EndDate.AddMonths(3), - PLAN_FREQUENCY.HALF_YEARLY => currentSubscription.EndDate.AddMonths(6), - PLAN_FREQUENCY.YEARLY => currentSubscription.EndDate.AddMonths(12), + PLAN_FREQUENCY.MONTHLY => currentSubscription.EndDate.AddDays(30), + PLAN_FREQUENCY.QUARTERLY => currentSubscription.EndDate.AddDays(90), + PLAN_FREQUENCY.HALF_YEARLY => currentSubscription.EndDate.AddDays(120), + PLAN_FREQUENCY.YEARLY => currentSubscription.EndDate.AddDays(360), _ => currentSubscription.EndDate }; } @@ -1134,11 +1134,11 @@ namespace Marco.Pms.Services.Controllers { newEndDate = subscriptionPlan.Frequency switch { - PLAN_FREQUENCY.MONTHLY => utcNow.AddMonths(1), - PLAN_FREQUENCY.QUARTERLY => utcNow.AddMonths(3), - PLAN_FREQUENCY.HALF_YEARLY => utcNow.AddMonths(6), - PLAN_FREQUENCY.YEARLY => utcNow.AddMonths(12), - _ => utcNow + PLAN_FREQUENCY.MONTHLY => utcNow.AddDays(30), + PLAN_FREQUENCY.QUARTERLY => utcNow.AddDays(90), + PLAN_FREQUENCY.HALF_YEARLY => utcNow.AddDays(120), + PLAN_FREQUENCY.YEARLY => utcNow.AddDays(360), + _ => utcNow // default if unknown }; } @@ -1179,11 +1179,11 @@ namespace Marco.Pms.Services.Controllers // 7a. Compute new plan dates var endDate = subscriptionPlan.Frequency switch { - PLAN_FREQUENCY.MONTHLY => utcNow.AddMonths(1), - PLAN_FREQUENCY.QUARTERLY => utcNow.AddMonths(3), - PLAN_FREQUENCY.HALF_YEARLY => utcNow.AddMonths(6), - PLAN_FREQUENCY.YEARLY => utcNow.AddMonths(12), - _ => utcNow + PLAN_FREQUENCY.MONTHLY => utcNow.AddDays(30), + PLAN_FREQUENCY.QUARTERLY => utcNow.AddDays(90), + PLAN_FREQUENCY.HALF_YEARLY => utcNow.AddDays(120), + PLAN_FREQUENCY.YEARLY => utcNow.AddDays(360), + _ => utcNow // default if unknown }; var newSubscription = new TenantSubscriptions