diff --git a/.vscode/launch.json b/.vscode/launch.json index ce4235a9..bd59fca2 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -121,7 +121,7 @@ "AYANOVA_USE_URLS": "http://*:7575;", //"AYANOVA_PERMANENTLY_ERASE_DATABASE":"true", //"AYANOVA_REMOVE_LICENSE_FROM_DB":"true", - //"AYANOVA_SERVER_TEST_MODE": "true", + "AYANOVA_SERVER_TEST_MODE": "true", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_14\\bin" diff --git a/docs/8.0/ayanova/docs/ay-about.md b/docs/8.0/ayanova/docs/ay-about.md index ab38655a..1a560393 100644 --- a/docs/8.0/ayanova/docs/ay-about.md +++ b/docs/8.0/ayanova/docs/ay-about.md @@ -111,4 +111,4 @@ This menu option will connect you to the AyaNova support contact form on our web #### View license agreement -Displays the AyaNova end user [license agreement](license.md). +Displays the AyaNova end user [Perpetual license agreement](license.md) or [Subscription service agreement](ayanova-subscription-service-agreement.md) depending upon which version is in use. diff --git a/server/AyaNova/Controllers/NotifyController.cs b/server/AyaNova/Controllers/NotifyController.cs index 975c6da9..0d6a009e 100644 --- a/server/AyaNova/Controllers/NotifyController.cs +++ b/server/AyaNova/Controllers/NotifyController.cs @@ -53,7 +53,7 @@ namespace AyaNova.Api.Controllers bool suIsDefault = await UserBiz.SuperIsDefaultCredsAsync(ct); //confirm if there are logo's to show as well var logo = await ct.Logo.AsNoTracking().SingleOrDefaultAsync(); - + bool HasLargeLogo = false; bool HasMediumLogo = false; bool HasSmallLogo = false; @@ -63,8 +63,14 @@ namespace AyaNova.Api.Controllers if (logo.Medium != null) HasMediumLogo = true; if (logo.Large != null) HasLargeLogo = true; } + + bool PPBuild = true; +#if (SUBSCRIPTION_BUILD) + PPBuild = false; +#endif + return Ok(ApiOkResponse.Response( - new { eval = showSampleLogins, sudf = suIsDefault, ll = HasLargeLogo, ml = HasMediumLogo, sl = HasSmallLogo, lcr = AyaNova.Core.License.LicenseConsentRequired })); + new { eval = showSampleLogins, sudf = suIsDefault, ll = HasLargeLogo, ml = HasMediumLogo, sl = HasSmallLogo, lcr = AyaNova.Core.License.LicenseConsentRequired, pp=PPBuild })); }