Merge branch 'fix-conflicts-merge' of github.com:ONLYOFFICE/DocSpace into fix-conflicts-merge

This commit is contained in:
Timofey Boyko 2023-07-20 13:33:58 +03:00
commit 23584368ed
2 changed files with 2 additions and 2 deletions

View File

@ -221,7 +221,7 @@ public class LicenseReader
DueDate = license.DueDate,
};
await _tariffService.SetTariffAsync(-1, tariff, new List<TenantQuota> { quota });
await _tariffService.SetTariffAsync(-2, tariff, new List<TenantQuota> { quota });
}
private void LogError(Exception error)

View File

@ -170,7 +170,7 @@ public class LicenseController : BaseSettingsController
DueDate = DateTime.Today.AddDays(DEFAULT_TRIAL_PERIOD)
};
await _tariffService.SetTariffAsync(-1, tariff, new List<TenantQuota>() { quota });
await _tariffService.SetTariffAsync(-2, tariff, new List<TenantQuota>() { quota });
await _messageService.SendAsync(MessageAction.LicenseKeyUploaded);