Merge branch 'fix-conflicts-merge' of github.com:ONLYOFFICE/DocSpace into fix-conflicts-merge
This commit is contained in:
commit
23584368ed
@ -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)
|
||||
|
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user