IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1579 from ONLYOFFICE/feature/fixed-license

Browse Source 
fixed license upload
This commit is contained in:
Alexey Safronov 2023-07-24 12:25:05 +04:00 committed by GitHub
commit ba218993c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/ASC.Core.Common/Billing/TariffService.cs
View File

@ -285,7 +285,7 @@ public class TariffService : ITariffService
UpdateCache(tariff.Id);
}
}
else if (_tenantExtraConfig.Enterprise && tariff.Id == 0)
else if (_tenantExtraConfig.Enterprise && tariff.Id == 0 && tariff.LicenseDate == DateTime.MaxValue)
{
var defaultQuota = _quotaService.GetTenantQuota(Tenant.DefaultTenant);
@ -301,8 +301,7 @@ public class TariffService : ITariffService
tariff = new Tariff
{
Quotas = new List<Quota> { new Quota(quota.Tenant, 1) },
DueDate = DateTime.UtcNow.AddDays(DefaultTrialPeriod),
Id = 1000
DueDate = DateTime.UtcNow.AddDays(DefaultTrialPeriod)
};
SetTariff(-1, tariff, new List<TenantQuota> { quota });
@ -931,6 +930,7 @@ public class TariffService : ITariffService
var unlimTariff = CreateDefault();
unlimTariff.LicenseDate = tariff.DueDate;
unlimTariff.DueDate = tariff.DueDate;
unlimTariff.Quotas = new List<Quota>()
{
new Quota(defaultQuota.Tenant, 1)