diff --git a/Controllers/RvlController.cs b/Controllers/RvlController.cs
index fb46670..2424bbc 100644
--- a/Controllers/RvlController.cs
+++ b/Controllers/RvlController.cs
@@ -110,7 +110,7 @@ namespace rockfishCore.Controllers
newLicense.RegisteredTo = l.RegisteredTo;
newLicense.DbId = l.DbId;
- newLicense.Perpetual=l.Perpetual;
+ newLicense.Perpetual = l.Perpetual;
if (l.LicenseExpires)
newLicense.LicenseExpiration = DateUtil.EpochToDate(l.LicenseExpirationDate);
else
@@ -144,16 +144,12 @@ namespace rockfishCore.Controllers
//If key is not revoked (don't warn them in that case) send notification to customer
if (l.RegisteredTo != RavenKeyFactory.REVOKED_TOKEN)
{
-
- var body = $"Thank you for your purchase!\nYour AyaNova license key is ready to be installed.\nAyaNova will fetch it automatically within 24 hours or you can force it to fetch immediately from the License page in AyaNova now.\n---\n{newLicense}";
+ string licenseKeyType = "license";
+ if (!l.Perpetual)
+ licenseKeyType = "activation";
+ var body = $"Your AyaNova {licenseKeyType} key is ready to be installed.\nAyaNova will fetch it automatically within 24 hours or you can force it to fetch immediately from the License page in AyaNova now.\n---\n{newLicense}";
//send license email
-#if (DEBUG)
- RfMail.SendMessage("support@ayanova.com", "cardjohn@ayanova.com", "AyaNova license key", body, false);
-#else
-//throw new System.Exception("UNCOMMENT THIS FOR PRODUCTION");
- RfMail.SendMessage("support@ayanova.com", Customer.AdminEmail, "AyaNova license key", body, false);
-#endif
-
+ RfMail.SendMessage("support@ayanova.com", Customer.AdminEmail, $"AyaNova {licenseKeyType} key", body, false);
}
return Ok("ok");
}
diff --git a/notes/deploy.txt b/notes/deploy.txt
index 4f79fae..9d04e75 100644
--- a/notes/deploy.txt
+++ b/notes/deploy.txt
@@ -5,7 +5,7 @@
1) SET VERSION
SET app.api RFVERSION property
-RENAME ?rfv=6.25 parameter in default.htm to the new version so all files update on mobile
+RENAME ?rfv=6.26 parameter in default.htm to the new version so all files update on mobile
1.5) Run buildtemplates.bat if handlebars templates have changed at all
diff --git a/util/RavenKeyFactory.cs b/util/RavenKeyFactory.cs
index be570ad..a4ff8de 100644
--- a/util/RavenKeyFactory.cs
+++ b/util/RavenKeyFactory.cs
@@ -75,13 +75,13 @@ namespace rockfishCore.Util
{
System.Text.StringBuilder sb = new StringBuilder();
- sb.AppendLine("LICENSE DETAILS");
sb.AppendLine($"Registered to: {RegisteredTo}");
sb.AppendLine($"Database id: {DbId}");
sb.AppendLine($"Type: {(Perpetual ? "Perpetual" : "Subscription")}");
if (WillExpire)
- sb.AppendLine($"License valid until: {LicenseExpiration.ToLongDateString()}");
- sb.AppendLine($"Maintenance until: {MaintenanceExpiration.ToLongDateString()}");
+ sb.AppendLine($"Available for use until: {LicenseExpiration.ToLongDateString()}");
+ if (Perpetual)
+ sb.AppendLine($"Support and updates available until: {MaintenanceExpiration.ToLongDateString()}");
foreach (LicenseFeature f in Features)
{
if (f.Feature == TRIAL_FEATURE_NAME)
diff --git a/util/RfVersion.cs b/util/RfVersion.cs
index c9c40cc..eced459 100644
--- a/util/RfVersion.cs
+++ b/util/RfVersion.cs
@@ -2,7 +2,7 @@ namespace rockfishCore.Util
{
public static class RfVersion
{
- public const string NumberOnly="6.25";
+ public const string NumberOnly="6.26";
public const string Full = "Rockfish server " + NumberOnly;
}
}
\ No newline at end of file
diff --git a/wwwroot/default.htm b/wwwroot/default.htm
index f761d2d..570214b 100644
--- a/wwwroot/default.htm
+++ b/wwwroot/default.htm
@@ -11,76 +11,76 @@
Rockfish loading....
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+