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

Payments: fix delay

Browse Source
This commit is contained in:
pavelbannov 2022-10-05 13:38:35 +03:00
parent d3d4ff6639
commit 803f342d2d
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -781,12 +781,14 @@ public class TariffService : ITariffService
} }
var delay = 0; var delay = 0;
bool setDelay = true;
if (_trialEnabled) if (_trialEnabled)
{ {
var trial = tariff.Quotas.Exists(q => _quotaService.GetTenantQuota(q.Id).Trial); var trial = tariff.Quotas.Exists(q => _quotaService.GetTenantQuota(q.Id).Trial);
if (trial) if (trial)
{ {
setDelay = false;
tariff.State = TariffState.Trial; tariff.State = TariffState.Trial;
if (tariff.DueDate == DateTime.MinValue || tariff.DueDate == DateTime.MaxValue) if (tariff.DueDate == DateTime.MinValue || tariff.DueDate == DateTime.MaxValue)
{ {
@ -808,13 +810,14 @@ public class TariffService : ITariffService
} }
} }
} }
else
{
delay = _paymentDelay;
}
} }
if (tariff.DueDate != DateTime.MinValue && tariff.DueDate.Date < DateTime.Today && delay > 0) if (setDelay)
{
delay = _paymentDelay;
}
if (tariff.DueDate != DateTime.MinValue && tariff.DueDate.Date < DateTime.UtcNow.Date && delay > 0)
{ {
tariff.State = TariffState.Delay; tariff.State = TariffState.Delay;
@ -822,7 +825,7 @@ public class TariffService : ITariffService
} }
if (tariff.DueDate == DateTime.MinValue || if (tariff.DueDate == DateTime.MinValue ||
tariff.DueDate != DateTime.MaxValue && tariff.DueDate.Date.AddDays(delay) < DateTime.Today) tariff.DueDate != DateTime.MaxValue && tariff.DueDate.Date.AddDays(delay) < DateTime.UtcNow.Date)
{ {
tariff.State = TariffState.NotPaid; tariff.State = TariffState.NotPaid;
} }