From 2816f54a0d2d1cd7ef2b3fd1813f2d91f07289fb Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 4 Jun 2021 22:23:21 +0000 Subject: [PATCH] CHECKPOINT COMMIT - POST SERVICE BANK REMOVAL Service bank feature removed from front, back and e2e testing mostly commented out in case need to add back again but in some places such as db schema it had to be removed entirely so refer here if adding back in again --- ayanova/src/api/ayatype.js | 2 +- ayanova/src/api/biz-role-rights.js | 2 +- ayanova/src/api/gzutil.js | 4 +- ayanova/src/api/initialize.js | 18 ++++----- ayanova/src/api/open-object-handler.js | 12 +++--- ayanova/src/api/translation.js | 2 +- .../src/components/work-order-item-labors.vue | 2 +- .../components/work-order-item-travels.vue | 2 +- ayanova/src/router.js | 24 +++++------ ayanova/src/views/cust-customer.vue | 40 +++++++++---------- ayanova/src/views/cust-head-office.vue | 40 +++++++++---------- ayanova/src/views/home-search.vue | 11 +++-- ayanova/src/views/svc-unit.vue | 38 +++++++++--------- ayanova/tests/e2e/specs/smoke.js | 18 ++++----- 14 files changed, 107 insertions(+), 108 deletions(-) diff --git a/ayanova/src/api/ayatype.js b/ayanova/src/api/ayatype.js index 3e8e793c..37aac694 100644 --- a/ayanova/src/api/ayatype.js +++ b/ayanova/src/api/ayatype.js @@ -89,7 +89,7 @@ export default { Reminder: 52, UnitMeterReading: 53, CustomerServiceRequest: 54, - ServiceBank: 55, + //ServiceBank: 55, OpsNotificationSettings: 56, Report: 57, DashboardView: 58, diff --git a/ayanova/src/api/biz-role-rights.js b/ayanova/src/api/biz-role-rights.js index b9d18547..c2245e1b 100644 --- a/ayanova/src/api/biz-role-rights.js +++ b/ayanova/src/api/biz-role-rights.js @@ -25,7 +25,7 @@ export default { ServiceRate: { Change: 66, ReadFullRecord: 98701, Select: 131071 }, TravelRate: { Change: 66, ReadFullRecord: 98701, Select: 131071 }, TaxCode: { Change: 66, ReadFullRecord: 98701, Select: 131071 }, - ServiceBank: { Change: 74, ReadFullRecord: 98693, Select: 131071 }, + //ServiceBank: { Change: 74, ReadFullRecord: 98693, Select: 131071 }, Quote: { Change: 33098, ReadFullRecord: 65669, Select: 131071 }, QuoteItem: { Change: 33098, ReadFullRecord: 65669, Select: 131071 }, QuoteTemplate: { Change: 33098, ReadFullRecord: 65669, Select: 131071 }, diff --git a/ayanova/src/api/gzutil.js b/ayanova/src/api/gzutil.js index 7aeb085f..b343f54e 100644 --- a/ayanova/src/api/gzutil.js +++ b/ayanova/src/api/gzutil.js @@ -527,8 +527,8 @@ export default { return "$ayiWeight"; case window.$gz.type.CustomerServiceRequest: return "$ayiConciergeBell"; - case window.$gz.type.ServiceBank: - return "$ayiCarBattery"; + // case window.$gz.type.ServiceBank: + // return "$ayiCarBattery"; case window.$gz.type.OpsNotificationSettings: return "$ayiBullhorn"; case window.$gz.type.Report: diff --git a/ayanova/src/api/initialize.js b/ayanova/src/api/initialize.js index 1a71181f..533fcd3e 100644 --- a/ayanova/src/api/initialize.js +++ b/ayanova/src/api/initialize.js @@ -448,15 +448,15 @@ function initNavPanel() { key: key++ }); } - //SERVICE BANK - if (window.$gz.role.canOpen(window.$gz.type.ServiceBank)) { - sub.push({ - title: "ServiceBankList", - icon: "$ayiCarBattery", - route: "/acc-service-banks", - key: key++ - }); - } + // //SERVICE BANK + // if (window.$gz.role.canOpen(window.$gz.type.ServiceBank)) { + // sub.push({ + // title: "ServiceBankList", + // icon: "$ayiCarBattery", + // route: "/acc-service-banks", + // key: key++ + // }); + // } //SERVICE RATES if (window.$gz.role.canOpen(window.$gz.type.ServiceRate)) { diff --git a/ayanova/src/api/open-object-handler.js b/ayanova/src/api/open-object-handler.js index b1a8ffd6..1e51bae8 100644 --- a/ayanova/src/api/open-object-handler.js +++ b/ayanova/src/api/open-object-handler.js @@ -274,12 +274,12 @@ export default { params: { recordid: tid.id } }); break; - case ayatype.ServiceBank: - vm.$router.push({ - name: "service-bank-edit", - params: { recordid: tid.id } - }); - break; + // case ayatype.ServiceBank: + // vm.$router.push({ + // name: "service-bank-edit", + // params: { recordid: tid.id } + // }); + // break; case ayatype.PurchaseOrder: vm.$router.push({ name: "inv-purchase-order", diff --git a/ayanova/src/api/translation.js b/ayanova/src/api/translation.js index bd522195..36da042b 100644 --- a/ayanova/src/api/translation.js +++ b/ayanova/src/api/translation.js @@ -181,7 +181,7 @@ export default { "TaxCodeList", "ServiceRateList", "TravelRateList", - "ServiceBankList", + //"ServiceBankList", "Administration", "Operations", "Attachments", diff --git a/ayanova/src/components/work-order-item-labors.vue b/ayanova/src/components/work-order-item-labors.vue index 3e337317..d4bc7ce2 100644 --- a/ayanova/src/components/work-order-item-labors.vue +++ b/ayanova/src/components/work-order-item-labors.vue @@ -484,7 +484,7 @@ export default { serviceDetails: null, serviceRateQuantity: 0, noChargeQuantity: 0, - serviceBankId: null, + //serviceBankId: null, taxCodeSaleId: null, price: 0, priceOverride: null, diff --git a/ayanova/src/components/work-order-item-travels.vue b/ayanova/src/components/work-order-item-travels.vue index fcf5b6ad..a28f4f94 100644 --- a/ayanova/src/components/work-order-item-travels.vue +++ b/ayanova/src/components/work-order-item-travels.vue @@ -481,7 +481,7 @@ export default { travelDetails: null, travelRateQuantity: 0, noChargeQuantity: 0, - serviceBankId: null, + // serviceBankId: null, taxCodeSaleId: null, price: 0, priceOverride: null, diff --git a/ayanova/src/router.js b/ayanova/src/router.js index 5809f993..48970e31 100644 --- a/ayanova/src/router.js +++ b/ayanova/src/router.js @@ -609,18 +609,18 @@ export default new Router({ component: () => import(/* webpackChunkName: "acc" */ "./views/acc-tax-code.vue") }, - { - path: "/acc-service-banks/:aType?/:objectId?", - name: "service-banks", - component: () => - import(/* webpackChunkName: "acc" */ "./views/acc-service-banks.vue") - }, - { - path: "/acc-service-banks/:recordid/:aType?/:objectId?", - name: "service-bank-edit", - component: () => - import(/* webpackChunkName: "acc" */ "./views/acc-service-bank.vue") - }, + // { + // path: "/acc-service-banks/:aType?/:objectId?", + // name: "service-banks", + // component: () => + // import(/* webpackChunkName: "acc" */ "./views/acc-service-banks.vue") + // }, + // { + // path: "/acc-service-banks/:recordid/:aType?/:objectId?", + // name: "service-bank-edit", + // component: () => + // import(/* webpackChunkName: "acc" */ "./views/acc-service-bank.vue") + // }, //######################### ADMINISTRATION GROUP ##################################### { path: "/adm-global-settings", diff --git a/ayanova/src/views/cust-customer.vue b/ayanova/src/views/cust-customer.vue index 203cac5b..02399baa 100644 --- a/ayanova/src/views/cust-customer.vue +++ b/ayanova/src/views/cust-customer.vue @@ -276,7 +276,7 @@ > - - + --> - - + --> - - + --> { cy.get("[data-cy=name]"); //################# ACCOUNTING - cy.visit("/acc-service-banks"); - cy.url({ timeout: 10000 }).should("include", "/acc-service-banks"); - cy.get("[data-cy=serviceBanksTable]"); + // cy.visit("/acc-service-banks"); + // cy.url({ timeout: 10000 }).should("include", "/acc-service-banks"); + // cy.get("[data-cy=serviceBanksTable]"); - cy.visit("/acc-service-banks/8/1"); - cy.url({ timeout: 10000 }).should("include", "/acc-service-banks/8/1"); - cy.get("[data-cy=clickThru]"); + // cy.visit("/acc-service-banks/8/1"); + // cy.url({ timeout: 10000 }).should("include", "/acc-service-banks/8/1"); + // cy.get("[data-cy=clickThru]"); - cy.visit("/acc-service-banks/0/8/1"); - cy.url({ timeout: 10000 }).should("include", "/acc-service-banks/0/8/1"); - cy.get("[data-cy=name]"); + // cy.visit("/acc-service-banks/0/8/1"); + // cy.url({ timeout: 10000 }).should("include", "/acc-service-banks/0/8/1"); + // cy.get("[data-cy=name]"); cy.visit("/acc-service-rates"); cy.url({ timeout: 10000 }).should("include", "/acc-service-rates");