From 1ad86fbd8af20d3858acdd63e7a535558d750e0a Mon Sep 17 00:00:00 2001 From: Sanskar Soni Date: Tue, 5 Sep 2023 16:01:37 +0530 Subject: [PATCH 1/9] Implemented: alert messages for Not in stock product selection scenarios while reporting an issue in progress orders (#260) --- src/locales/en.json | 5 ++++- src/locales/es.json | 5 ++++- src/views/InProgress.vue | 25 ++++++++++++++++++------- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index fd9d12d8..728d64da 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -89,6 +89,8 @@ "Generate shipping label": "Generate shipping label", "Go to OMS": "Go to OMS", "Go to Launchpad": "Go to Launchpad", + "is identified as unfulfillable. other orders containing this product will be unassigned from this store and sent to be rebrokered.": "{ productName } is identified as unfulfillable. { space } { orders } other { orderText } containing this product will be unassigned from this store and sent to be rebrokered.", + "is identified as unfulfillable. This order item will be unassigned from this store and sent to be rebrokered.": "{ productName } is identified as unfulfillable. { space } This order item will be unassigned from this store and sent to be rebrokered.", "item": "item", "items": "items", "Import": "Import", @@ -263,5 +265,6 @@ "You are shipping orders. You cannot unpack and edit orders after they have been shipped. Are you sure you are ready to ship this orders?": "You are shipping { count } order. { space } You cannot unpack and edit orders after they have been shipped. Are you sure you are ready to ship this order? | You are shipping { count } orders. { space } You cannot unpack and edit orders after they have been shipped. Are you sure you are ready to ship these orders?", "You do not have permission to access this page": "You do not have permission to access this page", "Zip Code": "Zip Code", - ", and other products are identified as unfulfillable. other orders containing these products will be unassigned from this store and sent to be rebrokered.": "{ productName }, and { products } other products are identified as unfulfillable. { space } { orders } other orders containing these products will be unassigned from this store and sent to be rebrokered." + ", and other products are identified as unfulfillable. These order items will be unassigned from this store and sent to be rebrokered.": "{ productName }, and { products } other products are identified as unfulfillable. { space } These order items will be unassigned from this store and sent to be rebrokered.", + ", and other products are identified as unfulfillable. other orders containing these products will be unassigned from this store and sent to be rebrokered.": "{ productName }, and { products } other products are identified as unfulfillable. { space } { orders } other { orderText } containing these products will be unassigned from this store and sent to be rebrokered." } \ No newline at end of file diff --git a/src/locales/es.json b/src/locales/es.json index 9b486fcf..e232f632 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -89,6 +89,8 @@ "Generate shipping label": "Generate shipping label", "Go to OMS": "Go to OMS", "Go to Launchpad": "Go to Launchpad", + "is identified as unfulfillable. other orders containing this product will be unassigned from this store and sent to be rebrokered.": "{ productName } is identified as unfulfillable. { space } { orders } other { orderText } containing this product will be unassigned from this store and sent to be rebrokered.", + "is identified as unfulfillable. This order item will be unassigned from this store and sent to be rebrokered.": "{ productName } is identified as unfulfillable. { space } This order item will be unassigned from this store and sent to be rebrokered.", "item": "artículo", "items": "artículos", "Import": "Importar", @@ -264,5 +266,6 @@ "You are packing orders. Select additional documents that you would like to print.": "Estás empacando {count} pedidos. {space} Selecciona documentos adicionales que te gustaría imprimir.", "You are shipping orders. You cannot unpack and edit orders after they have been shipped. Are you sure you are ready to ship this orders?": "Estás enviando {count} pedido. {space} No puedes desempacar ni editar los pedidos una vez que se hayan enviado. ¿Estás seguro/a de que estás listo/a para enviar este pedido? | Estás enviando {count} pedidos. {space} No puedes desempacar ni editar los pedidos una vez que se hayan enviado. ¿Estás seguro/a de que estás listo/a para enviar estos pedidos?", "Zip Code": "Zip Code", - ", and other products are identified as unfulfillable. other orders containing these products will be unassigned from this store and sent to be rebrokered.": "{productName}, y {products} otros productos se identificaron como no realizables. {space} {orders} otros pedidos que contienen estos productos serán desasignados de esta tienda y enviados para ser reasignados." + ", and other products are identified as unfulfillable. These order items will be unassigned from this store and sent to be rebrokered.": "{ productName }, and { products } other products are identified as unfulfillable. { space } These order items will be unassigned from this store and sent to be rebrokered.", + ", and other products are identified as unfulfillable. other orders containing these products will be unassigned from this store and sent to be rebrokered.": "{ productName }, and { products } other products are identified as unfulfillable. { space } { orders } other { orderText } containing these products will be unassigned from this store and sent to be rebrokered." } diff --git a/src/views/InProgress.vue b/src/views/InProgress.vue index d845fdf1..5809db48 100644 --- a/src/views/InProgress.vue +++ b/src/views/InProgress.vue @@ -522,7 +522,7 @@ export default defineComponent({ const shipmentIdResps = await Promise.all(requestParams.map((params) => UtilService.findShipmentIdsForOrders(params.picklistBinIds, params.orderIds))) return Object.assign({}, ...shipmentIdResps) }, - async reportIssue(order: any, itemsToReject: any) { + async reportIssue(issueOrder: any, itemsToReject: any) { // finding is there any item that is `out of stock` as we need to display the message accordingly const outOfStockItem = itemsToReject.find((item: any) => item.rejectReason === 'NOT_IN_STOCK') @@ -532,12 +532,23 @@ export default defineComponent({ message = this.$t('Are you sure you want to perform this action?') } else { const productName = outOfStockItem.productName + const itemsToRejectNotInStock = itemsToReject.filter((item: any) => item.rejectReason === 'NOT_IN_STOCK'); + + // TODO: ordersCount is not correct as current we are identifying orders count by only checking items visible on UI and not other orders + const ordersCount = this.inProgressOrders.list.map((order: any) => order.items.filter((item: any) => itemsToRejectNotInStock.some((outOfStockItem: any) => outOfStockItem.productSku === item.productSku) && item.orderId !== issueOrder.orderId))?.filter((item: any) => item.length).length; - // TODO: ordersCount is not correct as current we are identifying orders count by only checking items visible on UI and not other orders - const ordersCount = this.inProgressOrders.list.map((order: any) => order.items.filter((item: any) => item.productSku === outOfStockItem.productSku))?.filter((item: any) => item.length).length - - // displaying product count decrement by 1 as we are displaying one product sku directly. - message = this.$t(", and other products are identified as unfulfillable. other orders containing these products will be unassigned from this store and sent to be rebrokered.", {productName, products: itemsToReject.length - 1, space: '

', orders: ordersCount}) + if (itemsToReject.length === 1 && ordersCount) { + message = this.$t("is identified as unfulfillable. other orders containing this product will be unassigned from this store and sent to be rebrokered.", { productName, space: '

', orders: ordersCount, orderText: ordersCount > 1 ? 'orders' : 'order' }) + } + else if (itemsToReject.length === 1 && !ordersCount) { + message = this.$t("is identified as unfulfillable. This order item will be unassigned from this store and sent to be rebrokered.", { productName, space: '

' }) + } + else if (itemsToReject.length > 1 && ordersCount) { + message = this.$t(", and other products are identified as unfulfillable. other orders containing these products will be unassigned from this store and sent to be rebrokered.", { productName, products: itemsToReject.length - 1, space: '

', orders: ordersCount, orderText: ordersCount > 1 ? 'orders' : 'order' }) + } + else { + message = this.$t(", and other products are identified as unfulfillable. These order items will be unassigned from this store and sent to be rebrokered.", { productName, products: itemsToReject.length - 1, space: '

' }) + } } const alert = await alertController .create({ @@ -550,7 +561,7 @@ export default defineComponent({ text: this.$t("Report"), role: 'confirm', handler: async() => { - await this.updateOrder(order); + await this.updateOrder(issueOrder); } }] }); From 7c5e664d8b513637a35d1b6f14c44b8560d333ee Mon Sep 17 00:00:00 2001 From: Sanskar Soni Date: Tue, 5 Sep 2023 16:14:49 +0530 Subject: [PATCH 2/9] Improved: namings in exim page like dowload change to import --- src/locales/en.json | 8 ++++---- src/locales/es.json | 8 ++++---- src/views/DownloadPackedOrders.vue | 4 ++-- src/views/Exim.vue | 6 +++--- src/views/UploadImportOrders.vue | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index 728d64da..b2512c31 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -40,9 +40,9 @@ "Dismiss": "Dismiss", "Delete": "Delete", "Delete mapping": "Delete mapping", - "Download": "Download", - "Download orders that are packed and haven't been shipped yet. Use the downloaded file to send the packed order details to a carrier where shipping labels and tracking codes will be generated.": "Download orders that are packed and haven't been shipped yet. Use the downloaded file to send the packed order details to a carrier where shipping labels and tracking codes will be generated.", - "Download packed orders": "Download packed orders", + "Export": "Export", + "Export orders that are packed and haven't been shipped yet. Use the exported file to send the packed order details to a carrier where shipping labels and tracking codes will be generated.": "Export orders that are packed and haven't been shipped yet. Use the exported file to send the packed order details to a carrier where shipping labels and tracking codes will be generated.", + "Export packed orders": "Export packed orders", "eCom Store": "eCom Store", "Edit packaging": "Edit packaging", "Edit pickers": "Edit pickers", @@ -254,7 +254,7 @@ "Update": "Update", "Update mapping": "Update mapping", "Update time zone": "Update time zone", - "Upload": "Upload", + "Import CSV": "Import CSV", "Username": "Username", "Value": "Value", "View Saved Mappings": "View Saved Mappings", diff --git a/src/locales/es.json b/src/locales/es.json index e232f632..88c7a977 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -40,9 +40,9 @@ "Dismiss": "Dismiss", "Delete": "Delete", "Delete mapping": "Delete mapping", - "Download": "Descargar", - "Download orders that are packed and haven't been shipped yet. Use the downloaded file to send the packed order details to a carrier where shipping labels and tracking codes will be generated.": "Descarga los pedidos que están empacados y aún no se han enviado. Utiliza el archivo descargado para enviar los detalles de los pedidos empacados a una empresa de transporte donde se generarán las etiquetas de envío y los códigos de seguimiento.", - "Download packed orders": "Descargar pedidos empacados", + "Export": "Export", + "Export orders that are packed and haven't been shipped yet. Use the exported file to send the packed order details to a carrier where shipping labels and tracking codes will be generated.": "Export orders that are packed and haven't been shipped yet. Use the exported file to send the packed order details to a carrier where shipping labels and tracking codes will be generated.", + "Export packed orders": "Export packed orders", "eCom Store": "Tienda eCom", "Edit packaging": "Editar empaque", "Edit pickers": "Edit pickers", @@ -256,7 +256,7 @@ "Update": "Update", "Update mapping": "Update mapping", "Update time zone": "Actualizar zona horaria", - "Upload": "Cargar", + "Import CSV": "Import CSV", "Username": "Nombre de Usuario", "Value": "Valor", "View Saved Mappings": "View Saved Mappings", diff --git a/src/views/DownloadPackedOrders.vue b/src/views/DownloadPackedOrders.vue index c8f6bd99..6177784d 100644 --- a/src/views/DownloadPackedOrders.vue +++ b/src/views/DownloadPackedOrders.vue @@ -3,7 +3,7 @@ - {{ $t("Download packed orders") }} + {{ $t("Export packed orders") }} @@ -51,7 +51,7 @@ - {{ $t("Download") }} + {{ $t("Export") }} diff --git a/src/views/Exim.vue b/src/views/Exim.vue index 8cf13a34..e3e0cdbd 100644 --- a/src/views/Exim.vue +++ b/src/views/Exim.vue @@ -12,18 +12,18 @@ - {{ $t("Download") }} + {{ $t("Export") }} {{ $t('Packed Orders') }} - {{ $t("Download orders that are packed and haven't been shipped yet. Use the downloaded file to send the packed order details to a carrier where shipping labels and tracking codes will be generated.") }} + {{ $t("Export orders that are packed and haven't been shipped yet. Use the exported file to send the packed order details to a carrier where shipping labels and tracking codes will be generated.") }}
- {{ $t('Download') }} + {{ $t('Export') }}
diff --git a/src/views/UploadImportOrders.vue b/src/views/UploadImportOrders.vue index 05269c7e..56eee80e 100644 --- a/src/views/UploadImportOrders.vue +++ b/src/views/UploadImportOrders.vue @@ -13,7 +13,7 @@ {{ $t("Shipped orders") }} {{ file.name }} - + From 239f51330a096dafd5a3ba8a6af55eb9fdb8fe2a Mon Sep 17 00:00:00 2001 From: Sanskar Soni Date: Tue, 5 Sep 2023 17:55:48 +0530 Subject: [PATCH 3/9] Improved: message and header of edit picker confirmation alert --- src/components/EditPickersModal.vue | 4 ++-- src/locales/en.json | 3 ++- src/locales/es.json | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/components/EditPickersModal.vue b/src/components/EditPickersModal.vue index e72a33ad..12badbaa 100644 --- a/src/components/EditPickersModal.vue +++ b/src/components/EditPickersModal.vue @@ -179,9 +179,9 @@ export default defineComponent({ } }, async confirmSave() { - const message = this.$t("Are you sure you want to remove the current pickers from the picklist and replace them with new pickers?"); + const message = this.$t("Replace current pickers with new selection?"); const alert = await alertController.create({ - header: this.$t("Edit pickers"), + header: this.$t("Replace pickers"), message, buttons: [ { diff --git a/src/locales/en.json b/src/locales/en.json index b2512c31..139f9279 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -1,7 +1,6 @@ { "All": "All", "App": "App", - "Are you sure you want to remove the current pickers from the picklist and replace them with new pickers?": "Are you sure you want to remove the current pickers from the picklist and replace them with new pickers?", "A store represents a company or a unique catalog of products. If your OMS is connected to multiple eCommerce stores selling different collections of products, you may have multiple Product Stores set up in HotWax Commerce.": "A store represents a company or a unique catalog of products. If your OMS is connected to multiple eCommerce stores selling different collections of products, you may have multiple Product Stores set up in HotWax Commerce.", "doesn't have any completed orders right now.": "{facilityName} doesn't have any completed orders right now.", "doesn't have any orders in progress right now.": "{facilityName} doesn't have any orders in progress right now.", @@ -181,6 +180,8 @@ "Rejecting has been started. All outstanding orders will be rejected shortly.": "Rejecting has been started. All outstanding orders will be rejected shortly.", "Regenerate Shipping Label": "Regenerate Shipping Label", "Replace": "Replace", + "Replace pickers": "Replace pickers", + "Replace current pickers with new selection?": "Replace current pickers with new selection?", "Report": "Report", "Report an issue": "Report an issue", "Result Size": "Result Size", diff --git a/src/locales/es.json b/src/locales/es.json index 88c7a977..69d60225 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -1,7 +1,6 @@ { "All": "All", "App": "App", - "Are you sure you want to remove the current pickers from the picklist and replace them with new pickers?": "Are you sure you want to remove the current pickers from the picklist and replace them with new pickers?", "A store represents a company or a unique catalog of products. If your OMS is connected to multiple eCommerce stores selling different collections of products, you may have multiple Product Stores set up in HotWax Commerce.": "A store represents a company or a unique catalog of products. If your OMS is connected to multiple eCommerce stores selling different collections of products, you may have multiple Product Stores set up in HotWax Commerce.", "doesn't have any completed orders right now.": "{facilityName} no tiene ningún pedido completado en este moment.", "doesn't have any orders in progress right now.": "{facilityName} no tiene ningún pedido en curso en este moment.", @@ -182,6 +181,8 @@ "Rejecting has been started. All outstanding orders will be rejected shortly.": "Rejecting has been started. All outstanding orders will be rejected shortly.", "Regenerate Shipping Label": "Regenerate Shipping Label", "Replace": "Replace", + "Replace pickers": "Replace pickers", + "Replace current pickers with new selection?": "Replace current pickers with new selection?", "Report": "Reporte", "Report an issue": "Reportar un problema", "Result Size": "Tamaño del Resultado", From 60255aebba19603514464b1fa31c4df5c597efba Mon Sep 17 00:00:00 2001 From: Sanskar Soni Date: Wed, 6 Sep 2023 10:40:01 +0530 Subject: [PATCH 4/9] Improved: sorted entries in locales file in alphabetic order (#260) --- src/locales/en.json | 8 ++++---- src/locales/es.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index 139f9279..ce869d99 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -39,9 +39,6 @@ "Dismiss": "Dismiss", "Delete": "Delete", "Delete mapping": "Delete mapping", - "Export": "Export", - "Export orders that are packed and haven't been shipped yet. Use the exported file to send the packed order details to a carrier where shipping labels and tracking codes will be generated.": "Export orders that are packed and haven't been shipped yet. Use the exported file to send the packed order details to a carrier where shipping labels and tracking codes will be generated.", - "Export packed orders": "Export packed orders", "eCom Store": "eCom Store", "Edit packaging": "Edit packaging", "Edit pickers": "Edit pickers", @@ -51,7 +48,10 @@ "Enter mapping name": "Enter mapping name", "Enter value": "Enter value", "EXIM": "EXIM", + "Export": "Export", "Export Orders": "Export Orders", + "Export orders that are packed and haven't been shipped yet. Use the exported file to send the packed order details to a carrier where shipping labels and tracking codes will be generated.": "Export orders that are packed and haven't been shipped yet. Use the exported file to send the packed order details to a carrier where shipping labels and tracking codes will be generated.", + "Export packed orders": "Export packed orders", "Facility": "Facility", "Facility Address 1": "Facility Address 1", "Facility Address 2": "Facility Address 2", @@ -93,6 +93,7 @@ "item": "item", "items": "items", "Import": "Import", + "Import CSV": "Import CSV", "Import Orders": "Import Orders", "Import shipped order details from an external system based on tracking codes. Orders that have tracking codes will automatically be shipped at the end of the day.": "Import shipped order details from an external system based on tracking codes. Orders that have tracking codes will automatically be shipped at the end of the day.", "Import shipped orders": "Import shipped orders", @@ -255,7 +256,6 @@ "Update": "Update", "Update mapping": "Update mapping", "Update time zone": "Update time zone", - "Import CSV": "Import CSV", "Username": "Username", "Value": "Value", "View Saved Mappings": "View Saved Mappings", diff --git a/src/locales/es.json b/src/locales/es.json index 69d60225..3356e46a 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -39,9 +39,6 @@ "Dismiss": "Dismiss", "Delete": "Delete", "Delete mapping": "Delete mapping", - "Export": "Export", - "Export orders that are packed and haven't been shipped yet. Use the exported file to send the packed order details to a carrier where shipping labels and tracking codes will be generated.": "Export orders that are packed and haven't been shipped yet. Use the exported file to send the packed order details to a carrier where shipping labels and tracking codes will be generated.", - "Export packed orders": "Export packed orders", "eCom Store": "Tienda eCom", "Edit packaging": "Editar empaque", "Edit pickers": "Edit pickers", @@ -51,7 +48,10 @@ "Enter mapping name": "Enter mapping name", "Enter value": "Ingresar valor", "EXIM": "EXIM", + "Export": "Export", "Export Orders": "Export Orders", + "Export orders that are packed and haven't been shipped yet. Use the exported file to send the packed order details to a carrier where shipping labels and tracking codes will be generated.": "Export orders that are packed and haven't been shipped yet. Use the exported file to send the packed order details to a carrier where shipping labels and tracking codes will be generated.", + "Export packed orders": "Export packed orders", "Facility": "Facility", "Facility Address 1": "Facility Address 1", "Facility Address 2": "Facility Address 2", @@ -93,6 +93,7 @@ "item": "artículo", "items": "artículos", "Import": "Importar", + "Import CSV": "Import CSV", "Import Orders": "Import Orders", "Import shipped order details from an external system based on tracking codes. Orders that have tracking codes will automatically be shipped at the end of the day.": "Importa los detalles de los pedidos enviados desde un sistema externo basado en códigos de seguimiento. Los pedidos que tienen códigos de seguimiento se enviarán automáticamente al final del día.", "Import shipped orders": "Importar pedidos enviados", @@ -257,7 +258,6 @@ "Update": "Update", "Update mapping": "Update mapping", "Update time zone": "Actualizar zona horaria", - "Import CSV": "Import CSV", "Username": "Nombre de Usuario", "Value": "Valor", "View Saved Mappings": "View Saved Mappings", From 422a6f0cb3accf8093d6df6cd5d940aa35008bc5 Mon Sep 17 00:00:00 2001 From: Sanskar Soni Date: Tue, 12 Sep 2023 15:14:21 +0530 Subject: [PATCH 5/9] Improved: indentation (#260) --- src/views/InProgress.vue | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/views/InProgress.vue b/src/views/InProgress.vue index 5809db48..6a71b273 100644 --- a/src/views/InProgress.vue +++ b/src/views/InProgress.vue @@ -539,14 +539,11 @@ export default defineComponent({ if (itemsToReject.length === 1 && ordersCount) { message = this.$t("is identified as unfulfillable. other orders containing this product will be unassigned from this store and sent to be rebrokered.", { productName, space: '

', orders: ordersCount, orderText: ordersCount > 1 ? 'orders' : 'order' }) - } - else if (itemsToReject.length === 1 && !ordersCount) { + } else if (itemsToReject.length === 1 && !ordersCount) { message = this.$t("is identified as unfulfillable. This order item will be unassigned from this store and sent to be rebrokered.", { productName, space: '

' }) - } - else if (itemsToReject.length > 1 && ordersCount) { + } else if (itemsToReject.length > 1 && ordersCount) { message = this.$t(", and other products are identified as unfulfillable. other orders containing these products will be unassigned from this store and sent to be rebrokered.", { productName, products: itemsToReject.length - 1, space: '

', orders: ordersCount, orderText: ordersCount > 1 ? 'orders' : 'order' }) - } - else { + } else { message = this.$t(", and other products are identified as unfulfillable. These order items will be unassigned from this store and sent to be rebrokered.", { productName, products: itemsToReject.length - 1, space: '

' }) } } From a8b1b17e1b90865c04a1b0f359e40b4295491565 Mon Sep 17 00:00:00 2001 From: Sanskar Soni Date: Fri, 15 Sep 2023 18:58:14 +0530 Subject: [PATCH 6/9] Improved: internalization messages and argument namings (#260) --- package-lock.json | 14 +++++++------- package.json | 2 +- src/adapter/index.ts | 3 ++- src/locales/en.json | 4 ++-- src/locales/es.json | 4 ++-- src/main.ts | 5 ++++- src/views/InProgress.vue | 10 +++++----- 7 files changed, 23 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index 72432852..30156174 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@casl/ability": "^6.0.0", "@hotwax/app-version-info": "^1.0.0", "@hotwax/dxp-components": "^1.3.4", - "@hotwax/oms-api": "^1.7.0", + "@hotwax/oms-api": "^1.9.0", "@ionic/core": "6.7.5", "@ionic/vue": "6.7.5", "@ionic/vue-router": "6.7.5", @@ -2399,9 +2399,9 @@ } }, "node_modules/@hotwax/oms-api": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/@hotwax/oms-api/-/oms-api-1.8.1.tgz", - "integrity": "sha512-pVceiuaOSkRZM3i87+TCEu6uBMDG01JGTG92mCpDUXWmA6nd0BL7QiK1Qr8a9lDTib0M24RVBDCGc/cX6nlxgg==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@hotwax/oms-api/-/oms-api-1.10.0.tgz", + "integrity": "sha512-Li9vqTsGHqfTalL2FWDAIPSEdiZyRLDQOcHzXf5YFo8yTLEgiBM1kvfl12nXYWRpVtE9DPDMHkqxkWRlQTM/Lw==", "dependencies": { "@types/node-json-transform": "^1.0.0", "axios": "^0.21.1", @@ -35456,9 +35456,9 @@ } }, "@hotwax/oms-api": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/@hotwax/oms-api/-/oms-api-1.8.1.tgz", - "integrity": "sha512-pVceiuaOSkRZM3i87+TCEu6uBMDG01JGTG92mCpDUXWmA6nd0BL7QiK1Qr8a9lDTib0M24RVBDCGc/cX6nlxgg==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@hotwax/oms-api/-/oms-api-1.10.0.tgz", + "integrity": "sha512-Li9vqTsGHqfTalL2FWDAIPSEdiZyRLDQOcHzXf5YFo8yTLEgiBM1kvfl12nXYWRpVtE9DPDMHkqxkWRlQTM/Lw==", "requires": { "@types/node-json-transform": "^1.0.0", "axios": "^0.21.1", diff --git a/package.json b/package.json index 6f531ab7..494ae246 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "@casl/ability": "^6.0.0", "@hotwax/app-version-info": "^1.0.0", "@hotwax/dxp-components": "^1.3.4", - "@hotwax/oms-api": "^1.7.0", + "@hotwax/oms-api": "^1.9.0", "@ionic/core": "6.7.5", "@ionic/vue": "6.7.5", "@ionic/vue-router": "6.7.5", diff --git a/src/adapter/index.ts b/src/adapter/index.ts index 7f00e724..4d22b907 100644 --- a/src/adapter/index.ts +++ b/src/adapter/index.ts @@ -1,8 +1,9 @@ -import { api, client, hasError, initialise, resetConfig, updateInstanceUrl, updateToken } from '@hotwax/oms-api' +import { api, client, getConfig, hasError, initialise, resetConfig, updateInstanceUrl, updateToken } from '@hotwax/oms-api' export { api, client, + getConfig, hasError, initialise, resetConfig, diff --git a/src/locales/en.json b/src/locales/en.json index ce869d99..29e92fe6 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -88,7 +88,7 @@ "Generate shipping label": "Generate shipping label", "Go to OMS": "Go to OMS", "Go to Launchpad": "Go to Launchpad", - "is identified as unfulfillable. other orders containing this product will be unassigned from this store and sent to be rebrokered.": "{ productName } is identified as unfulfillable. { space } { orders } other { orderText } containing this product will be unassigned from this store and sent to be rebrokered.", + "is identified as unfulfillable. other containing this product will be unassigned from this store and sent to be rebrokered.": "{ productName } is identified as unfulfillable. { space } { orders } other { orderText } containing this product will be unassigned from this store and sent to be rebrokered.", "is identified as unfulfillable. This order item will be unassigned from this store and sent to be rebrokered.": "{ productName } is identified as unfulfillable. { space } This order item will be unassigned from this store and sent to be rebrokered.", "item": "item", "items": "items", @@ -267,5 +267,5 @@ "You do not have permission to access this page": "You do not have permission to access this page", "Zip Code": "Zip Code", ", and other products are identified as unfulfillable. These order items will be unassigned from this store and sent to be rebrokered.": "{ productName }, and { products } other products are identified as unfulfillable. { space } These order items will be unassigned from this store and sent to be rebrokered.", - ", and other products are identified as unfulfillable. other orders containing these products will be unassigned from this store and sent to be rebrokered.": "{ productName }, and { products } other products are identified as unfulfillable. { space } { orders } other { orderText } containing these products will be unassigned from this store and sent to be rebrokered." + ", and other products are identified as unfulfillable. other containing these products will be unassigned from this store and sent to be rebrokered.": "{ productName }, and { products } other products are identified as unfulfillable. { space } { orders } other { orderText } containing these products will be unassigned from this store and sent to be rebrokered." } \ No newline at end of file diff --git a/src/locales/es.json b/src/locales/es.json index 3356e46a..72bff020 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -88,7 +88,7 @@ "Generate shipping label": "Generate shipping label", "Go to OMS": "Go to OMS", "Go to Launchpad": "Go to Launchpad", - "is identified as unfulfillable. other orders containing this product will be unassigned from this store and sent to be rebrokered.": "{ productName } is identified as unfulfillable. { space } { orders } other { orderText } containing this product will be unassigned from this store and sent to be rebrokered.", + "is identified as unfulfillable. other containing this product will be unassigned from this store and sent to be rebrokered.": "{ productName } is identified as unfulfillable. { space } { orders } other { orderText } containing this product will be unassigned from this store and sent to be rebrokered.", "is identified as unfulfillable. This order item will be unassigned from this store and sent to be rebrokered.": "{ productName } is identified as unfulfillable. { space } This order item will be unassigned from this store and sent to be rebrokered.", "item": "artículo", "items": "artículos", @@ -268,5 +268,5 @@ "You are shipping orders. You cannot unpack and edit orders after they have been shipped. Are you sure you are ready to ship this orders?": "Estás enviando {count} pedido. {space} No puedes desempacar ni editar los pedidos una vez que se hayan enviado. ¿Estás seguro/a de que estás listo/a para enviar este pedido? | Estás enviando {count} pedidos. {space} No puedes desempacar ni editar los pedidos una vez que se hayan enviado. ¿Estás seguro/a de que estás listo/a para enviar estos pedidos?", "Zip Code": "Zip Code", ", and other products are identified as unfulfillable. These order items will be unassigned from this store and sent to be rebrokered.": "{ productName }, and { products } other products are identified as unfulfillable. { space } These order items will be unassigned from this store and sent to be rebrokered.", - ", and other products are identified as unfulfillable. other orders containing these products will be unassigned from this store and sent to be rebrokered.": "{ productName }, and { products } other products are identified as unfulfillable. { space } { orders } other { orderText } containing these products will be unassigned from this store and sent to be rebrokered." + ", and other products are identified as unfulfillable. other containing these products will be unassigned from this store and sent to be rebrokered.": "{ productName }, and { products } other products are identified as unfulfillable. { space } { orders } other { orderText } containing these products will be unassigned from this store and sent to be rebrokered." } diff --git a/src/main.ts b/src/main.ts index a7934e93..1c4c7dda 100644 --- a/src/main.ts +++ b/src/main.ts @@ -32,6 +32,7 @@ import permissionRules from '@/authorization/Rules'; import permissionActions from '@/authorization/Actions'; import { dxpComponents } from '@hotwax/dxp-components'; import { login, logout, loader } from './user-utils'; +import { getConfig, initialise } from './adapter'; const app = createApp(App) .use(IonicVue, { @@ -52,7 +53,9 @@ const app = createApp(App) login, logout, loader, - appLoginUrl: process.env.VUE_APP_LOGIN_URL as string + appLoginUrl: process.env.VUE_APP_LOGIN_URL as string, + getConfig, + initialise }); router.isReady().then(() => { diff --git a/src/views/InProgress.vue b/src/views/InProgress.vue index 6a71b273..82520b5d 100644 --- a/src/views/InProgress.vue +++ b/src/views/InProgress.vue @@ -522,7 +522,7 @@ export default defineComponent({ const shipmentIdResps = await Promise.all(requestParams.map((params) => UtilService.findShipmentIdsForOrders(params.picklistBinIds, params.orderIds))) return Object.assign({}, ...shipmentIdResps) }, - async reportIssue(issueOrder: any, itemsToReject: any) { + async reportIssue(order: any, itemsToReject: any) { // finding is there any item that is `out of stock` as we need to display the message accordingly const outOfStockItem = itemsToReject.find((item: any) => item.rejectReason === 'NOT_IN_STOCK') @@ -535,14 +535,14 @@ export default defineComponent({ const itemsToRejectNotInStock = itemsToReject.filter((item: any) => item.rejectReason === 'NOT_IN_STOCK'); // TODO: ordersCount is not correct as current we are identifying orders count by only checking items visible on UI and not other orders - const ordersCount = this.inProgressOrders.list.map((order: any) => order.items.filter((item: any) => itemsToRejectNotInStock.some((outOfStockItem: any) => outOfStockItem.productSku === item.productSku) && item.orderId !== issueOrder.orderId))?.filter((item: any) => item.length).length; + const ordersCount = this.inProgressOrders.list.map((inProgressOrder: any) => inProgressOrder.items.filter((item: any) => itemsToRejectNotInStock.some((outOfStockItem: any) => outOfStockItem.productSku === item.productSku) && item.orderId !== order.orderId))?.filter((item: any) => item.length).length; if (itemsToReject.length === 1 && ordersCount) { - message = this.$t("is identified as unfulfillable. other orders containing this product will be unassigned from this store and sent to be rebrokered.", { productName, space: '

', orders: ordersCount, orderText: ordersCount > 1 ? 'orders' : 'order' }) + message = this.$t("is identified as unfulfillable. other containing this product will be unassigned from this store and sent to be rebrokered.", { productName, space: '

', orders: ordersCount, orderText: ordersCount > 1 ? 'orders' : 'order' }) } else if (itemsToReject.length === 1 && !ordersCount) { message = this.$t("is identified as unfulfillable. This order item will be unassigned from this store and sent to be rebrokered.", { productName, space: '

' }) } else if (itemsToReject.length > 1 && ordersCount) { - message = this.$t(", and other products are identified as unfulfillable. other orders containing these products will be unassigned from this store and sent to be rebrokered.", { productName, products: itemsToReject.length - 1, space: '

', orders: ordersCount, orderText: ordersCount > 1 ? 'orders' : 'order' }) + message = this.$t(", and other products are identified as unfulfillable. other containing these products will be unassigned from this store and sent to be rebrokered.", { productName, products: itemsToReject.length - 1, space: '

', orders: ordersCount, orderText: ordersCount > 1 ? 'orders' : 'order' }) } else { message = this.$t(", and other products are identified as unfulfillable. These order items will be unassigned from this store and sent to be rebrokered.", { productName, products: itemsToReject.length - 1, space: '

' }) } @@ -558,7 +558,7 @@ export default defineComponent({ text: this.$t("Report"), role: 'confirm', handler: async() => { - await this.updateOrder(issueOrder); + await this.updateOrder(order); } }] }); From da10b600370773b11cff152f68f5045f424273a3 Mon Sep 17 00:00:00 2001 From: Sanskar Soni Date: Mon, 18 Sep 2023 15:24:53 +0530 Subject: [PATCH 7/9] Reverted: change Upload label for uploading csv. Import CSV to Upload (#260) --- src/locales/en.json | 2 +- src/locales/es.json | 2 +- src/views/UploadImportOrders.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index 29e92fe6..704e35f8 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -93,7 +93,6 @@ "item": "item", "items": "items", "Import": "Import", - "Import CSV": "Import CSV", "Import Orders": "Import Orders", "Import shipped order details from an external system based on tracking codes. Orders that have tracking codes will automatically be shipped at the end of the day.": "Import shipped order details from an external system based on tracking codes. Orders that have tracking codes will automatically be shipped at the end of the day.", "Import shipped orders": "Import shipped orders", @@ -256,6 +255,7 @@ "Update": "Update", "Update mapping": "Update mapping", "Update time zone": "Update time zone", + "Upload": "Upload", "Username": "Username", "Value": "Value", "View Saved Mappings": "View Saved Mappings", diff --git a/src/locales/es.json b/src/locales/es.json index 72bff020..661415c0 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -93,7 +93,6 @@ "item": "artículo", "items": "artículos", "Import": "Importar", - "Import CSV": "Import CSV", "Import Orders": "Import Orders", "Import shipped order details from an external system based on tracking codes. Orders that have tracking codes will automatically be shipped at the end of the day.": "Importa los detalles de los pedidos enviados desde un sistema externo basado en códigos de seguimiento. Los pedidos que tienen códigos de seguimiento se enviarán automáticamente al final del día.", "Import shipped orders": "Importar pedidos enviados", @@ -258,6 +257,7 @@ "Update": "Update", "Update mapping": "Update mapping", "Update time zone": "Actualizar zona horaria", + "Upload": "Upload", "Username": "Nombre de Usuario", "Value": "Valor", "View Saved Mappings": "View Saved Mappings", diff --git a/src/views/UploadImportOrders.vue b/src/views/UploadImportOrders.vue index 56eee80e..05269c7e 100644 --- a/src/views/UploadImportOrders.vue +++ b/src/views/UploadImportOrders.vue @@ -13,7 +13,7 @@ {{ $t("Shipped orders") }} {{ file.name }} - + From a1332f60d54750be100384fcfb1c8a9402690b49 Mon Sep 17 00:00:00 2001 From: Sanskar Soni Date: Mon, 18 Sep 2023 15:30:00 +0530 Subject: [PATCH 8/9] Improved: es.json entry Upload: Upload to Upload: Cargar (#260) --- src/locales/es.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/es.json b/src/locales/es.json index 661415c0..82b53660 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -257,7 +257,7 @@ "Update": "Update", "Update mapping": "Update mapping", "Update time zone": "Actualizar zona horaria", - "Upload": "Upload", + "Upload": "Cargar", "Username": "Nombre de Usuario", "Value": "Valor", "View Saved Mappings": "View Saved Mappings", From 7b2b09b0067224ef646970760f0b8533127f203d Mon Sep 17 00:00:00 2001 From: Sanskar Soni Date: Mon, 18 Sep 2023 15:36:09 +0530 Subject: [PATCH 9/9] Reverted: chnages in package-lock.json (#260) --- package-lock.json | 204 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 203 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 6a91b0d3..fe971c64 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6683,6 +6683,25 @@ "node": ">=6" } }, + "node_modules/@vue/cli-plugin-unit-jest/node_modules/fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "deprecated": "The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "dependencies": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + }, + "engines": { + "node": ">= 4.0" + } + }, "node_modules/@vue/cli-plugin-unit-jest/node_modules/import-local": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz", @@ -15462,6 +15481,20 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true }, + "node_modules/fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -18574,6 +18607,25 @@ "node": ">=6" } }, + "node_modules/jest-environment-jsdom-fifteen/node_modules/fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "deprecated": "The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "dependencies": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + }, + "engines": { + "node": ">= 4.0" + } + }, "node_modules/jest-environment-jsdom-fifteen/node_modules/is-ci": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", @@ -19175,6 +19227,25 @@ "node": ">=6" } }, + "node_modules/jest-environment-jsdom/node_modules/fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "deprecated": "The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "dependencies": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + }, + "engines": { + "node": ">= 4.0" + } + }, "node_modules/jest-environment-jsdom/node_modules/is-ci": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", @@ -20021,6 +20092,25 @@ "node": ">=6" } }, + "node_modules/jest-jasmine2/node_modules/fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "deprecated": "The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "dependencies": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + }, + "engines": { + "node": ">= 4.0" + } + }, "node_modules/jest-jasmine2/node_modules/is-ci": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", @@ -31817,6 +31907,25 @@ "node": ">=0.10.0" } }, + "node_modules/watchpack-chokidar2/node_modules/fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "deprecated": "The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "dependencies": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + }, + "engines": { + "node": ">= 4.0" + } + }, "node_modules/watchpack-chokidar2/node_modules/is-binary-path": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", @@ -32313,6 +32422,25 @@ "node": ">=6" } }, + "node_modules/webpack-dev-server/node_modules/fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "deprecated": "The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "dependencies": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + }, + "engines": { + "node": ">= 4.0" + } + }, "node_modules/webpack-dev-server/node_modules/http-proxy-middleware": { "version": "0.19.1", "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz", @@ -38776,6 +38904,17 @@ "locate-path": "^3.0.0" } }, + "fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "dev": true, + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } + }, "import-local": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz", @@ -45784,6 +45923,13 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true }, + "fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, + "optional": true + }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -48135,6 +48281,17 @@ "locate-path": "^3.0.0" } }, + "fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "dev": true, + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } + }, "is-ci": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", @@ -48676,6 +48833,17 @@ "locate-path": "^3.0.0" } }, + "fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "dev": true, + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } + }, "is-ci": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", @@ -49308,6 +49476,17 @@ "locate-path": "^3.0.0" } }, + "fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "dev": true, + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } + }, "is-ci": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", @@ -52842,7 +53021,8 @@ } }, "nan": { - "version": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", + "version": "2.17.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==", "dev": true, "optional": true @@ -58699,6 +58879,17 @@ "to-regex-range": "^2.1.0" } }, + "fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "dev": true, + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } + }, "is-binary-path": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", @@ -59272,6 +59463,17 @@ "locate-path": "^3.0.0" } }, + "fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "dev": true, + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } + }, "http-proxy-middleware": { "version": "0.19.1", "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",