Merge pull request #3025 from sbwalker/dev

SupportUrl integration

Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor

@@ -45,6 +45,7 @@ else
             <th>@SharedLocalizer["Version"]</th>
             <th>@Localizer["Enabled"]</th>
             <th>@Localizer["InUse"]</th>
+            <th>@SharedLocalizer["Support"]</th>
             <th>@SharedLocalizer["Expires"]</th>
             <th style="width: 1px;">&nbsp;</th>
         </Header>
@@ -78,6 +79,9 @@ else
                     <span>@SharedLocalizer["No"]</span>
                 }
             </td>
+            <td>
+                @((MarkupString)SupportLink(context.PackageName))
+            </td>
             <td>
                 @((MarkupString)PurchaseLink(context.PackageName))
             </td>
@@ -130,7 +134,7 @@ else
 			{
 				if (package.ExpiryDate != null && package.ExpiryDate.Value.Date != DateTime.MaxValue.Date)
 				{
-					link += "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span>";
+					link += "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span><br />";
 					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>";
@@ -141,6 +145,20 @@ else
 		return link;
 	}
 
+    private string SupportLink(string packagename)
+    {
+        string link = "";
+        if (!string.IsNullOrEmpty(packagename) && _packages != null)
+        {
+            var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
+            if (package != null && !string.IsNullOrEmpty(package.SupportUrl))
+            {
+                link += "<a class=\"btn btn-success\" style=\"text-decoration: none !important\" href=\"" + package.SupportUrl + "\" target=\"_new\">" + SharedLocalizer["Help"] + "</a>";
+            }
+        }
+        return link;
+    }
+
 	private string UpgradeAvailable(string packagename, string version)
 	{
 		if (!string.IsNullOrEmpty(packagename) && _packages != null)

Oqtane.Client/Modules/Admin/Themes/Index.razor

@@ -24,6 +24,7 @@ else
             <th>@SharedLocalizer["Name"]</th>
             <th>@SharedLocalizer["Version"]</th>
             <th>@Localizer["Enabled"]</th>
+            <th>@SharedLocalizer["Support"]</th>
             <th>@SharedLocalizer["Expires"]</th>
             <th>&nbsp;</th>
         </Header>
@@ -47,6 +48,9 @@ else
                     <span>@SharedLocalizer["No"]</span>
                 }
             </td>
+            <td>
+                @((MarkupString)SupportLink(context.PackageName))
+            </td>
             <td>
                 @((MarkupString)PurchaseLink(context.PackageName))
             </td>
@@ -97,7 +101,7 @@ else
             {
                 if (package.ExpiryDate != null && package.ExpiryDate.Value.Date != DateTime.MaxValue.Date)
                 {
-                    link += "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span>";
+                    link += "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span><br />";
                     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>";
@@ -108,6 +112,20 @@ else
         return link;
     }
 
+    private string SupportLink(string packagename)
+    {
+        string link = "";
+        if (!string.IsNullOrEmpty(packagename) && _packages != null)
+        {
+            var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
+            if (package != null && !string.IsNullOrEmpty(package.SupportUrl))
+            {
+                link += "<a class=\"btn btn-success\" style=\"text-decoration: none !important\" href=\"" + package.SupportUrl + "\" target=\"_new\">" + SharedLocalizer["Help"] + "</a>";
+            }
+        }
+        return link;
+    }
+
 	private string UpgradeAvailable(string packagename, string version)
 	{
 		if (!string.IsNullOrEmpty(packagename) && _packages != null)

Oqtane.Client/Resources/SharedResources.resx

@@ -384,4 +384,10 @@
   <data name="Confirm" xml:space="preserve">
     <value>Confirm</value>
   </data>
+  <data name="Help" xml:space="preserve">
+    <value>Help</value>
+  </data>
+  <data name="Support" xml:space="preserve">
+    <value>Support</value>
+  </data>
 </root>

Oqtane.Server/Controllers/PackageController.cs

@@ -45,6 +45,15 @@ namespace Oqtane.Controllers
                     client.DefaultRequestHeaders.Add("Referer", HttpContext.Request.Scheme + "://" + HttpContext.Request.Host.Value);
                     client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(Constants.PackageId, Constants.Version));
                     packages = await GetJson<List<Package>>(client, Constants.PackageRegistryUrl + $"/api/registry/packages/?id={_configManager.GetInstallationId()}&type={type.ToLower()}&version={Constants.Version}&search={search}&price={price}&package={package}&sort={sort}");
+                    if (packages != null)
+                    {
+                        var installationid = _configManager.GetInstallationId();
+                        foreach (var _package in packages)
+                        {
+                            _package.PaymentUrl = _package.PaymentUrl.Replace("{InstallationId}", installationid);
+                            _package.SupportUrl = _package.SupportUrl.Replace("{InstallationId}", installationid);
+                        }
+                    }
                 }
             }
             return packages;
@@ -64,6 +73,13 @@ namespace Oqtane.Controllers
                     client.DefaultRequestHeaders.Add("Referer", HttpContext.Request.Scheme + "://" + HttpContext.Request.Host.Value);
                     client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(Constants.PackageId, Constants.Version));
                     package = await GetJson<Package>(client, Constants.PackageRegistryUrl + $"/api/registry/package/?id={_configManager.GetInstallationId()}&package={packageid}&version={version}&download={download}");
+                    if (package != null)
+                    {
+                        var installationid = _configManager.GetInstallationId();
+                        package.PaymentUrl = package.PaymentUrl.Replace("{InstallationId}", installationid);
+                        package.SupportUrl = package.SupportUrl.Replace("{InstallationId}", installationid);
+
+                    }
                 }
 
                 if (package != null)