CU-8685awfkp fixing issue with new count plan upgrades for lapsed cus…

…tomers
Resgrid · Jun 28, 2024 · b45ab59 · b45ab59
1 parent 60b989a
commit b45ab59
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 234 deletions.
diff --git a/Core/Resgrid.Model/Services/ISubscriptionsService.cs b/Core/Resgrid.Model/Services/ISubscriptionsService.cs
@@ -246,7 +246,7 @@ Task<CreateStripeBillingPortalSessionData> CreateStripeSessionForCustomerPortal(
 
 		Task<PaymentProviderEvent> SavePaymentEventAsync(PaymentProviderEvent providerEvent, CancellationToken cancellationToken = default(CancellationToken));
 
-		Task<CreateStripeSessionForUpdateData> CreateStripeSessionForSub(int departmentId, string stripeCustomerId, string stripePlanId, int planId, string email, string departmentName);
+		Task<CreateStripeSessionForUpdateData> CreateStripeSessionForSub(int departmentId, string stripeCustomerId, string stripePlanId, int planId, string email, string departmentName, int count);
 
 		Task<ChangeActiveSubscriptionData> ChangeActiveSubscriptionAsync(string stripeCustomerId, string stripePlanId);
 	}

diff --git a/Core/Resgrid.Services/SubscriptionsService.cs b/Core/Resgrid.Services/SubscriptionsService.cs
@@ -1108,7 +1108,7 @@ public async Task<CreateStripeBillingPortalSessionData> CreateStripeSessionForCu
 			return await _paymentProviderEventsRepository.SaveOrUpdateAsync(providerEvent, cancellationToken);
 		}
 
-		public async Task<CreateStripeSessionForUpdateData> CreateStripeSessionForSub(int departmentId, string stripeCustomerId, string stripePlanId, int planId, string email, string departmentName)
+		public async Task<CreateStripeSessionForUpdateData> CreateStripeSessionForSub(int departmentId, string stripeCustomerId, string stripePlanId, int planId, string email, string departmentName, int count)
 		{
 			if (!String.IsNullOrWhiteSpace(Config.SystemBehaviorConfig.BillingApiBaseUrl) && !String.IsNullOrWhiteSpace(Config.ApiConfig.BackendInternalApikey))
 			{
@@ -1120,6 +1120,7 @@ public async Task<CreateStripeSessionForUpdateData> CreateStripeSessionForSub(in
 				request.AddParameter("departmentId", departmentId, ParameterType.QueryString);
 				request.AddParameter("stripePlanId", stripePlanId, ParameterType.QueryString);
 				request.AddParameter("planId", planId, ParameterType.QueryString);
+				request.AddParameter("count", count, ParameterType.QueryString);
 				request.AddParameter("email", email, ParameterType.QueryString, true);
 				request.AddParameter("departmentName", departmentName, ParameterType.QueryString, true);
 

diff --git a/Tools/Resgrid.Console/Properties/PublishProfiles/FolderProfile.pubxml b/Tools/Resgrid.Console/Properties/PublishProfiles/FolderProfile.pubxml
@@ -8,11 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>bin\Release\netcoreapp3.1\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <SelfContained>true</SelfContained>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <PublishSingleFile>False</PublishSingleFile>
-    <PublishReadyToRun>False</PublishReadyToRun>
-    <PublishTrimmed>False</PublishTrimmed>
+    <TargetFramework>net8.0</TargetFramework>
+    <SelfContained>false</SelfContained>
   </PropertyGroup>
 </Project>