This commit is contained in:
@@ -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: about form show real dbid not license dbid or both I guess
|
||||||
todo: server error red box messages have \r\n characters in them
|
todo: server error red box messages have \r\n characters in them
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ import chartBarHorizontalControl from "./components/chart-bar-horizontal-control
|
|||||||
//DEVELOPMENT MODE
|
//DEVELOPMENT MODE
|
||||||
//THIS SHOULD BE FALSE IN RELEASE
|
//THIS SHOULD BE FALSE IN RELEASE
|
||||||
//************************************************************
|
//************************************************************
|
||||||
const DEV_MODE = false;
|
const DEV_MODE = true;
|
||||||
//************************************************************
|
//************************************************************
|
||||||
//**************************************************************
|
//**************************************************************
|
||||||
//**************************************************************
|
//**************************************************************
|
||||||
|
|||||||
@@ -78,7 +78,7 @@
|
|||||||
<v-col cols="12">
|
<v-col cols="12">
|
||||||
<v-btn
|
<v-btn
|
||||||
:disabled="sendRequestDisabled()"
|
:disabled="sendRequestDisabled()"
|
||||||
@click="sendRequest()"
|
@click="sendEvaluationRequest()"
|
||||||
>$ay.t('SendRequest')</v-btn
|
>$ay.t('SendRequest')</v-btn
|
||||||
>
|
>
|
||||||
</v-col>
|
</v-col>
|
||||||
@@ -249,7 +249,7 @@ export default {
|
|||||||
"requestemail"
|
"requestemail"
|
||||||
]);
|
]);
|
||||||
},
|
},
|
||||||
async sendRequest() {
|
async sendEvaluationRequest() {
|
||||||
let vm = this;
|
let vm = this;
|
||||||
try {
|
try {
|
||||||
//Only no key or expired trial are here, not expired purchase
|
//Only no key or expired trial are here, not expired purchase
|
||||||
@@ -268,13 +268,19 @@ export default {
|
|||||||
|
|
||||||
//send request
|
//send request
|
||||||
r = await window.$gz.api.upsertEx("license/trialRequest", vm.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
|
//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;
|
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
|
//then another message box saying watch your email to verify
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
window.$gz.errorHandler.handleFormError(error, vm);
|
window.$gz.errorHandler.handleFormError(error, vm);
|
||||||
@@ -420,6 +426,7 @@ function fetchTranslatedText(vm) {
|
|||||||
"LicenseEmail",
|
"LicenseEmail",
|
||||||
"RequestEvaluationLicense",
|
"RequestEvaluationLicense",
|
||||||
"LicenseEmailVerficationHint",
|
"LicenseEmailVerficationHint",
|
||||||
|
"EvaluationRequestReceived",
|
||||||
"AdminEraseDatabaseWarning", //preexisting
|
"AdminEraseDatabaseWarning", //preexisting
|
||||||
"NewLicenseInstalled",
|
"NewLicenseInstalled",
|
||||||
"NewLicenseNotFound"
|
"NewLicenseNotFound"
|
||||||
|
|||||||
Reference in New Issue
Block a user