kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3176 from sbwalker/dev

Browse Source 
improve UX for Extend license option
This commit is contained in:
Shaun Walker 2023-08-23 09:39:04 -04:00 committed by GitHub
commit 412405e22c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
View File

@ -99,47 +99,50 @@ else
} }
@code { @code {
private List<ModuleDefinition> _moduleDefinitions; private List<ModuleDefinition> _moduleDefinitions;
private List<Package> _packages; private List<Package> _packages;
private List<string> _categories = new List<string>(); private List<string> _categories = new List<string>();
private string _category = "Common"; private string _category = "Common";
public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
protected override async Task OnParametersSetAsync() protected override async Task OnParametersSetAsync()
{ {
try try
{ {
_moduleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId); _moduleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
_packages = await PackageService.GetPackagesAsync("module"); _packages = await PackageService.GetPackagesAsync("module");
_categories = _moduleDefinitions.SelectMany(m => m.Categories.Split(',')).Distinct().ToList(); _categories = _moduleDefinitions.SelectMany(m => m.Categories.Split(',')).Distinct().ToList();
} }
catch (Exception ex) catch (Exception ex)
{ {
if (_moduleDefinitions == null) if (_moduleDefinitions == null)
{ {
await logger.LogError(ex, "Error Loading Modules {Error}", ex.Message); await logger.LogError(ex, "Error Loading Modules {Error}", ex.Message);
AddModuleMessage(Localizer["Error.Module.Load"], MessageType.Error); AddModuleMessage(Localizer["Error.Module.Load"], MessageType.Error);
} }
} }
} }
private string PurchaseLink(string packagename) private string PurchaseLink(string packagename)
{ {
string link = ""; string link = "";
if (!string.IsNullOrEmpty(packagename) && _packages != null) if (!string.IsNullOrEmpty(packagename) && _packages != null)
{ {
var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault(); var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
if (package != null) if (package != null)
{ {
if (package.ExpiryDate != null && package.ExpiryDate.Value.Date != DateTime.MaxValue.Date) if (package.ExpiryDate != null && package.ExpiryDate.Value.Date != DateTime.MaxValue.Date)
{ {
link += "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span><br />"; if (string.IsNullOrEmpty(package.PaymentUrl))
if (!string.IsNullOrEmpty(package.PaymentUrl)) {
{ link = "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span>";
link += "&nbsp;&nbsp;<a class=\"btn btn-primary\" style=\"text-decoration: none !important\" href=\"" + package.PaymentUrl + "\" target=\"_new\">" + SharedLocalizer["Extend"] + "</a>"; }
} else
} {
link = "<a class=\"btn btn-primary\" style=\"text-decoration: none !important\" href=\"" + package.PaymentUrl + "\" target=\"_new\">" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</a>";
}
}
} }
} }
return link; return link;

11
Oqtane.Client/Modules/Admin/Themes/Index.razor
View File

@ -100,11 +100,14 @@ else
if (package != null) if (package != null)
{ {
if (package.ExpiryDate != null && package.ExpiryDate.Value.Date != DateTime.MaxValue.Date) if (package.ExpiryDate != null && package.ExpiryDate.Value.Date != DateTime.MaxValue.Date)
{ {
link += "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span><br />"; if (string.IsNullOrEmpty(package.PaymentUrl))
if (!string.IsNullOrEmpty(package.PaymentUrl))
{ {
link += "&nbsp;&nbsp;<a class=\"btn btn-primary\" style=\"text-decoration: none !important\" href=\"" + package.PaymentUrl + "\" target=\"_new\">" + SharedLocalizer["Extend"] + "</a>"; link = "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span>";
}
else
{
link = "<a class=\"btn btn-primary\" style=\"text-decoration: none !important\" href=\"" + package.PaymentUrl + "\" target=\"_new\">" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</a>";
} }
} }
} }