diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 5a95c1d1..509f333f 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -18,6 +18,7 @@
CSR techs ui accept to wo etc
CSR V8Migrate
+ GetLastReport is not implemented anywhere but is useful adn key
new testing cases
Schedule form
Dashboard / widgets
diff --git a/ayanova/src/views/svc-csr.vue b/ayanova/src/views/svc-csr.vue
index 171a04f5..ca2294c0 100644
--- a/ayanova/src/views/svc-csr.vue
+++ b/ayanova/src/views/svc-csr.vue
@@ -221,39 +221,6 @@
>
-
-
-
-
- {{
- $ay.t("CustomerServiceRequestAcceptToExisting")
- }}
-
-
-
-
-
-
-
- {{ $ay.t("Cancel") }}
- {{
- $ay.t("OK")
- }}
-
-
-
-
@@ -420,12 +387,22 @@ export default {
FORM_KEY + ":duplicate"
);
window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":new");
+ window.$gz.eventBus.$emit(
+ "menu-enable-item",
+ FORM_KEY + ":acceptnew"
+ );
+ window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":reject");
} else {
window.$gz.eventBus.$emit(
"menu-disable-item",
FORM_KEY + ":duplicate"
);
window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":new");
+ window.$gz.eventBus.$emit(
+ "menu-disable-item",
+ FORM_KEY + ":acceptnew"
+ );
+ window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":reject");
}
},
deep: true
@@ -649,7 +626,9 @@ export default {
});
}
},
- async accept(toExistingId) {
+ async accept() {
+ //generate work order from this csr
+ //flag this csr as accepted
let vm = this;
if (vm.obj.status != 0 || vm.$route.params.recordid == 0) {
return;
@@ -712,11 +691,8 @@ async function clickHandler(menuItem) {
case "reject":
m.vm.reject();
break;
- case "acceptexisting":
- m.vm.woSelectorDialog = true;
- break;
case "acceptnew":
- m.vm.accept(0);
+ m.vm.accept();
break;
case "report":
if (m.id != null) {
@@ -837,13 +813,6 @@ function generateMenu(vm) {
vm: vm
});
- menuOptions.menuItems.push({
- title: "CustomerServiceRequestAcceptToExisting",
- icon: null,
- key: FORM_KEY + ":acceptexisting",
- vm: vm
- });
-
menuOptions.menuItems.push({
title: "CustomerServiceRequestReject",
icon: null,
@@ -876,7 +845,6 @@ async function fetchTranslatedText() {
await window.$gz.translation.cacheTranslations([
"CustomerServiceRequest",
"CustomerServiceRequestAcceptToNew",
- "CustomerServiceRequestAcceptToExisting",
"CustomerServiceRequestReject",
"CustomerServiceRequestTitle",
"CustomerServiceRequestDetails",