From 1c1f41a46cc573bfe84c96e1d87d3b3b06446ce5 Mon Sep 17 00:00:00 2001 From: shanmukhdutt Date: Thu, 7 Dec 2023 10:23:02 +0530 Subject: [PATCH 1/5] Fixed: Enabled Everywhere on Card to Open Detail Page on Upload Page(#209) --- src/views/Upload.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/Upload.vue b/src/views/Upload.vue index 5d6b4a5d..f78aa6d4 100644 --- a/src/views/Upload.vue +++ b/src/views/Upload.vue @@ -7,12 +7,12 @@ - + - +

{{ product.productName }}

{{ product.sku }}

 From 466b8cee049c5f9da41aea9d3d9dcd1765336900 Mon Sep 17 00:00:00 2001 From: shanmukhdutt Date: Thu, 7 Dec 2023 12:09:59 +0530 Subject: [PATCH 2/5] Improved: Remove Event Button in Upload page(#209) --- src/views/Upload.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Upload.vue b/src/views/Upload.vue index f78aa6d4..046bca02 100644 --- a/src/views/Upload.vue +++ b/src/views/Upload.vue @@ -36,7 +36,7 @@ {{ $t("Variance") }} {{ product.quantity - product.availableQOH }} - {{ $t( "Remove" ) }} + {{ $t( "Remove" ) }} From 83f136530bc7a1e6f0c15b83373ee8b2eab5927d Mon Sep 17 00:00:00 2001 From: shanmukhdutt Date: Fri, 8 Dec 2023 19:16:09 +0530 Subject: [PATCH 3/5] Revert "Improved: Added Toast Notification on Item Removal from Upload Page(#213)" This reverts commit 2dce920681d818df689c2a69288f4d9107f2f04d. --- src/locales/en.json | 2 -- src/store/modules/product/actions.ts | 1 - src/views/Upload.vue | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index 3c5d054d..7f8859dd 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -23,7 +23,6 @@ "inventory variance": "inventory variance", "Instance Url": "Instance Url", "Item added to upload list": "Item added to upload list", - "Item removed successfully":"Item removed successfully", "Loading": "Loading", "Location": "Location", "Log variance": "Log variance", @@ -75,5 +74,4 @@ "Variance updated successfully": "Variance updated successfully", "View": "View", "You do not have permission to access this page": "You do not have permission to access this page" - } \ No newline at end of file diff --git a/src/store/modules/product/actions.ts b/src/store/modules/product/actions.ts index 889c87b4..926755de 100644 --- a/src/store/modules/product/actions.ts +++ b/src/store/modules/product/actions.ts @@ -48,7 +48,6 @@ const actions: ActionTree = { async removeItemFromUploadProducts( {commit}, payload) { commit(types.PRODUCT_REMOVE_FROM_UPLD_PRDTS, {sku: payload}); - showToast(translate("Item removed successfully")); }, async clearUploadProducts ({ commit }) { diff --git a/src/views/Upload.vue b/src/views/Upload.vue index 046bca02..1f0ed1bc 100644 --- a/src/views/Upload.vue +++ b/src/views/Upload.vue @@ -71,7 +71,7 @@ import { colorPaletteOutline, resize, cloudUploadOutline } from 'ionicons/icons' import { mapGetters, useStore } from 'vuex'; import { useRouter } from 'vue-router'; import { ShopifyImg } from '@hotwax/dxp-components'; -import { Actions, hasPermission } from '@/authorization' + import { Actions, hasPermission } from '@/authorization' export default defineComponent({ name: "Upload", From 3e273ed5d9ac2477799994c3755f4ab586357dbe Mon Sep 17 00:00:00 2001 From: shanmukhdutt Date: Thu, 8 Feb 2024 17:45:32 +0530 Subject: [PATCH 4/5] Fixed: merge conflict issue(#209) --- src/locales/en.json | 3 --- src/views/Upload.vue | 5 ----- 2 files changed, 8 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index 5536368d..61d01859 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -25,10 +25,7 @@ "inventory variance": "inventory variance", "Instance Url": "Instance Url", "Item added to upload list": "Item added to upload list", -<<<<<<< HEAD -======= "Item removed from upload list":"Item removed from upload list", ->>>>>>> 036b52ecd1964586ccbdf01a92dbb419c727accc "Loading": "Loading", "Location": "Location", "Log variance": "Log variance", diff --git a/src/views/Upload.vue b/src/views/Upload.vue index 395e30ac..d52afcff 100644 --- a/src/views/Upload.vue +++ b/src/views/Upload.vue @@ -70,14 +70,9 @@ import { computed, defineComponent } from 'vue'; import { colorPaletteOutline, resize, cloudUploadOutline } from 'ionicons/icons'; import { mapGetters, useStore } from 'vuex'; import { useRouter } from 'vue-router'; -<<<<<<< HEAD -import { ShopifyImg } from '@hotwax/dxp-components'; - import { Actions, hasPermission } from '@/authorization' -======= import { getProductIdentificationValue, DxpShopifyImg , useProductIdentificationStore } from '@hotwax/dxp-components'; import { Actions, hasPermission } from '@/authorization'; import { showToast } from '@/utils'; ->>>>>>> 036b52ecd1964586ccbdf01a92dbb419c727accc export default defineComponent({ name: "Upload", From c1872b997ecac842095d566ac84d065606a57f5c Mon Sep 17 00:00:00 2001 From: shanmukhdutt Date: Fri, 9 Feb 2024 09:13:26 +0530 Subject: [PATCH 5/5] removed the click event from label --- src/views/Upload.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Upload.vue b/src/views/Upload.vue index d52afcff..b3834127 100644 --- a/src/views/Upload.vue +++ b/src/views/Upload.vue @@ -12,7 +12,7 @@ - +

{{ getProductIdentificationValue(productIdentificationPref.secondaryId, product) }}

{{ getProductIdentificationValue(productIdentificationPref.primaryId, product) ? getProductIdentificationValue(productIdentificationPref.primaryId, product) : product.productName }}