From 21a5a7df3439f808df39ab920562b9f8f20225ba Mon Sep 17 00:00:00 2001 From: Chinmay2107 Date: Thu, 23 May 2024 18:22:17 +0530 Subject: [PATCH 01/10] Refined progress bar color logic for Transfer Orders when scanning items Changelog: Changed --- package-lock.json | 4 ++-- package.json | 2 +- src/components/TransferOrderItem.vue | 8 +++++++- src/store/modules/transferorder/actions.ts | 2 +- src/views/TransferOrderDetail.vue | 8 ++++++++ 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index b5609ada..78d5adbb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "fulfillment", - "version": "2.4.2", + "version": "2.4.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "fulfillment", - "version": "2.4.2", + "version": "2.4.3", "dependencies": { "@capacitor/android": "^2.4.7", "@capacitor/core": "^2.4.7", diff --git a/package.json b/package.json index aff535e9..525bd092 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fulfillment", - "version": "2.4.2", + "version": "2.4.3", "private": true, "description": "An Ionic project", "scripts": { diff --git a/src/components/TransferOrderItem.vue b/src/components/TransferOrderItem.vue index 4c48d257..20bc5765 100644 --- a/src/components/TransferOrderItem.vue +++ b/src/components/TransferOrderItem.vue @@ -31,7 +31,7 @@
- +
@@ -100,6 +100,12 @@ export default defineComponent({ }), }, methods: { + setProgressBarColor(event:any, item: any) { + const fraction = this.getPickedToOrderedFraction(item); + if(fraction > 1) return 'danger' + else if(fraction == 1) return 'success' + else if(fraction < 1) return 'warning' + }, getPickedToOrderedFraction(item: any) { return (parseInt(item.pickedQuantity) + this.getShippedQuantity(item)) / item.orderedQuantity; }, diff --git a/src/store/modules/transferorder/actions.ts b/src/store/modules/transferorder/actions.ts index 1ae043a6..160e17de 100644 --- a/src/store/modules/transferorder/actions.ts +++ b/src/store/modules/transferorder/actions.ts @@ -267,7 +267,7 @@ const actions: ActionTree = { return { isCompleted: true } item.pickedQuantity = parseInt(item.pickedQuantity) + 1; commit(types.ORDER_CURRENT_UPDATED, state.current ) - return { isProductFound: true } + return { isProductFound: true, orderItem: item } } return { isProductFound: false } }, diff --git a/src/views/TransferOrderDetail.vue b/src/views/TransferOrderDetail.vue index e21d684a..60d3eacd 100644 --- a/src/views/TransferOrderDetail.vue +++ b/src/views/TransferOrderDetail.vue @@ -295,6 +295,13 @@ showToast(translate("Scanned item is already completed:", { itemName: payload })) } else if (result.isProductFound) { + const item = result.orderItem + const shippedQuantity = this.getShippedQuantity(item) + if(item.pickedQuantity > item.orderedQuantity - shippedQuantity) + { + showToast(translate('The picked quantity cannot exceed the ordered quantity.') + " " + translate("already shipped.", {shippedQuantity: shippedQuantity})) + } + else { showToast(translate("Scanned successfully.", { itemName: payload })) this.lastScannedId = payload // Highlight specific element @@ -304,6 +311,7 @@ setTimeout(() => { this.lastScannedId = '' }, 3000) + } } else { showToast(translate("Scanned item is not present within the order:", { itemName: payload })); } From 8a948f895d838f9490d728091acd566799f912e8 Mon Sep 17 00:00:00 2001 From: Chinmay2107 Date: Mon, 27 May 2024 18:19:10 +0530 Subject: [PATCH 02/10] Adjusted indentation and Renamed 'setProgressBarColor' method to 'getProgressBarColor' --- package.json | 2 +- src/components/TransferOrderItem.vue | 14 +++++++------- src/views/TransferOrderDetail.vue | 26 ++++++++++++-------------- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index 525bd092..aff535e9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fulfillment", - "version": "2.4.3", + "version": "2.4.2", "private": true, "description": "An Ionic project", "scripts": { diff --git a/src/components/TransferOrderItem.vue b/src/components/TransferOrderItem.vue index 20bc5765..5e22e5c3 100644 --- a/src/components/TransferOrderItem.vue +++ b/src/components/TransferOrderItem.vue @@ -31,7 +31,7 @@
- +
@@ -100,12 +100,12 @@ export default defineComponent({ }), }, methods: { - setProgressBarColor(event:any, item: any) { - const fraction = this.getPickedToOrderedFraction(item); - if(fraction > 1) return 'danger' - else if(fraction == 1) return 'success' - else if(fraction < 1) return 'warning' - }, + getProgressBarColor(item: any) { + const fraction = this.getPickedToOrderedFraction(item); + if(fraction > 1) return 'danger' + else if(fraction == 1) return 'success' + else if(fraction < 1) return 'warning' + }, getPickedToOrderedFraction(item: any) { return (parseInt(item.pickedQuantity) + this.getShippedQuantity(item)) / item.orderedQuantity; }, diff --git a/src/views/TransferOrderDetail.vue b/src/views/TransferOrderDetail.vue index 60d3eacd..890244df 100644 --- a/src/views/TransferOrderDetail.vue +++ b/src/views/TransferOrderDetail.vue @@ -297,20 +297,18 @@ else if (result.isProductFound) { const item = result.orderItem const shippedQuantity = this.getShippedQuantity(item) - if(item.pickedQuantity > item.orderedQuantity - shippedQuantity) - { - showToast(translate('The picked quantity cannot exceed the ordered quantity.') + " " + translate("already shipped.", {shippedQuantity: shippedQuantity})) - } - else { - showToast(translate("Scanned successfully.", { itemName: payload })) - this.lastScannedId = payload - // Highlight specific element - const scannedElement = document.getElementById(payload); - scannedElement && (scannedElement.scrollIntoView()); - // Scanned product should get un-highlighted after 3s for better experience hence adding setTimeOut - setTimeout(() => { - this.lastScannedId = '' - }, 3000) + if(item.pickedQuantity > item.orderedQuantity - shippedQuantity) { + showToast(translate('The picked quantity cannot exceed the ordered quantity.') + " " + translate("already shipped.", {shippedQuantity: shippedQuantity})) + } else { + showToast(translate("Scanned successfully.", { itemName: payload })) + this.lastScannedId = payload + // Highlight specific element + const scannedElement = document.getElementById(payload); + scannedElement && (scannedElement.scrollIntoView()); + // Scanned product should get un-highlighted after 3s for better experience hence adding setTimeOut + setTimeout(() => { + this.lastScannedId = '' + }, 3000) } } else { showToast(translate("Scanned item is not present within the order:", { itemName: payload })); From afcf0e9d71f7f9a28c93328432b2378c2380bc54 Mon Sep 17 00:00:00 2001 From: amansinghbais Date: Mon, 22 Jul 2024 10:56:22 +0530 Subject: [PATCH 03/10] Improved: pre-filling the exisitng maxOrder limit on custom selection --- src/components/OrderLimitPopover.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/OrderLimitPopover.vue b/src/components/OrderLimitPopover.vue index 25f73e25..a44e859b 100644 --- a/src/components/OrderLimitPopover.vue +++ b/src/components/OrderLimitPopover.vue @@ -76,6 +76,7 @@ export default defineComponent({ name: "setLimit", placeholder: translate("Order fulfillment capacity"), type: "number", + value: this.fulfillmentOrderLimit?.toString(), min: 0 }] : [], buttons: [{ From d34d303d736a28f9b489314e3d18de866c2b2c23 Mon Sep 17 00:00:00 2001 From: Ravi Lodhi Date: Wed, 24 Jul 2024 18:52:13 +0530 Subject: [PATCH 04/10] Improved: Added none option in shipping method dropdown (#624). --- src/locales/en.json | 2 ++ src/locales/es.json | 2 ++ src/locales/ja.json | 2 ++ src/views/ShippingDetails.vue | 1 + 4 files changed, 7 insertions(+) diff --git a/src/locales/en.json b/src/locales/en.json index 455f5db6..443b8d18 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -107,6 +107,7 @@ "Date range": "Date range", "Debit Card": "Debit Card", "Declined": "Declined", + "Default": "Default", "Define custom label for": "Define custom label for {field}", "Description": "Description", "Dismiss": "Dismiss", @@ -289,6 +290,7 @@ "No results found for . Try searching In Progress or Completed tab instead. If you still can't find what you're looking for, try switching stores.": "No results found for { searchedQuery }. Try searching In Progress or Completed tab instead.{ lineBreak } If you still can't find what you're looking for, try switching stores.", "No ship groups found": "No ship groups found", "No time zone found": "No time zone found", + "None": "None", "Not in Stock": "Not in Stock", "Not-Authorized": "Not-Authorized", "Not-Received": "Not-Received", diff --git a/src/locales/es.json b/src/locales/es.json index 952e08c0..2f99fd90 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -105,6 +105,7 @@ "Date range": "Rango de fechas", "Debit Card": "Tarjeta de Debito", "Declined": "Rechazado", + "Default": "Default", "Define custom label for": "Definir etiqueta personalizada para {field}", "Dismiss": "Descartar", "Delete": "Borrar", @@ -287,6 +288,7 @@ "No fulfillment capacity": "Sin capacidad de cumplimiento", "No keyword matches the search criteria.": "La palabra coincide con los criterios de búsqueda.", "No variance": "No variance", + "None": "None", "Not in Stock": "No en inventario", "Not-Authorized": "No autorizado", "Not-Received": "No recibido", diff --git a/src/locales/ja.json b/src/locales/ja.json index a67a4916..a90476d7 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -107,6 +107,7 @@ "Date range": "日付範囲", "Debit Card": "デビットカード", "Declined": "拒否されました", + "Default": "Default", "Define custom label for ": "{field}のカスタムラベルを定義", "Description": "説明", "Dismiss": "閉じる", @@ -292,6 +293,7 @@ "Not-Authorized": "未承認", "Not-Received": "未受領", "No Capacity": "容量なし", + "None": "None", "Notification Preference": "通知設定", "Notifications": "通知", "No packed shipments to ship for these orders": "これらの注文には出荷する梱包済み出荷はありません", diff --git a/src/views/ShippingDetails.vue b/src/views/ShippingDetails.vue index a6d04a4f..fb34dd1a 100644 --- a/src/views/ShippingDetails.vue +++ b/src/views/ShippingDetails.vue @@ -33,6 +33,7 @@ {{ translate(method.description) }} + {{ translate("None") }} From fa09d0b3c170598b080c9a298f1fa1378f2b1208 Mon Sep 17 00:00:00 2001 From: amansinghbais Date: Wed, 24 Jul 2024 18:55:24 +0530 Subject: [PATCH 05/10] Improved: checks for empty state in inprogress orders (#612) --- src/views/InProgress.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/views/InProgress.vue b/src/views/InProgress.vue index f9bd143b..b3ffd7ba 100644 --- a/src/views/InProgress.vue +++ b/src/views/InProgress.vue @@ -197,11 +197,13 @@
- - - - - +

From 3262fad92803af460c3cb2184d41cb5ed5d3bcbd Mon Sep 17 00:00:00 2001 From: amansinghbais Date: Wed, 24 Jul 2024 19:00:27 +0530 Subject: [PATCH 06/10] Fixed: force scan setting getting saved in string in state (#612) --- src/store/modules/util/actions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/modules/util/actions.ts b/src/store/modules/util/actions.ts index c567a7c6..a0bfcccf 100644 --- a/src/store/modules/util/actions.ts +++ b/src/store/modules/util/actions.ts @@ -487,7 +487,7 @@ const actions: ActionTree = { } } catch(err) { console.error(err) - commit(types.UTIL_FORCE_SCAN_STATUS_UPDATED, "false") + commit(types.UTIL_FORCE_SCAN_STATUS_UPDATED, false) } }, From 495cf965b6ed4965146e12182d7356f956669682 Mon Sep 17 00:00:00 2001 From: amansinghbais Date: Thu, 25 Jul 2024 10:47:19 +0530 Subject: [PATCH 07/10] Improved: added permission over the force scan setting (#664) --- src/authorization/Actions.ts | 3 ++- src/authorization/Rules.ts | 3 ++- src/views/Settings.vue | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/authorization/Actions.ts b/src/authorization/Actions.ts index cb2e46bb..f76ab616 100644 --- a/src/authorization/Actions.ts +++ b/src/authorization/Actions.ts @@ -11,5 +11,6 @@ export default { "APP_CARRIERS_CREATE" : "APP_CARRIERS_CREATE", "APP_ORDER_LOOKUP_VIEW": "APP_ORDER_LOOKUP_VIEW", "APP_PARTIAL_ORDER_REJECTION_CONFIG_UPDATE": "APP_PARTIAL_ORDER_REJECTION_CONFIG_UPDATE", - "APP_COLLATERAL_REJECTION_CONFIG_UPDATE": "APP_COLLATERAL_REJECTION_CONFIG_UPDATE" + "APP_COLLATERAL_REJECTION_CONFIG_UPDATE": "APP_COLLATERAL_REJECTION_CONFIG_UPDATE", + "APP_UPDT_FULFILL_FORCE_SCAN_CONFIG": "APP_UPDT_FULFILL_FORCE_SCAN_CONFIG", } \ No newline at end of file diff --git a/src/authorization/Rules.ts b/src/authorization/Rules.ts index c4b38207..ff5d6c20 100644 --- a/src/authorization/Rules.ts +++ b/src/authorization/Rules.ts @@ -20,5 +20,6 @@ export default { "APP_CARRIERS_CREATE": "CARRIER_SETUP_VIEW", "APP_ORDER_LOOKUP_VIEW": "FF_ORDER_LOOKUP_VIEW", "APP_PARTIAL_ORDER_REJECTION_CONFIG_UPDATE": "COMMON_ADMIN", - "APP_COLLATERAL_REJECTION_CONFIG_UPDATE": "COMMON_ADMIN" + "APP_COLLATERAL_REJECTION_CONFIG_UPDATE": "COMMON_ADMIN", + "APP_UPDT_FULFILL_FORCE_SCAN_CONFIG": "COMMON_ADMIN" } as any \ No newline at end of file diff --git a/src/views/Settings.vue b/src/views/Settings.vue index 0f425e01..da69cd5e 100644 --- a/src/views/Settings.vue +++ b/src/views/Settings.vue @@ -167,7 +167,7 @@ {{ translate("Control whether the store requires the force scan during order packing or not.") }} - {{ translate("Require scan") }} + {{ translate("Require scan") }} From 7c7658988542f95907457dc30fe579802076dfd4 Mon Sep 17 00:00:00 2001 From: Chinmay2107 Date: Fri, 26 Jul 2024 11:03:34 +0530 Subject: [PATCH 08/10] Resolved conflicts and updated the logic to show primary color when quantity is 0 --- package-lock.json | 16 +++++++++++----- src/components/TransferOrderItem.vue | 3 ++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index fc5e3bde..c1a8b75f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,13 +1,11 @@ { "name": "fulfillment", - "version": "2.4.2", "version": "2.7.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "fulfillment", - "version": "2.4.2", "version": "2.7.0", "dependencies": { "@capacitor/android": "^2.4.7", @@ -2803,6 +2801,7 @@ "version": "1.15.2", "resolved": "https://registry.npmjs.org/@hotwax/dxp-components/-/dxp-components-1.15.2.tgz", "integrity": "sha512-0jF1xkRIVrDbJwUaaPwWUhp3cVBpdjgAJO/fOQ4XYjzKb8rYXgw0Xm/qHHUnSeAZW5laMnQrm1KtPZp8szu4dQ==", + "license": "Apache-2.0", "dependencies": { "@hotwax/oms-api": "^1.8.1", "@ionic/core": "^7.6.0", @@ -2951,6 +2950,7 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/vue-markdown-render/-/vue-markdown-render-2.2.1.tgz", "integrity": "sha512-XkYnC0PMdbs6Vy6j/gZXSvCuOS0787Se5COwXlepRqiqPiunyCIeTPQAO2XnB4Yl04EOHXwLx5y6IuszMWSgyQ==", + "license": "MIT", "dependencies": { "markdown-it": "^13.0.2" }, @@ -11686,6 +11686,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz", "integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==", + "license": "MIT", "dependencies": { "uc.micro": "^1.0.1" } @@ -12120,6 +12121,7 @@ "version": "13.0.2", "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.2.tgz", "integrity": "sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==", + "license": "MIT", "dependencies": { "argparse": "^2.0.1", "entities": "~3.0.1", @@ -12134,12 +12136,14 @@ "node_modules/markdown-it/node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "license": "Python-2.0" }, "node_modules/markdown-it/node_modules/entities": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz", "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==", + "license": "BSD-2-Clause", "engines": { "node": ">=0.12" }, @@ -12166,7 +12170,8 @@ "node_modules/mdurl": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", - "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==" + "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==", + "license": "MIT" }, "node_modules/media-typer": { "version": "0.3.0", @@ -16239,7 +16244,8 @@ "node_modules/uc.micro": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", - "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==" + "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==", + "license": "MIT" }, "node_modules/unbox-primitive": { "version": "1.0.2", diff --git a/src/components/TransferOrderItem.vue b/src/components/TransferOrderItem.vue index 5e22e5c3..317e485a 100644 --- a/src/components/TransferOrderItem.vue +++ b/src/components/TransferOrderItem.vue @@ -104,7 +104,8 @@ export default defineComponent({ const fraction = this.getPickedToOrderedFraction(item); if(fraction > 1) return 'danger' else if(fraction == 1) return 'success' - else if(fraction < 1) return 'warning' + else if(fraction == 0) return 'primary' + return 'warning' }, getPickedToOrderedFraction(item: any) { return (parseInt(item.pickedQuantity) + this.getShippedQuantity(item)) / item.orderedQuantity; From 02f11e297a0cb2d96b163f9e1ac2b29ad5e9e17b Mon Sep 17 00:00:00 2001 From: Chinmay2107 Date: Fri, 26 Jul 2024 11:16:07 +0530 Subject: [PATCH 09/10] Updated the package-lock.json from the main branch --- package-lock.json | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index c1a8b75f..f6d7cddd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2801,7 +2801,6 @@ "version": "1.15.2", "resolved": "https://registry.npmjs.org/@hotwax/dxp-components/-/dxp-components-1.15.2.tgz", "integrity": "sha512-0jF1xkRIVrDbJwUaaPwWUhp3cVBpdjgAJO/fOQ4XYjzKb8rYXgw0Xm/qHHUnSeAZW5laMnQrm1KtPZp8szu4dQ==", - "license": "Apache-2.0", "dependencies": { "@hotwax/oms-api": "^1.8.1", "@ionic/core": "^7.6.0", @@ -2950,7 +2949,6 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/vue-markdown-render/-/vue-markdown-render-2.2.1.tgz", "integrity": "sha512-XkYnC0PMdbs6Vy6j/gZXSvCuOS0787Se5COwXlepRqiqPiunyCIeTPQAO2XnB4Yl04EOHXwLx5y6IuszMWSgyQ==", - "license": "MIT", "dependencies": { "markdown-it": "^13.0.2" }, @@ -11686,7 +11684,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz", "integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==", - "license": "MIT", "dependencies": { "uc.micro": "^1.0.1" } @@ -12121,7 +12118,6 @@ "version": "13.0.2", "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.2.tgz", "integrity": "sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==", - "license": "MIT", "dependencies": { "argparse": "^2.0.1", "entities": "~3.0.1", @@ -12136,14 +12132,12 @@ "node_modules/markdown-it/node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "license": "Python-2.0" + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" }, "node_modules/markdown-it/node_modules/entities": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz", "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==", - "license": "BSD-2-Clause", "engines": { "node": ">=0.12" }, @@ -12170,8 +12164,7 @@ "node_modules/mdurl": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", - "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==", - "license": "MIT" + "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==" }, "node_modules/media-typer": { "version": "0.3.0", @@ -16244,8 +16237,7 @@ "node_modules/uc.micro": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", - "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==", - "license": "MIT" + "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==" }, "node_modules/unbox-primitive": { "version": "1.0.2", @@ -18063,4 +18055,4 @@ "dev": true } } -} +} \ No newline at end of file From 582ebbaf1d894c9c2e8c173610a415ceac55e8e0 Mon Sep 17 00:00:00 2001 From: Ravi Lodhi Date: Fri, 26 Jul 2024 12:36:34 +0530 Subject: [PATCH 10/10] Fixed: Displayed chevron up icon while showing kit components (#603). --- src/views/Completed.vue | 6 ++++-- src/views/InProgress.vue | 5 ++++- src/views/OpenOrders.vue | 6 ++++-- src/views/OrderDetail.vue | 8 ++++++-- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/views/Completed.vue b/src/views/Completed.vue index e48bd806..685f02fe 100644 --- a/src/views/Completed.vue +++ b/src/views/Completed.vue @@ -87,7 +87,8 @@
- + + {{ getProductStock(item.productId).quantityOnHandTotal }} {{ translate('pieces in stock') }} @@ -197,7 +198,7 @@ import { modalController } from '@ionic/vue'; import { computed, defineComponent } from 'vue'; -import { caretDownOutline, cubeOutline, printOutline, downloadOutline, listOutline, pricetagOutline, ellipsisVerticalOutline, checkmarkDoneOutline, optionsOutline } from 'ionicons/icons' +import { caretDownOutline, chevronUpOutline, cubeOutline, printOutline, downloadOutline, listOutline, pricetagOutline, ellipsisVerticalOutline, checkmarkDoneOutline, optionsOutline } from 'ionicons/icons' import Popover from '@/views/ShippingPopover.vue' import { useRouter } from 'vue-router'; import { mapGetters, useStore } from 'vuex' @@ -746,6 +747,7 @@ export default defineComponent({ return { Actions, caretDownOutline, + chevronUpOutline, copyToClipboard, checkmarkDoneOutline, cubeOutline, diff --git a/src/views/InProgress.vue b/src/views/InProgress.vue index b3ffd7ba..043ea8eb 100644 --- a/src/views/InProgress.vue +++ b/src/views/InProgress.vue @@ -136,7 +136,8 @@
- + + @@ -270,6 +271,7 @@ import { computed, defineComponent } from 'vue'; import { addOutline, caretDownOutline, + chevronUpOutline, checkmarkDoneOutline, closeCircleOutline, cubeOutline, @@ -1242,6 +1244,7 @@ export default defineComponent({ addOutline, authStore, caretDownOutline, + chevronUpOutline, copyToClipboard, checkmarkDoneOutline, closeCircleOutline, diff --git a/src/views/OpenOrders.vue b/src/views/OpenOrders.vue index 8e23e274..5b2e24d9 100644 --- a/src/views/OpenOrders.vue +++ b/src/views/OpenOrders.vue @@ -81,7 +81,8 @@
- + + {{ getProductStock(item.productId).quantityOnHandTotal }} {{ translate('pieces in stock') }} @@ -169,7 +170,7 @@ import { popoverController } from '@ionic/vue'; import { computed, defineComponent } from 'vue'; -import { caretDownOutline, cubeOutline, listOutline, notificationsOutline, optionsOutline, pricetagOutline, printOutline,} from 'ionicons/icons'; +import { caretDownOutline, chevronUpOutline, cubeOutline, listOutline, notificationsOutline, optionsOutline, pricetagOutline, printOutline,} from 'ionicons/icons'; import AssignPickerModal from '@/views/AssignPickerModal.vue'; import { mapGetters, useStore } from 'vuex'; import { getProductIdentificationValue, DxpShopifyImg, useProductIdentificationStore } from '@hotwax/dxp-components'; @@ -437,6 +438,7 @@ export default defineComponent({ return{ Actions, caretDownOutline, + chevronUpOutline, cubeOutline, formatUtcDate, getFeature, diff --git a/src/views/OrderDetail.vue b/src/views/OrderDetail.vue index 4c98065b..b7b8a974 100644 --- a/src/views/OrderDetail.vue +++ b/src/views/OrderDetail.vue @@ -126,7 +126,8 @@ {{ translate('Components') }} - + +
@@ -246,7 +247,8 @@ - + + @@ -312,6 +314,7 @@ import { bagCheckOutline, caretDownOutline, cashOutline, + chevronUpOutline, closeCircleOutline, cubeOutline, documentTextOutline, @@ -1316,6 +1319,7 @@ export default defineComponent({ bagCheckOutline, cashOutline, caretDownOutline, + chevronUpOutline, closeCircleOutline, copyToClipboard, cubeOutline,