Browse Source

[PM-21418] Do not start organization on trial when request includes `SkipTrial` (#5793)

* Do not start organization on a trial when createRequest.SkipTrial is true

* Run dotnet format
pull/5820/head
Alex Morask 8 months ago committed by GitHub
parent
commit
ca40226380
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 3
      src/Api/AdminConsole/Models/Request/Organizations/OrganizationCreateRequestModel.cs
  2. 15
      src/Core/Billing/Models/Sales/OrganizationSale.cs
  3. 1
      src/Core/Models/Business/OrganizationSignup.cs

3
src/Api/AdminConsole/Models/Request/Organizations/OrganizationCreateRequestModel.cs

@ -75,6 +75,8 @@ public class OrganizationCreateRequestModel : IValidatableObject @@ -75,6 +75,8 @@ public class OrganizationCreateRequestModel : IValidatableObject
public string InitiationPath { get; set; }
public bool SkipTrial { get; set; }
public virtual OrganizationSignup ToOrganizationSignup(User user)
{
var orgSignup = new OrganizationSignup
@ -107,6 +109,7 @@ public class OrganizationCreateRequestModel : IValidatableObject @@ -107,6 +109,7 @@ public class OrganizationCreateRequestModel : IValidatableObject
BillingAddressCountry = BillingAddressCountry,
},
InitiationPath = InitiationPath,
SkipTrial = SkipTrial
};
Keys?.ToOrganizationSignup(orgSignup);

15
src/Core/Billing/Models/Sales/OrganizationSale.cs

@ -27,12 +27,21 @@ public class OrganizationSale @@ -27,12 +27,21 @@ public class OrganizationSale
public static OrganizationSale From(
Organization organization,
OrganizationSignup signup) => new()
OrganizationSignup signup)
{
var customerSetup = string.IsNullOrEmpty(organization.GatewayCustomerId) ? GetCustomerSetup(signup) : null;
var subscriptionSetup = GetSubscriptionSetup(signup);
subscriptionSetup.SkipTrial = signup.SkipTrial;
return new OrganizationSale
{
Organization = organization,
CustomerSetup = string.IsNullOrEmpty(organization.GatewayCustomerId) ? GetCustomerSetup(signup) : null,
SubscriptionSetup = GetSubscriptionSetup(signup)
CustomerSetup = customerSetup,
SubscriptionSetup = subscriptionSetup
};
}
public static OrganizationSale From(
Organization organization,

1
src/Core/Models/Business/OrganizationSignup.cs

@ -16,4 +16,5 @@ public class OrganizationSignup : OrganizationUpgrade @@ -16,4 +16,5 @@ public class OrganizationSignup : OrganizationUpgrade
public string InitiationPath { get; set; }
public bool IsFromSecretsManagerTrial { get; set; }
public bool IsFromProvider { get; set; }
public bool SkipTrial { get; set; }
}

Loading…
Cancel
Save