From fc162af66b985dfa1f27406d48d2183c56b6a039 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 29 Dec 2020 01:29:43 +0000 Subject: [PATCH] --- ayanova/devdocs/todo.txt | 2 +- ayanova/src/api/ayatype.js | 3 +- ayanova/src/api/biz-role-rights.js | 1 + ayanova/src/api/initialize.js | 16 +- ayanova/src/api/open-object-handler.js | 6 + ayanova/src/views/acc-service-rate.vue | 2 - ayanova/src/views/acc-tax-code.vue | 699 ++++++++++++++++++++++++- ayanova/src/views/acc-tax-codes.vue | 174 +++++- ayanova/src/views/acc-travel-rate.vue | 2 - ayanova/src/views/home-reminder.vue | 3 +- ayanova/src/views/svc-project.vue | 2 - 11 files changed, 869 insertions(+), 41 deletions(-) diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index 50e7ee6b..328f4bb7 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -41,8 +41,8 @@ todo: actual customer reports so can figure out datalist for bringing other name CURRENTLY DOING: TaxCode - FRONT GRID add formfielddatatype percentage=18 + todo: update smoke test for rates and taxcodes diff --git a/ayanova/src/api/ayatype.js b/ayanova/src/api/ayatype.js index 59039608..64f37d5a 100644 --- a/ayanova/src/api/ayatype.js +++ b/ayanova/src/api/ayatype.js @@ -97,7 +97,8 @@ export default { Memo: 60, Review: 61, ServiceRate: 62, - TravelRate: 63 + TravelRate: 63, + TaxCode: 64 }; /** * diff --git a/ayanova/src/api/biz-role-rights.js b/ayanova/src/api/biz-role-rights.js index d1308d7a..9059d289 100644 --- a/ayanova/src/api/biz-role-rights.js +++ b/ayanova/src/api/biz-role-rights.js @@ -19,6 +19,7 @@ export default { Project: { Change: 33098, ReadFullRecord: 65669, Select: 131071 }, ServiceRate: { Change: 66, ReadFullRecord: 98701, Select: 131071 }, TravelRate: { Change: 66, ReadFullRecord: 98701, Select: 131071 }, + TaxCode: { Change: 66, ReadFullRecord: 98701, 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/initialize.js b/ayanova/src/api/initialize.js index e239f6ef..0b09c132 100644 --- a/ayanova/src/api/initialize.js +++ b/ayanova/src/api/initialize.js @@ -478,14 +478,14 @@ function initNavPanel() { }); } - // if (window.$gz.role.canOpen(window.$gz.type.TaxCode)) { - // sub.push({ - // title: "TaxCodeList", - // icon: "$ayiPercent", - // route: "/acc-accounting", - // key: key++ - // }); - // } + if (window.$gz.role.canOpen(window.$gz.type.TaxCode)) { + sub.push({ + title: "TaxCodeList", + icon: "$ayiPercent", + route: "/acc-tax-codes", + key: key++ + }); + } // ** ACCOUNTING (TOP) if (sub.length > 0) { diff --git a/ayanova/src/api/open-object-handler.js b/ayanova/src/api/open-object-handler.js index ecdf77bb..6cf3f84f 100644 --- a/ayanova/src/api/open-object-handler.js +++ b/ayanova/src/api/open-object-handler.js @@ -207,6 +207,12 @@ export default { params: { recordid: tid.id } }); break; + case ayatype.TaxCode: + vm.$router.push({ + name: "tax-code-edit", + params: { recordid: tid.id } + }); + break; default: window.$gz.eventBus.$emit( diff --git a/ayanova/src/views/acc-service-rate.vue b/ayanova/src/views/acc-service-rate.vue index ac2f1d82..89a36c82 100644 --- a/ayanova/src/views/acc-service-rate.vue +++ b/ayanova/src/views/acc-service-rate.vue @@ -273,8 +273,6 @@ export default { unit: null, accountNumber: null }, - - tab: 0, formState: { ready: false, dirty: false, diff --git a/ayanova/src/views/acc-tax-code.vue b/ayanova/src/views/acc-tax-code.vue index 1641929c..cb17aa15 100644 --- a/ayanova/src/views/acc-tax-code.vue +++ b/ayanova/src/views/acc-tax-code.vue @@ -1,21 +1,698 @@ diff --git a/ayanova/src/views/acc-tax-codes.vue b/ayanova/src/views/acc-tax-codes.vue index d3f3c92b..c7cfe03a 100644 --- a/ayanova/src/views/acc-tax-codes.vue +++ b/ayanova/src/views/acc-tax-codes.vue @@ -1,21 +1,171 @@ diff --git a/ayanova/src/views/acc-travel-rate.vue b/ayanova/src/views/acc-travel-rate.vue index e4cce60f..3180b3c4 100644 --- a/ayanova/src/views/acc-travel-rate.vue +++ b/ayanova/src/views/acc-travel-rate.vue @@ -273,8 +273,6 @@ export default { unit: null, accountNumber: null }, - - tab: 0, formState: { ready: false, dirty: false, diff --git a/ayanova/src/views/home-reminder.vue b/ayanova/src/views/home-reminder.vue index 41c4e41c..931988e3 100644 --- a/ayanova/src/views/home-reminder.vue +++ b/ayanova/src/views/home-reminder.vue @@ -232,8 +232,7 @@ export default { color: "#FFFFFFFF" }, //mStartDate = new SmartDate(DBUtil.CurrentWorkingDateTime);//case 1967 set starting date so can't save with no date - //mStopDate = new SmartDate(DBUtil.CurrentWorkingDateTime.AddHours(1));//case 1967 starting default - tab: 0, + //mStopDate = new SmartDate(DBUtil.CurrentWorkingDateTime.AddHours(1));//case 1967 starting default formState: { ready: false, dirty: false, diff --git a/ayanova/src/views/svc-project.vue b/ayanova/src/views/svc-project.vue index ebfed634..031c5fca 100644 --- a/ayanova/src/views/svc-project.vue +++ b/ayanova/src/views/svc-project.vue @@ -270,8 +270,6 @@ export default { projectOverseerId: null, accountNumber: null }, - - tab: 0, formState: { ready: false, dirty: false,