Skip to content

Commit

Permalink
Improved: identifier labels, updated static text entry in en.json and…
Browse files Browse the repository at this point in the history
… removed some options from hard-coded identifications list as we are getting those dynamically(dxp/345)
  • Loading branch information
ymaheshwari1 committed Oct 25, 2024
1 parent 3959562 commit 29c5fea
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -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"
10 changes: 5 additions & 5 deletions src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions src/views/Settings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 29c5fea

Please sign in to comment.