This commit is contained in:
2020-11-20 23:18:46 +00:00
parent c0554c4bf2
commit 510cba5456
10 changed files with 26 additions and 15 deletions

View File

@@ -63,15 +63,11 @@ todo: input type email url phone number etc supported on device to activate?
CURRENTLY WORKING ON: Customer
OUTSTANDING
Show all
workorders
quotes
pm's
docs
import
smoke test
bizrules
customer notes
customer notes
docs
import
todo: TESTING After customer form is made
Test with devices

View File

@@ -634,6 +634,7 @@ function generateMenu(vm) {
vm: vm
});
}
menuOptions.menuItems.push({ divider: true, inset: false });
if (vm.rights.change && vm.obj.stock != true) {
menuOptions.menuItems.push({
@@ -660,6 +661,8 @@ function generateMenu(vm) {
});
}
menuOptions.menuItems.push({ divider: true, inset: false });
window.$gz.eventBus.$emit("menu-change", menuOptions);
}

View File

@@ -1026,6 +1026,7 @@ function generateMenu(vm) {
vm: vm
});
}
menuOptions.menuItems.push({ divider: true, inset: false });
if (vm.$route.params.recordid != 0) {
menuOptions.menuItems.push({
title: "DirectNotification",
@@ -1044,6 +1045,8 @@ function generateMenu(vm) {
}
}
menuOptions.menuItems.push({ divider: true, inset: false });
window.$gz.eventBus.$emit("menu-change", menuOptions);
}

View File

@@ -295,7 +295,7 @@ function generateMenu(vm) {
vm: vm
});
}
menuOptions.menuItems.push({ divider: true, inset: false });
//Extra link to it here so people can stumble their way onto it
//plus it's related to this form and people think Customize for the whole shebang
menuOptions.menuItems.push({
@@ -304,7 +304,7 @@ function generateMenu(vm) {
data: "adm-translations",
key: "app:nav"
});
menuOptions.menuItems.push({ divider: true, inset: false });
window.$gz.eventBus.$emit("menu-change", menuOptions);
}

View File

@@ -1103,6 +1103,8 @@ function generateMenu(vm) {
});
}
menuOptions.menuItems.push({ divider: true, inset: false });
//EXPORT
if (vm.$route.params.recordid != 0) {
let href = window.$gz.api.genericDownloadUrl(
@@ -1118,6 +1120,7 @@ function generateMenu(vm) {
vm: vm
});
}
menuOptions.menuItems.push({ divider: true, inset: false });
window.$gz.eventBus.$emit("menu-change", menuOptions);
}

View File

@@ -1029,7 +1029,7 @@ function generateMenu(vm) {
vm: vm
});
}
menuOptions.menuItems.push({ divider: true, inset: false });
if (vm.$route.params.recordid != 0) {
menuOptions.menuItems.push({
title: "DirectNotification",
@@ -1047,7 +1047,7 @@ function generateMenu(vm) {
});
}
}
menuOptions.menuItems.push({ divider: true, inset: false });
window.$gz.eventBus.$emit("menu-change", menuOptions);
}

View File

@@ -702,7 +702,7 @@ function generateMenu(vm) {
vm: vm
});
}
menuOptions.menuItems.push({ divider: true, inset: false });
window.$gz.eventBus.$emit("menu-change", menuOptions);
}

View File

@@ -476,7 +476,7 @@ function generateMenu(vm) {
vm: vm
});
}
menuOptions.menuItems.push({ divider: true, inset: false });
menuOptions.menuItems.push({
title: "DarkMode",
icon: vm.darkMode ? "$ayiSun" : "$ayiMoon",
@@ -492,7 +492,7 @@ function generateMenu(vm) {
data: "home-password",
key: "app:nav"
});
menuOptions.menuItems.push({ divider: true, inset: false });
window.$gz.eventBus.$emit("menu-change", menuOptions);
}

View File

@@ -733,6 +733,8 @@ function generateMenu(vm) {
});
}
menuOptions.menuItems.push({ divider: true, inset: false });
window.$gz.eventBus.$emit("menu-change", menuOptions);
}

View File

@@ -61,7 +61,11 @@ describe("SMOKE", () => {
cy.visit("/cust-customers");
cy.url().should("include", "/cust-customers");
cy.get("[data-cy=underconstruction]");
cy.get("[data-cy=customersTable]");
cy.visit("/cust-customers/1");
cy.url().should("include", "/cust-customers/1");
cy.get("[data-cy=name]");
cy.visit("/cust-headoffices");
cy.url().should("include", "/cust-headoffices");