From 2e32a91192ce5cacba90cd91dec2915122c4efe5 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 17 Feb 2021 14:55:10 +0000 Subject: [PATCH] --- ayanova/devdocs/todo.txt | 2 +- ayanova/src/api/gzutil.js | 2 +- ayanova/src/api/initialize.js | 16 +- ayanova/src/router.js | 9 - .../src/views/inv-purchase-order-receipts.vue | 21 --- ayanova/src/views/inv-purchase-orders.vue | 172 ++++++++++++++++-- 6 files changed, 163 insertions(+), 59 deletions(-) delete mode 100644 ayanova/src/views/inv-purchase-order-receipts.vue diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index c8fe0300..8c7b5547 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -89,7 +89,7 @@ todo: how to add locale keys in future after release without erasing all data? -CURRENTLY DOING: PurchaseOrder - front end, rights check bizroles at server and update and then client then go for it Mr. LIcensed to DriVe!!! ;) +CURRENTLY DOING: PurchaseOrder PO todo todo: test duplicate route diff --git a/ayanova/src/api/gzutil.js b/ayanova/src/api/gzutil.js index 93543c57..5d7e208d 100644 --- a/ayanova/src/api/gzutil.js +++ b/ayanova/src/api/gzutil.js @@ -416,7 +416,7 @@ export default { case window.$gz.type.Project: return "$ayiLayerGroup"; case window.$gz.type.PurchaseOrder: - return "$ayiShippingFast"; + return "$ayiDollyFlatbed"; case window.$gz.type.Quote: return "$ayiPencilAlt"; case window.$gz.type.QuoteItem: diff --git a/ayanova/src/api/initialize.js b/ayanova/src/api/initialize.js index 68b3faee..88300dcd 100644 --- a/ayanova/src/api/initialize.js +++ b/ayanova/src/api/initialize.js @@ -412,25 +412,11 @@ function initNavPanel() { if (useInventory && window.$gz.role.canOpen(window.$gz.type.PurchaseOrder)) { sub.push({ title: "InventoryPurchaseOrders", - icon: "$ayiShippingFast", + icon: "$ayiDollyFlatbed", route: "/inv-purchase-orders", key: key++ }); - //NOTE: V7 HAD POITEMS, THAT MAY BE AN ANACHRONISM NOW SO NOT PUTTING HERE - - //PURCHASE ORDER RECEIPTS -- DEPRECATED, just haven't removed yet until get to PO's - if (useInventory) { - sub.push({ - title: "InventoryPurchaseOrderReceipts", - icon: "$ayiDollyFlatbed", - route: "/inv-purchase-order-receipts", - key: key++ - }); - } - - //NOTE: V7 HAD PORECEIPTITEMS, THAT MAY BE AN ANACHRONISM NOW SO NOT PUTTING HERE - //ADJUSTMENTS if ( useInventory && diff --git a/ayanova/src/router.js b/ayanova/src/router.js index d9173c23..5de94366 100644 --- a/ayanova/src/router.js +++ b/ayanova/src/router.js @@ -468,15 +468,6 @@ export default new Router({ import(/* webpackChunkName: "inv" */ "./views/inv-purchase-orders.vue") }, - { - path: "/inv-purchase-order-receipts", - name: "inv-purchase-order-receipts", - component: () => - import( - /* webpackChunkName: "inv" */ "./views/inv-purchase-order-receipts.vue" - ) - }, - //####################### VENDORS GROUP ############################## { path: "/vendors", diff --git a/ayanova/src/views/inv-purchase-order-receipts.vue b/ayanova/src/views/inv-purchase-order-receipts.vue deleted file mode 100644 index a274d4cd..00000000 --- a/ayanova/src/views/inv-purchase-order-receipts.vue +++ /dev/null @@ -1,21 +0,0 @@ - - - diff --git a/ayanova/src/views/inv-purchase-orders.vue b/ayanova/src/views/inv-purchase-orders.vue index 0822ff17..636822cb 100644 --- a/ayanova/src/views/inv-purchase-orders.vue +++ b/ayanova/src/views/inv-purchase-orders.vue @@ -1,21 +1,169 @@