From da18ea90fcebd759f2f4e0cece50a13959acdb02 Mon Sep 17 00:00:00 2001 From: R-Sourabh Date: Tue, 7 May 2024 20:25:09 +0530 Subject: [PATCH 1/4] Implemented: UI of inventory computation for order items(#386) --- src/components/InventoryDetailsPopover.vue | 78 +++++++ src/components/ProductListItem.vue | 27 ++- src/views/ProductDetail.vue | 251 ++++++++++++++++----- 3 files changed, 297 insertions(+), 59 deletions(-) create mode 100644 src/components/InventoryDetailsPopover.vue diff --git a/src/components/InventoryDetailsPopover.vue b/src/components/InventoryDetailsPopover.vue new file mode 100644 index 000000000..b964c0eab --- /dev/null +++ b/src/components/InventoryDetailsPopover.vue @@ -0,0 +1,78 @@ + + + \ No newline at end of file diff --git a/src/components/ProductListItem.vue b/src/components/ProductListItem.vue index e4da4229c..ad9b32903 100644 --- a/src/components/ProductListItem.vue +++ b/src/components/ProductListItem.vue @@ -6,26 +6,30 @@

{{ getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.productId)) }}

{{ getProductIdentificationValue(productIdentificationPref.secondaryId, getProduct(item.productId)) }}

+

Color: color

+

