diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index c1ed9920..d3f3dcfc 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -109,7 +109,8 @@ todo: License testing (I know it's working when these things all pass) ################################# - +todo: why is the dbid changing every reboot during testing? + That shouldn't happen should it? todo: about form show real dbid not license dbid or both I guess todo: server error red box messages have \r\n characters in them diff --git a/ayanova/src/main.js b/ayanova/src/main.js index 29e77c99..3a8d6825 100644 --- a/ayanova/src/main.js +++ b/ayanova/src/main.js @@ -58,7 +58,7 @@ import chartBarHorizontalControl from "./components/chart-bar-horizontal-control //DEVELOPMENT MODE //THIS SHOULD BE FALSE IN RELEASE //************************************************************ -const DEV_MODE = false; +const DEV_MODE = true; //************************************************************ //************************************************************** //************************************************************** diff --git a/ayanova/src/views/adm-license.vue b/ayanova/src/views/adm-license.vue index dd295158..44fb0d18 100644 --- a/ayanova/src/views/adm-license.vue +++ b/ayanova/src/views/adm-license.vue @@ -78,7 +78,7 @@ $ay.t('SendRequest') @@ -249,7 +249,7 @@ export default { "requestemail" ]); }, - async sendRequest() { + async sendEvaluationRequest() { let vm = this; try { //Only no key or expired trial are here, not expired purchase @@ -268,13 +268,19 @@ export default { //send request r = await window.$gz.api.upsertEx("license/trialRequest", vm.request); + //a string is returned and will start with E1 if it's an error - if (r.data.startsWith("E1")) { + if (r.startsWith("E1")) { throw r; } - window.$gz.eventBus.$emit("notify-success", r.data); - + if (r == "ok") { + r = vm.$ay.t("EvaluationRequestReceived"); + window.$gz.eventBus.$emit("notify-success", r); + } else { + //some kind of non-ok issue but not an outright error + window.$gz.eventBus.$emit("notify-info", r); + } //then another message box saying watch your email to verify } catch (error) { window.$gz.errorHandler.handleFormError(error, vm); @@ -420,6 +426,7 @@ function fetchTranslatedText(vm) { "LicenseEmail", "RequestEvaluationLicense", "LicenseEmailVerficationHint", + "EvaluationRequestReceived", "AdminEraseDatabaseWarning", //preexisting "NewLicenseInstalled", "NewLicenseNotFound"