diff --git a/.env.example b/.env.example index 21c07831..a6d915d4 100644 --- a/.env.example +++ b/.env.example @@ -4,7 +4,7 @@ VUE_APP_CACHE_MAX_AGE=3600 VUE_APP_VIEW_SIZE=10 VUE_APP_PERMISSION_ID="INVCOUNT_APP_VIEW" VUE_APP_DEFAULT_LOG_LEVEL="error" -VUE_APP_PRDT_IDENT=["productId", "groupId", "groupName", "internalName", "parentProductName", "sku", "title", "SHOPIFY_PROD_SKU", "ERP_ID", "UPCA"] +VUE_APP_PRDT_IDENT=["productId", "groupId", "groupName", "internalName", "parentProductName", "primaryProductCategoryName", "title"] VUE_APP_MAPPING_TYPES={"INVCOUNT": "INVCNT_MAPPING_PREF"} VUE_APP_MAPPING_INVCOUNT={"countImportName": { "label": "Count name", "required": true}, "productSku": { "label": "Product SKU", "required": true, "description": "Products will not be deduplicated. Make sure products are only added to a count once."}, "facility": { "label": "Facility", "required": false, "description": "If a file includes multiple facilities, a count is created for every facility. All items with no facility location will be added to the same count." }, "statusId": { "label": "Status", "required": false, "description": "Defaults to 'Draft'" }, "dueDate": { "label": "Due date", "description": "Format: yyyy-mm-dd", "required": false }} VUE_APP_LOGIN_URL="http://launchpad.hotwax.io/login" \ No newline at end of file diff --git a/src/authorization/Rules.ts b/src/authorization/Rules.ts index 12f21bb1..f2760238 100644 --- a/src/authorization/Rules.ts +++ b/src/authorization/Rules.ts @@ -6,6 +6,6 @@ export default { "APP_STORE_PERMISSIONS_VIEW": "COMMON_ADMIN", "APP_SETTINGS_VIEW": "", "APP_COUNT_VIEW": "FULFILL_INVCUNT_ADMIN OR INV_COUNT_ADMIN", - "APP_PRODUCT_IDENTIFIER_UPDATE": "", + "APP_PRODUCT_IDENTIFIER_UPDATE": "COMMON_ADMIN", "INVCOUNT_APP_VIEW": "INVCOUNT_APP_VIEW" } as any \ No newline at end of file diff --git a/src/components/AddProductModal.vue b/src/components/AddProductModal.vue index ef4c5735..a169dc4a 100644 --- a/src/components/AddProductModal.vue +++ b/src/components/AddProductModal.vue @@ -19,7 +19,7 @@ -

{{ getProductIdentificationValue(productStoreSettings["productIdentificationPref"].primaryId, product) }}

+

{{ getProductIdentificationValue(productStoreSettings["productIdentificationPref"].primaryId, product) || getProduct(product.productId).productName }}

{{ getProductIdentificationValue(productStoreSettings["productIdentificationPref"].secondaryId, product) }}

@@ -73,6 +73,7 @@ const props = defineProps(["cycleCount"]) const products = computed(() => store.getters["product/getProducts"]) const isScrollable = computed(() => store.getters["product/isScrollable"]) const productStoreSettings = computed(() => store.getters["user/getProductStoreSettings"]) +const getProduct = computed(() => (id: any) => store.getters["product/getProduct"](id)) let queryString = ref('') const isSearching = ref(false); diff --git a/src/components/AssignedCountPopover.vue b/src/components/AssignedCountPopover.vue index 7080012e..49403f6c 100644 --- a/src/components/AssignedCountPopover.vue +++ b/src/components/AssignedCountPopover.vue @@ -1,7 +1,7 @@