Size: size
- - {{ getProductStock(item.productId).quantityOnHandTotal }} {{ translate('pieces in stock') }} - + 50 ATP + + +
\ No newline at end of file diff --git a/src/components/ProductListItem.vue b/src/components/ProductListItem.vue index 1f2d6ca31..cc2404678 100644 --- a/src/components/ProductListItem.vue +++ b/src/components/ProductListItem.vue @@ -17,7 +17,7 @@
50 ATP - +
diff --git a/src/locales/en.json b/src/locales/en.json index 7b5c58ef1..1b7b81865 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -8,6 +8,7 @@ "Are you sure you want to change the time zone to?": "Are you sure you want to change the time zone to?", "Are you sure you want to update the notification preferences?": "Are you sure you want to update the notification preferences?", "Arrived": "Arrived", + "Available to promise": "Available to promise", "Authenticating": "Authenticating", "Assign Pickers": "Assign Pickers", "Browser TimeZone": "Browser TimeZone", @@ -57,6 +58,7 @@ "Instance Url": "Instance Url", "In store": "In store", "Inventory": "Inventory", + "Inventory computation": "Inventory computation", "Item has been rejected successfully.": "Item has been rejected successfully.", "Language": "Language", "Last name": "Last name", @@ -90,6 +92,7 @@ "OMS instance": "OMS instance", "On rejecting this item, will be sent an email with alternate fulfillment options and this order item will be removed from your dashboard.": "On rejecting this item, { customerName } will be sent an email with alternate fulfillment options and this order item will be removed from your dashboard.", "On rejecting this order, will be sent an email with alternate fulfilment options and this order will be removed from your dashboard.": "On rejecting this order, { customerName } will be sent an email with alternate fulfilment options and this order will be removed from your dashboard.", + "Online ATP": "Online ATP", "Other stores inventory": "Other stores inventory", "Order": "Order", "Order delivered to": "Order delivered to { customerName }", @@ -109,6 +112,8 @@ "Orders": "Orders", "Orders Not Found": "Orders Not Found", "Order item rejection history": "Order item rejection history", + "Order reservations": "Order reservations", + "order reservtions at the store": "{ count } order reservtions at the store", "Other stores": "Other stores", "Packed": "Packed", "Packing Slip": "Packing Slip", @@ -123,6 +128,7 @@ "Product details": "Product details", "Product not found": "Product not found", "Products not found": "Products not found", + "Quantity on hands": "Quantity on hands", "Re-route Fulfillment": "Re-route Fulfillment", "Ready for pickup": "Ready for pickup", "Ready to create an app?": "Ready to create an app?", @@ -137,6 +143,7 @@ "Report an issue": "Report an issue", "Resend customer email": "Resend customer email", "Resend email": "Resend email", + "Safety stock": "Safety stock", "Search": "Search", "Search Orders": "Search Orders", "Search time zones": "Search time zones", diff --git a/src/locales/es.json b/src/locales/es.json index 800f10292..6cd4f2625 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -8,6 +8,7 @@ "Are you sure you want to change the time zone to?": "¿Estás seguro de que quieres cambiar la zona horaria a?", "Are you sure you want to update the notification preferences?": "¿Estás seguro de que deseas actualizar las preferencias de notificación?", "Arrived": "Llegó", + "Available to promise": "Available to promise", "Authenticating": "Autenticación", "Assign Pickers": "Asignar recolectores", "Browser TimeZone": "Browser TimeZone", @@ -55,6 +56,7 @@ "Instance Url": "URL de la instancia", "In store": "En tienda", "Inventory": "Inventario", + "Inventory computation": "Inventory computation", "Item has been rejected successfully.": "El artículo ha sido rechazado exitosamente.", "Language": "Idioma", "Last name": "Apellido", @@ -87,6 +89,7 @@ "OMS instance": "Instancia de OMS", "On rejecting this item, will be sent an email with alternate fulfillment options and this order item will be removed from your dashboard.": "Al rechazar este artículo, se enviará a {customerName} un correo electrónico con opciones de cumplimiento alternativas y este artículo del pedido se eliminará de su panel de control.", "On rejecting this order, will be sent an email with alternate fulfilment options and this order will be removed from your dashboard.": "Al rechazar este pedido, {customerName} recibirá un correo electrónico con opciones de cumplimiento alternativas y este pedido se eliminará de su panel.", + "Online ATP": "Online ATP", "Other stores inventory": "Inventario de otras tiendas", "Order": "Orden", "Order delivered to": "Orden entregada a {customerName}", @@ -106,6 +109,8 @@ "Orders": "Órdenes", "Orders Not Found": "Órdenes no encontradas", "Order item rejection history": "Historial de rechazo de artículos de pedido", + "Order reservations": "Order reservations", + "order reservtions at the store": "{ count } order reservtions at the store", "Other stores": "Otras tiendas", "Packed": "Empacado", "Packing Slip": "Remisión de embalaje", @@ -120,6 +125,7 @@ "Product details": "Detalles del producto", "Product not found": "Producto no encontrado", "Products not found": "Productos no encontrados", + "Quantity on hands": "Quantity on hands", "Re-route Fulfillment": "Redireccionar cumplimiento", "Ready for pickup": "Listo para recoger", "Ready to create an app?": "¿Listo para crear una aplicación?", @@ -134,6 +140,7 @@ "Report an issue": "Reportar un problema", "Resend customer email": "Reenviar correo electrónico al cliente", "Resend email": "Reenviar correo electrónico", + "Safety stock": "Safety stock", "Search": "Buscar", "Search Orders": "Buscar pedidos", "Search time zones": "Buscar zonas horarias", diff --git a/src/locales/ja.json b/src/locales/ja.json index ece3ff094..d827485a6 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -8,6 +8,7 @@ "Are you sure you want to change the time zone to?": "タイムゾーンを変更してもよろしいですか？", "Are you sure you want to update the notification preferences?": "Are you sure you want to update the notification preferences?", "Arrived": "到着", + "Available to promise": "Available to promise", "Authenticating": "Authenticating", "Assign Pickers": "受け取り人の割当", "Browser TimeZone": "Browser TimeZone", @@ -55,6 +56,7 @@ "Instance Url": "インスタンスURL", "In store": "店頭", "Inventory": "在庫", + "Inventory computation": "Inventory computation", "Item has been rejected successfully.": "Item has been rejected successfully.", "Language": "言語", "Last name": "姓", @@ -87,6 +89,7 @@ "OMS instance": "OMSインスタンス", "On rejecting this item, will be sent an email with alternate fulfillment options and this order item will be removed from your dashboard.": "On rejecting this item, { customerName } will be sent an email with alternate fulfillment options and this order item will be removed from your dashboard.", "On rejecting this order, will be sent an email with alternate fulfilment options and this order will be removed from your dashboard.": "On rejecting this order, { customerName } will be sent an email with alternate fulfilment options and this order will be removed from your dashboard.", + "Online ATP": "Online ATP", "Other stores inventory": "その他店舗在庫", "Order": "注文", "Order delivered to": "注文は { customerName }様 に配達されました", @@ -106,6 +109,8 @@ "Orders": "注文", "Orders Not Found": "注文が見つかりません", "Order item rejection history": "Order item rejection history", + "Order reservations": "Order reservations", + "order reservtions at the store": "{ count } order reservtions at the store", "Other stores": "Other stores", "Packed": "梱包済み", "Packing Slip": "納品書", @@ -120,6 +125,7 @@ "Product details": "商品詳細", "Product not found": "商品が見つかりません", "Products not found": "商品が見つかりません", + "Quantity on hands": "Quantity on hands", "Re-route Fulfillment": "リルート（受取方法や受取場所の変更）", "Ready for pickup": "ピックアップの準備ができました", "Ready to create an app?": "アプリを作成する準備はできましたか?", @@ -134,6 +140,7 @@ "Report an issue": "Report an issue", "Resend customer email": "Resend customer email", "Resend email": "Resend email", + "Safety stock": "Safety stock", "Search": "検索", "Search Orders": "注文の検索", "Search time zones": "タイムゾーンの検索", diff --git a/src/views/ProductDetail.vue b/src/views/ProductDetail.vue index 24870c04c..da4eb833f 100644 --- a/src/views/ProductDetail.vue +++ b/src/views/ProductDetail.vue @@ -59,30 +59,30 @@ - Quantity on hand + {{ translate("Quantity on hands")}} 10 - Safety Stock + {{ translate("Safety stock")}} 10 - Order Reservation + {{ translate("Order reservations")}} 20 - Available to promise + {{ translate("Available to promise")}} 70 - Other Stores + {{ translate("Other stores")}} 100 ATP - Warehouse + {{ translate("Warehouse")}} 100 ATP @@ -91,7 +91,7 @@
-

{count} order reservtion at the store

+

{{ translate({ },"order reservtions at the store")}}