From 29c5fead1c686c12ec74e51420bddceca443edef Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Fri, 25 Oct 2024 14:49:10 +0530
Subject: [PATCH] Improved: identifier labels, updated static text entry in
 en.json and removed some options from hard-coded identifications list as we
 are getting those dynamically(dxp/345)

---
 .env.example           |  2 +-
 src/locales/en.json    | 10 +++++-----
 src/views/Settings.vue |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

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/locales/en.json b/src/locales/en.json
index 1e899e96..96e89208 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -26,7 +26,7 @@
   "Before": "Before",
   "Browser TimeZone": "Browser TimeZone",
   "Browser time zone": "Browser time zone",
-  "Built: ": "Built: {builtDateTime}",
+  "Built:": "Built: {builtDateTime}",
   "Bulk Upload Cycle Counts": "Bulk Upload Cycle Counts",
   "Camera permission denied.": "Camera permission denied.",
   "Cancel": "Cancel",
@@ -159,6 +159,7 @@
   "NOT COUNTED": "NOT COUNTED",
   "not counted": "not counted",
   "No facility": "No facility",
+  "None": "None",
   "Fetching time zones": "Fetching time zones",
   "Ok": "Ok",
   "OMS": "OMS",
@@ -176,9 +177,8 @@
   "Please select the column that corresponds to the product identifier": "Please select the column that corresponds to the product identifier",
   "Preparing file to downlaod...": "Preparing file to downlaod...",
   "Primary": "Primary",
-  "Primary identifier": "Primary identifier",
   "Primary product ID": "Primary product ID",
-  "Primary Product Identifier": "Primary Product Identifier",
+  "primary identifier": "primary identifier",
   "processed": "processed",
   "processing": "processing",
   "Product Identifier": "Product Identifier",
@@ -218,7 +218,6 @@
   "Saving recount will replace the existing count for item.": "Saving recount will replace the existing count for item.",
   "Scan": "Scan",
   "Scan or search products": "Scan or search products",
-  "Secondary Product Identifier": "Secondary Product Identifier",
   "selected": "selected",
   "Select": "Select",
   "Select fields": "Select fields",
@@ -230,6 +229,7 @@
   "Search time zones": "Search time zones",
   "Searching on SKU": "Searching on SKU",
   "Secondary": "Secondary",
+  "secondary identifier": "secondary identifier",
   "Select all the required fields to continue": "Select all the required fields to continue",
   "Select date": "Select date",
   "Select the column containing products": "Select the column containing products",
@@ -284,7 +284,7 @@
   "variance": "variance",
   "Variance reason": "Variance reason",
   "Variance updated successfully": "Variance updated successfully",
-  "Version: ": "Version: {appVersion}",
+  "Version:": "Version: {appVersion}",
   "View": "View",
   "You do not have permission to access the app.": "You do not have permission to access the app.",
   "You do not have permission to access this page": "You do not have permission to access this page",
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index 4b251494..18a6e89a 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -121,12 +121,12 @@
           </ion-card-content>
 
           <ion-item>
-            <ion-select :label="translate('Primary Product Identifier')" :disabled="!hasPermission(Actions.APP_PRODUCT_IDENTIFIER_UPDATE) || !(currentFacility?.productStore?.productStoreId || currentProductStore.productStoreId)" interface="popover" :placeholder="translate('primary identifier')" :value="productStoreSettings['productIdentificationPref'].primaryId" @ionChange="setProductIdentificationPref($event.detail.value, 'primaryId')">
+            <ion-select :label="translate('Primary')" :disabled="!hasPermission(Actions.APP_PRODUCT_IDENTIFIER_UPDATE) || !(currentFacility?.productStore?.productStoreId || currentProductStore.productStoreId)" interface="popover" :placeholder="translate('primary identifier')" :value="productStoreSettings['productIdentificationPref'].primaryId" @ionChange="setProductIdentificationPref($event.detail.value, 'primaryId')">
               <ion-select-option v-for="identification in productIdentifications" :key="identification" :value="identification" >{{ identification }}</ion-select-option>
             </ion-select>
           </ion-item>
           <ion-item>
-            <ion-select :label="translate('Secondary Product Identifier')" :disabled="!hasPermission(Actions.APP_PRODUCT_IDENTIFIER_UPDATE) || !(currentFacility?.productStore?.productStoreId || currentProductStore.productStoreId)" interface="popover" :placeholder="translate('secondary identifier')" :value="productStoreSettings['productIdentificationPref'].secondaryId" @ionChange="setProductIdentificationPref($event.detail.value, 'secondaryId')">
+            <ion-select :label="translate('Secondary')" :disabled="!hasPermission(Actions.APP_PRODUCT_IDENTIFIER_UPDATE) || !(currentFacility?.productStore?.productStoreId || currentProductStore.productStoreId)" interface="popover" :placeholder="translate('secondary identifier')" :value="productStoreSettings['productIdentificationPref'].secondaryId" @ionChange="setProductIdentificationPref($event.detail.value, 'secondaryId')">
               <ion-select-option v-for="identification in productIdentifications" :key="identification" :value="identification" >{{ identification }}</ion-select-option>
               <ion-select-option value="">{{ translate("None") }}</ion-select-option>
             </ion-select>