admin/rockfish
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8.0.3 release

Browse Source
This commit is contained in:
John Cardinal
2022-08-16 02:45:32 +00:00
parent 80417baf8e
commit 90946f90b1
5 changed files with 91 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
util/RavenKeyFactory.cs
View File

@@ -25,13 +25,14 @@ namespace rockfishCore.Util
//Scheduleable users
private const string SERVICE_TECHS_FEATURE_NAME = "ServiceTechs";
//Add-on's / integrations
private const string OLI_FEATURE_NAME = "OLI";
private const string QBI_FEATURE_NAME = "QBI";
private const string QBOI_FEATURE_NAME = "QBOI";
//thse are now included so not relevant here but keeping for renaming for future subscription add-on's
// private const string OLI_FEATURE_NAME = "OLI";
// private const string QBI_FEATURE_NAME = "QBI";
// private const string QBOI_FEATURE_NAME = "QBOI";
//This feature name means it's a trial key
private const string TRIAL_FEATURE_NAME = "TrialMode";
//This feature name means it's a SAAS or rental mode key for month to month hosted service
private const string RENTAL_FEATURE_NAME = "Subscription";
private const string SUBSCRIPTION_FEATURE_NAME = "Subscription";
#region license classes
@@ -92,21 +93,21 @@ Plugins:
sb.AppendLine("Temporary license for evaluation");
continue;
}
if (f.Feature == RENTAL_FEATURE_NAME)
if (f.Feature == SUBSCRIPTION_FEATURE_NAME)
{
sb.AppendLine("Service / Rental license");
continue;
}
if (f.Feature == QBI_FEATURE_NAME)
{
sb.AppendLine("QuickBooks desktop integration option");
continue;
}
if (f.Feature == QBOI_FEATURE_NAME)
{
sb.AppendLine("QuickBooks online integration option");
sb.AppendLine("Subscription license");
continue;
}
// if (f.Feature == QBI_FEATURE_NAME)
// {
// sb.AppendLine("QuickBooks desktop integration option");
// continue;
// }
// if (f.Feature == QBOI_FEATURE_NAME)
// {
// sb.AppendLine("QuickBooks online integration option");
// continue;
// }
if (f.Feature == SERVICE_TECHS_FEATURE_NAME)
{
sb.AppendLine($"Scheduleable resources: {f.Count}");
@@ -215,7 +216,7 @@ Plugins:
{
get
{
return HasLicenseFeature(RENTAL_FEATURE_NAME);
return HasLicenseFeature(SUBSCRIPTION_FEATURE_NAME);
}
}
@@ -292,11 +293,11 @@ Plugins:
//flag as trial key not regular key
k.Features.Add(new LicenseFeature() { Feature = TRIAL_FEATURE_NAME, Count = 0 });
//flag it as a temporary expiring key so that the expiration date takes effect
k.Features.Add(new LicenseFeature() { Feature = RENTAL_FEATURE_NAME, Count = 0 });
k.Features.Add(new LicenseFeature() { Feature = SUBSCRIPTION_FEATURE_NAME, Count = 0 });
//add every possible feature
k.Features.Add(new LicenseFeature() { Feature = QBI_FEATURE_NAME, Count = 0 });
k.Features.Add(new LicenseFeature() { Feature = SERVICE_TECHS_FEATURE_NAME, Count = 1000 });
//k.Features.Add(new LicenseFeature() { Feature = QBI_FEATURE_NAME, Count = 0 });
k.Features.Add(new LicenseFeature() { Feature = SERVICE_TECHS_FEATURE_NAME, Count = 100 });
return GenerateRavenKey(k);
}
@@ -475,13 +476,13 @@ oArP0E2Vbow3JMxq/oeXmHbrLMLQfYyXwFmciLFigOtkd45bfHdrbA==
k.LicenseFormat = "8";
k.RegisteredTo = "GZ TestCo Inc.";
k.DbId = dbid;
k.Features.Add(new LicenseFeature() { Feature = QBI_FEATURE_NAME, Count = 0 });
k.Features.Add(new LicenseFeature() { Feature = QBOI_FEATURE_NAME, Count = 0 });
k.Features.Add(new LicenseFeature() { Feature = OLI_FEATURE_NAME, Count = 0 });
// k.Features.Add(new LicenseFeature() { Feature = QBI_FEATURE_NAME, Count = 0 });
// k.Features.Add(new LicenseFeature() { Feature = QBOI_FEATURE_NAME, Count = 0 });
// k.Features.Add(new LicenseFeature() { Feature = OLI_FEATURE_NAME, Count = 0 });
k.Features.Add(new LicenseFeature() { Feature = SERVICE_TECHS_FEATURE_NAME, Count = 1000 });
k.MaintenanceExpiration = k.LicenseExpiration = DateTime.UtcNow.AddMonths(1);
k.Features.Add(new LicenseFeature() { Feature = TRIAL_FEATURE_NAME, Count = 0 });
k.Features.Add(new LicenseFeature() { Feature = RENTAL_FEATURE_NAME, Count = 0 });
k.Features.Add(new LicenseFeature() { Feature = SUBSCRIPTION_FEATURE_NAME, Count = 0 });
return GenerateRavenKey(k);
}

2
util/RfVersion.cs
View File

@@ -2,7 +2,7 @@ namespace rockfishCore.Util
{
public static class RfVersion
{
public const string NumberOnly="6.16";
public const string NumberOnly="6.17";
public const string Full = "Rockfish server " + NumberOnly;
}
}