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

Api: added payment settings

Browse Source
This commit is contained in:
pavelbannov 2020-09-07 16:53:39 +03:00
parent 66009ff013
commit 96df0ab8ca
7 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/appsettings.json
View File

@ -100,7 +100,9 @@
},
"controlpanel": {
"url": ""
}
},
"support-feedback": "https://helpdesk.onlyoffice.com",
"teamlab-site": "http://www.onlyoffice.com"
},
"ConnectionStrings": {
"default": {

2
products/ASC.Files/Core/Helpers/Global.cs
View File

@ -417,7 +417,7 @@ namespace ASC.Web.Files.Classes
id = my ? folderDao.GetFolderIDUser(true) : folderDao.GetFolderIDCommon(true);
//Copy start document
if (AdditionalWhiteLabelSettings.Instance(SettingsManager).StartDocsEnabled)
if (SettingsManager.LoadForDefaultTenant<AdditionalWhiteLabelSettings>().StartDocsEnabled)
{
try
{

7
products/ASC.Files/Core/Services/DocumentService/Configuration.cs
View File

@ -593,13 +593,14 @@ namespace ASC.Web.Files.Services.DocumentService
set { }
get
{
if (CoreBaseSettings.Standalone) return null;
if (!AdditionalWhiteLabelSettings.Instance(SettingsManager).FeedbackAndSupportEnabled) return null;
if (CoreBaseSettings.Standalone) return null;
var settings = SettingsManager.LoadForDefaultTenant<AdditionalWhiteLabelSettings>();
if (!settings.FeedbackAndSupportEnabled) return null;
return new FeedbackConfig
{
Url = BaseCommonLinkUtility.GetRegionalUrl(
AdditionalWhiteLabelSettings.Instance(SettingsManager).FeedbackAndSupportUrl,
settings.FeedbackAndSupportUrl,
CultureInfo.CurrentCulture.TwoLetterISOLanguageName),
};
}

22
web/ASC.Web.Api/Controllers/SettingsController.cs
View File

@ -1821,6 +1821,28 @@ namespace ASC.Api.Settings
return changed;
}
[Read("payment")]
public object PaymentSettings()
{
var settings = SettingsManager.LoadForDefaultTenant<AdditionalWhiteLabelSettings>();
var currentQuota = TenantExtra.GetTenantQuota();
var currentTariff = TenantExtra.GetCurrentTariff();
return
new
{
settings.SalesEmail,
settings.FeedbackAndSupportUrl,
settings.BuyUrl,
CoreBaseSettings.Standalone,
currentLicense = new
{
currentQuota.Trial,
currentTariff.DueDate.Date
}
};
}
private readonly int maxCount = 10;
private readonly int expirationMinutes = 2;
private void CheckCache(string basekey)

2
web/ASC.Web.Core/Notify/StudioNotifyService.cs
View File

@ -144,7 +144,7 @@ namespace ASC.Web.Studio.Core.Notify
if (string.IsNullOrEmpty(site)) throw new ArgumentNullException("site");
message = (message ?? "").Trim();
var salesEmail = AdditionalWhiteLabelSettings.Instance(SettingsManager).SalesEmail ?? SetupInfo.SalesEmail;
var salesEmail = SettingsManager.LoadForDefaultTenant<AdditionalWhiteLabelSettings>().SalesEmail ?? SetupInfo.SalesEmail;
var recipient = (IRecipient)(new DirectRecipient(AuthContext.CurrentAccount.ID.ToString(), string.Empty, new[] { salesEmail }, false));

2
web/ASC.Web.Core/Utility/CommonLinkUtility.cs
View File

@ -488,7 +488,7 @@ namespace ASC.Web.Studio.Utility
public string GetHelpLink(SettingsManager settingsManager, AdditionalWhiteLabelSettingsHelper additionalWhiteLabelSettingsHelper, bool inCurrentCulture = true)
{
if (!AdditionalWhiteLabelSettings.Instance(settingsManager).HelpCenterEnabled)
if (!settingsManager.LoadForDefaultTenant<AdditionalWhiteLabelSettings>().HelpCenterEnabled)
return string.Empty;
var url = additionalWhiteLabelSettingsHelper.DefaultHelpCenterUrl;

15
web/ASC.Web.Core/WhiteLabel/AdditionalWhiteLabelSettings.cs
View File

@ -123,11 +123,6 @@ namespace ASC.Web.Core.WhiteLabel
}
}
public static AdditionalWhiteLabelSettings Instance(SettingsManager settingsManager)
{
return settingsManager.LoadForDefaultTenant<AdditionalWhiteLabelSettings>();
}
public ISettings GetDefault(IServiceProvider serviceProvider)
{
return GetDefault(serviceProvider.GetService<IConfiguration>());
@ -147,7 +142,7 @@ namespace ASC.Web.Core.WhiteLabel
{
get
{
var url = Configuration["web.help-center"];
var url = Configuration["web:help-center"];
return string.IsNullOrEmpty(url) ? null : url;
}
}
@ -156,7 +151,7 @@ namespace ASC.Web.Core.WhiteLabel
{
get
{
var url = Configuration["web.support-feedback"];
var url = Configuration["web:support-feedback"];
return string.IsNullOrEmpty(url) ? null : url;
}
}
@ -165,7 +160,7 @@ namespace ASC.Web.Core.WhiteLabel
{
get
{
var url = Configuration["web.user-forum"];
var url = Configuration["web:user-forum"];
return string.IsNullOrEmpty(url) ? null : url;
}
}
@ -183,7 +178,7 @@ namespace ASC.Web.Core.WhiteLabel
{
get
{
var email = Configuration["web.payment.email"];
var email = Configuration["web:payment:email"];
return !string.IsNullOrEmpty(email) ? email : "sales@onlyoffice.com";
}
}
@ -192,7 +187,7 @@ namespace ASC.Web.Core.WhiteLabel
{
get
{
var site = Configuration["web.teamlab-site"];
var site = Configuration["web:teamlab-site"];
return !string.IsNullOrEmpty(site) ? site + "/post.ashx?type=buyenterprise" : "";
}
}