diff --git a/.vscode/launch.json b/.vscode/launch.json
index 55a33e65..c71066c0 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -47,9 +47,9 @@
"AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=raven;Database=AyaNova;CommandTimeout=120;",
"AYANOVA_DATA_PATH": "c:\\temp\\ravendata",
"AYANOVA_USE_URLS": "http://*:7575;",
- //"AYANOVA_PERMANENTLY_ERASE_DATABASE":"true",
- "AYANOVA_SERVER_TEST_MODE": "true",
- "AYANOVA_REPORT_RENDERING_TIMEOUT":"1",
+ "AYANOVA_PERMANENTLY_ERASE_DATABASE":"true",
+ //"AYANOVA_SERVER_TEST_MODE": "false",
+ //"AYANOVA_REPORT_RENDERING_TIMEOUT":"1",
"AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
"AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_14\\bin"
},
diff --git a/devdocs/deploy.txt b/devdocs/deploy.txt
index 16b1bb86..854b8b83 100644
--- a/devdocs/deploy.txt
+++ b/devdocs/deploy.txt
@@ -9,7 +9,7 @@ If any packages have been changed in the release do a thorough security scan and
### Bump version numbers:
-Search and replace 8.0.0-beta.0.15
+Search and replace 8.0.0-beta.1-rc1
webapp,server,launcher, v8migrate
Client end ayanova-version.js,
diff --git a/dist/install/windows/x64/lan.iss b/dist/install/windows/x64/lan.iss
index 5dccd247..5a5b939a 100644
--- a/dist/install/windows/x64/lan.iss
+++ b/dist/install/windows/x64/lan.iss
@@ -1,7 +1,7 @@
; LAN install for internal network use only
#define MyAppName "AyaNova server"
-#define MyAppVersion "8.0.0-beta.0.15"
+#define MyAppVersion "8.0.0-beta.1-rc1"
#define MyAppPublisher "Ground Zero Tech-Works, Inc."
#define MyAppURL "https://ayanova.com/"
#define MyAppLauncherExeName "ayanova-launcher.exe"
diff --git a/dist/install/windows/x64/standalone.iss b/dist/install/windows/x64/standalone.iss
index 15e43801..6bb77c4e 100644
--- a/dist/install/windows/x64/standalone.iss
+++ b/dist/install/windows/x64/standalone.iss
@@ -3,7 +3,7 @@
; external to lan requires different config
#define MyAppName "AyaNova"
-#define MyAppVersion "8.0.0-beta.0.15"
+#define MyAppVersion "8.0.0-beta.1-rc1"
#define MyAppPublisher "Ground Zero Tech-Works, Inc."
#define MyAppURL "https://ayanova.com/"
#define MyAppLauncherExeName "ayanova-launcher.exe"
diff --git a/docs/8.0/ayanova/docs/adm-license.md b/docs/8.0/ayanova/docs/adm-license.md
index 741c4d87..cfb4862a 100644
--- a/docs/8.0/ayanova/docs/adm-license.md
+++ b/docs/8.0/ayanova/docs/adm-license.md
@@ -4,6 +4,10 @@ The license form is used to view the AyaNova license and perform license related
The AyaNova license is stored inside the database so as long as you have a backup of the database you have the license backed up as well.
+## Trying out AyaNova
+
+If you are trying out AyaNova for the first time this is the form the request an evaluation license key. See the [Trying out AyaNova](ay-evaluate.md) page for details.
+
## Authorization Roles required
This form is available to User's with the following [roles](ay-biz-admin-roles.md):
@@ -22,12 +26,53 @@ From the `Administration` navigation pane select `License` navigation item.
## License form
-### license display
+### Unlicensed display
-If the server can't find a license in the database then links are shown to begin a trial evaluation, fetch a license key, purchase a license and a link to how to restore the database.
+If the server can't find a license in the database then links are shown to begin a [trial evaluation](ay-evaluate.md), fetch a license key, purchase a license and a link to how to restore the database:
+
+
+#### Start trial evaluation
+
+If you are evaluating AyaNova, this is where you enter the details to request a trial license key.
+
+
+
+Enter you details here and click on Send Request. An automated email will be sent within 5 minutes to the address you provided to verify your email address. Check the inbox for the address provided and when you receive the email verification message click on the link contained within to verify your email.
+
+Note that we will only contact the address you provide for licensing or support purposes.
+
+See our [privacy policy](https://www.ayanova.com/privacypolicy.htm) for details.
+
+If you do not receive an email within 10 minutes something has gone wrong. Check your spam folder and if not found there it's possible we were unable to send to the address provided. Double check your email address you entered in the request form and try again one more time.
+
+If you _still_ do not receive the email verification after a second attempt and the address is correct, try requesting again with an alternate email account preferrably on another domain if possible; sometimes we are unable to email the address provided due to spam or other filtering or temporary issues.
+
+Once you recieve the AyaNova trial request email verification message, click on the link contained within to confirm to our license server that your email address is valid.
+
+We will be notified when the email address is verified and will generate a trial license for you during business hours. This part of the process is done manually as a "circuit breaker" in case of malicious requests.
+
+Once approved, you will receive an _AyaNova trial request approved_ email message and AyaNova will automatically install the license (or may have already done so) or you can click on "Install license" to trigger the server to check if there is a license available and install it immediately.
+
+See the [Trying out AyaNova](ay-evaluate.md) to get started with your evaluation.
+
+#### Purchase a license
+
+The _Purchase a license_ button will take you to our web site's license purchase page and automatically fill in your database ID so you can purchase an AyaNova license and options online. If you do not use this link you will need to provide your database id manually during purchase, it can be copied from the menu on this page using the _Copy database id_ link.
+
+Once you have received email verification that your purchase has been completed, you can use the _Install license_ button to trigger the AyaNova server to check for any available new licenses and automatically install them.
+
+#### Use existing license
+
+The AyaNova license is stored in the AyaNova database so restoring your data from backup will restore your license automatically. Here we provide a link to the help documentation for restoring the database.
+
+If you have already contacted support due to some other licensing issue and the issue has been corrected then the _Install license_ button to trigger the AyaNova server to check for any available licenses and automatically install them.
+
+### licensed display
If the database is licensed, the license form displays the details of the current AyaNova license in effect:
+
+
#### Licensed to
This is the name to which the AyaNova license is officially registered, typically your company name.
@@ -61,9 +106,9 @@ In order to provide fair pricing that scales with the size of a company AyaNova
Service technician and sub-contractor type Users also known as "scheduleable users" in AyaNova are Users that have their "User Type" field set to "Service user" or "Sub-contractor user" in their their [User record ](adm-users.md). Users set to this type are scheduleable and trackable for service in AyaNova and selectable on work orders, quotes and preventive maintenance orders.
-Only scheduleable users that are set to Active in their [User record ](adm-users.md) will consume a Scheduleable User / service technician license from the total count available as licensed.
+Only scheduleable users that are set to Active in their [User record ](adm-users.md) will consume a Scheduleable User / service technician license from the total count available as licensed.
-Non scheduleable users such as administrators or office staff and inactive Scheduleable users will *not* consume a license.
+Non scheduleable users such as administrators or office staff and inactive Scheduleable users will _not_ consume a license.
### Purchase button
diff --git a/docs/8.0/ayanova/docs/ay-evaluate.md b/docs/8.0/ayanova/docs/ay-evaluate.md
index faec8758..041b1141 100644
--- a/docs/8.0/ayanova/docs/ay-evaluate.md
+++ b/docs/8.0/ayanova/docs/ay-evaluate.md
@@ -1,4 +1,4 @@
-# Evaluate AyaNova
+# Trying out AyaNova
The evaluation form is provided to generate sample data in order to be able to quickly try out features.
@@ -6,6 +6,10 @@ The sample data is randomly generated and will differ each time it is created.
In addition there is a link to receive technical support while evaluating AyaNova and get answers to any questions that are not covered in this manual.
+## Requesting a trial license
+
+If this is your first time starting AyaNova, the first step is to request a trial license.
+
## Generating sample data
diff --git a/docs/8.0/ayanova/docs/img/adm-license-licensed-display.png b/docs/8.0/ayanova/docs/img/adm-license-licensed-display.png
new file mode 100644
index 00000000..470103d1
Binary files /dev/null and b/docs/8.0/ayanova/docs/img/adm-license-licensed-display.png differ
diff --git a/docs/8.0/ayanova/docs/img/adm-license-unlicensed-display-options.png b/docs/8.0/ayanova/docs/img/adm-license-unlicensed-display-options.png
new file mode 100644
index 00000000..a2bcd0d1
Binary files /dev/null and b/docs/8.0/ayanova/docs/img/adm-license-unlicensed-display-options.png differ
diff --git a/docs/8.0/ayanova/docs/img/adm-license-unlicensed-request-evaluation.png b/docs/8.0/ayanova/docs/img/adm-license-unlicensed-request-evaluation.png
new file mode 100644
index 00000000..87b17ccd
Binary files /dev/null and b/docs/8.0/ayanova/docs/img/adm-license-unlicensed-request-evaluation.png differ
diff --git a/docs/8.0/ayanova/docs/index.md b/docs/8.0/ayanova/docs/index.md
index 22ef90fc..e40125da 100644
--- a/docs/8.0/ayanova/docs/index.md
+++ b/docs/8.0/ayanova/docs/index.md
@@ -22,4 +22,4 @@ Or check out our support forum [forum.ayanova.com](http://forum.ayanova.com/)
---
-Documentation version: 8.0.0-beta.0.15, Copyright © 2022 Ground Zero Tech-Works Inc.
+Documentation version: 8.0.0-beta.1-rc1, Copyright © 2022 Ground Zero Tech-Works Inc.
diff --git a/server/AyaNova/util/AyaNovaVersion.cs b/server/AyaNova/util/AyaNovaVersion.cs
index 871b570a..85cab4ba 100644
--- a/server/AyaNova/util/AyaNovaVersion.cs
+++ b/server/AyaNova/util/AyaNovaVersion.cs
@@ -5,7 +5,7 @@ namespace AyaNova.Util
///
internal static class AyaNovaVersion
{
- public const string VersionString = "8.0.0-beta.0.15";
+ public const string VersionString = "8.0.0-beta.1-rc1";
public const string FullNameAndVersion = "AyaNova server " + VersionString;
public const string CurrentApiVersion="v8";
}//eoc