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

Api: payments. Removed FeaturePriceDto

Browse Source
This commit is contained in:
pavelbannov 2022-09-13 19:59:57 +03:00
parent 6e51001e34
commit 7a17f325b1
4 changed files with 4 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/ASC.Web.Api/ApiModels/ResponseDto/QuotaDto.cs
View File

@ -48,7 +48,7 @@ public class TenantQuotaFeatureDto : IEquatable<TenantQuotaFeatureDto>
public object Value { get; set; }
public string Type { get; set; }
public FeatureUsedDto Used { get; set; }
public FeaturePriceDto Price { get; set; }
public string PriceTitle { get; set; }
public bool Equals(TenantQuotaFeatureDto other)
{
@ -70,12 +70,6 @@ public class PriceDto
public string CurrencySymbol { get; set; }
}
public class FeaturePriceDto
{
public string Count { get; set; }
public string Per { get; set; }
}
public class FeatureUsedDto
{
public object Value { get; set; }

21
web/ASC.Web.Api/Core/QuotaHelper.cs
View File

@ -61,7 +61,7 @@ public class QuotaHelper
private QuotaDto ToQuotaDto(TenantQuota quota, IDictionary<string, Dictionary<string, decimal>> priceInfo, RegionInfo currentRegion, bool getUsed = false)
{
var price = GetPrice(quota, priceInfo, currentRegion);
var features = GetFeatures(quota, GetPriceString(price, currentRegion), getUsed);
var features = GetFeatures(quota, getUsed);
return new QuotaDto
{
@ -95,18 +95,7 @@ public class QuotaHelper
return quota.Price;
}
private string GetPriceString(decimal price, RegionInfo currentRegion)
{
var inEuro = "EUR".Equals(currentRegion.ISOCurrencySymbol);
var priceString = inEuro && Math.Truncate(price) != price ?
price.ToString(CultureInfo.InvariantCulture) :
((int)price).ToString(CultureInfo.InvariantCulture);
return string.Format("{0}{1}", currentRegion.CurrencySymbol, priceString);
}
private async IAsyncEnumerable<TenantQuotaFeatureDto> GetFeatures(TenantQuota quota, string price, bool getUsed)
private async IAsyncEnumerable<TenantQuotaFeatureDto> GetFeatures(TenantQuota quota, bool getUsed)
{
var assembly = GetType().Assembly;
@ -118,11 +107,7 @@ public class QuotaHelper
if (feature.Paid)
{
result.Price = new FeaturePriceDto
{
Per = string.Format(Resource.ResourceManager.GetString($"TariffsFeature_{feature.Name}_price_per"), price),
Count = Resource.ResourceManager.GetString($"TariffsFeature_{feature.Name}_price_count")
};
result.PriceTitle = Resource.ResourceManager.GetString($"TariffsFeature_{feature.Name}_price_count");
}
result.Id = feature.Name;

18
web/ASC.Web.Core/PublicResources/Resource.Designer.cs generated
View File

@ -2184,15 +2184,6 @@ namespace ASC.Web.Core.PublicResources {
}
}
/// <summary>
/// Looks up a localized string similar to {0} per manager/month.
/// </summary>
public static string TariffsFeature_manager_price_per {
get {
return ResourceManager.GetString("TariffsFeature_manager_price_per", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Automatic backup &amp; recovery.
/// </summary>
@ -2238,15 +2229,6 @@ namespace ASC.Web.Core.PublicResources {
}
}
/// <summary>
/// Looks up a localized string similar to .
/// </summary>
public static string TariffsFeature_total_size_price_per {
get {
return ResourceManager.GetString("TariffsFeature_total_size_price_per", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Storage space used:.
/// </summary>

6
web/ASC.Web.Core/PublicResources/Resource.resx
View File

@ -828,9 +828,6 @@
<data name="TariffsFeature_manager_price_count" xml:space="preserve">
<value>Number of managers</value>
</data>
<data name="TariffsFeature_manager_price_per" xml:space="preserve">
<value>{0} per manager/month</value>
</data>
<data name="TariffsFeature_audit" xml:space="preserve">
<value>Tracking user logins &amp; action</value>
</data>
@ -867,9 +864,6 @@
<data name="TariffsFeature_total_size_price_count" xml:space="preserve">
<value>Storage space</value>
</data>
<data name="TariffsFeature_total_size_price_per" xml:space="preserve">
<value />
</data>
<data name="TariffsFeature_file_size" xml:space="preserve">
<value>Max file size</value>
</data>