From 5199d332aee9587f447824efa3ca639d4fc07584 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 25 Jun 2026 06:16:15 +0000 Subject: [PATCH 1/6] Initial plan From b39df8df269ccf65f9e0ce93209062040cddbf93 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 25 Jun 2026 06:25:36 +0000 Subject: [PATCH 2/6] fix: show expiry date in purchase delivery table Co-authored-by: Jacobjeevan <40040905+Jacobjeevan@users.noreply.github.com> --- .../inventory/SupplyDeliveryTable.tsx | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx b/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx index bc4e9dfa462..a7538031ddc 100644 --- a/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx +++ b/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx @@ -185,6 +185,7 @@ export function SupplyDeliveryTable({ {t("#")} {t("item")} {t("batch")} + {!internal && {t("expiry")}} {t("requested_qty")} {!internal && {t("pack_size")}} {!internal && {t("pack_qty")}} @@ -278,9 +279,25 @@ export function SupplyDeliveryTable({ })()} - {delivery.supplied_inventory_item?.product?.batch?.lot_number || + {delivery.supplied_inventory_item?.product?.batch?.lot_number ?? + delivery.supplied_item?.batch?.lot_number ?? "-"} + {!internal && ( + + {(delivery.supplied_inventory_item?.product?.expiration_date ?? + delivery.supplied_item?.expiration_date) + ? formatDate( + new Date( + delivery.supplied_inventory_item?.product + ?.expiration_date ?? + delivery.supplied_item?.expiration_date!, + ), + "dd/MM/yyyy", + ) + : "-"} + + )} {delivery.supply_request ? round(delivery.supply_request.quantity) From 1069a54f4b0c6a267d56aea43f56bfed26a30484 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 25 Jun 2026 06:28:48 +0000 Subject: [PATCH 3/6] fix: refine purchase delivery expiry rendering Co-authored-by: Jacobjeevan <40040905+Jacobjeevan@users.noreply.github.com> --- .../inventory/SupplyDeliveryTable.tsx | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx b/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx index a7538031ddc..4366bdf7d29 100644 --- a/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx +++ b/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx @@ -279,23 +279,21 @@ export function SupplyDeliveryTable({ })()} - {delivery.supplied_inventory_item?.product?.batch?.lot_number ?? - delivery.supplied_item?.batch?.lot_number ?? + {delivery.supplied_inventory_item?.product?.batch?.lot_number || + delivery.supplied_item?.batch?.lot_number || "-"} {!internal && ( - {(delivery.supplied_inventory_item?.product?.expiration_date ?? - delivery.supplied_item?.expiration_date) - ? formatDate( - new Date( - delivery.supplied_inventory_item?.product - ?.expiration_date ?? - delivery.supplied_item?.expiration_date!, - ), - "dd/MM/yyyy", - ) - : "-"} + {(() => { + const expiryDate = + delivery.supplied_inventory_item?.product?.expiration_date ?? + delivery.supplied_item?.expiration_date; + + return expiryDate + ? formatDate(new Date(expiryDate), "dd/MM/yyyy") + : "-"; + })()} )} From e35e92ba3ccc6ebc7648e1eb343a5e4430744ab7 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 25 Jun 2026 06:31:26 +0000 Subject: [PATCH 4/6] fix: simplify expiry date rendering Co-authored-by: Jacobjeevan <40040905+Jacobjeevan@users.noreply.github.com> --- .../services/inventory/SupplyDeliveryTable.tsx | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx b/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx index 4366bdf7d29..ea5b3a219b5 100644 --- a/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx +++ b/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx @@ -165,6 +165,10 @@ export function SupplyDeliveryTable({ return map; }, [deliveries]); + const formatExpiryDate = (expiryDate?: string) => { + return expiryDate ? formatDate(new Date(expiryDate), "dd/MM/yyyy") : "-"; + }; + return ( @@ -285,15 +289,10 @@ export function SupplyDeliveryTable({ {!internal && ( - {(() => { - const expiryDate = - delivery.supplied_inventory_item?.product?.expiration_date ?? - delivery.supplied_item?.expiration_date; - - return expiryDate - ? formatDate(new Date(expiryDate), "dd/MM/yyyy") - : "-"; - })()} + {formatExpiryDate( + delivery.supplied_inventory_item?.product?.expiration_date ?? + delivery.supplied_item?.expiration_date, + )} )} From 1fc991dc796e24c477f8252994301329c4ef87fb Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 25 Jun 2026 09:38:37 +0000 Subject: [PATCH 5/6] fix: remove redundant delivery fallbacks Co-authored-by: Jacobjeevan <40040905+Jacobjeevan@users.noreply.github.com> --- .../Facility/services/inventory/SupplyDeliveryTable.tsx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx b/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx index ea5b3a219b5..2d284fd9bd7 100644 --- a/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx +++ b/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx @@ -283,15 +283,12 @@ export function SupplyDeliveryTable({ })()} - {delivery.supplied_inventory_item?.product?.batch?.lot_number || - delivery.supplied_item?.batch?.lot_number || - "-"} + {delivery.supplied_inventory_item?.product?.batch?.lot_number || "-"} {!internal && ( {formatExpiryDate( - delivery.supplied_inventory_item?.product?.expiration_date ?? - delivery.supplied_item?.expiration_date, + delivery.supplied_inventory_item?.product?.expiration_date, )} )} From f6e8cbd7138429523bf75727d0b3786643f1e9ef Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 25 Jun 2026 12:06:28 +0000 Subject: [PATCH 6/6] fix: always show delivery expiry Co-authored-by: Jacobjeevan <40040905+Jacobjeevan@users.noreply.github.com> --- .../services/inventory/SupplyDeliveryTable.tsx | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx b/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx index 2d284fd9bd7..f26a8b55f22 100644 --- a/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx +++ b/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx @@ -189,7 +189,7 @@ export function SupplyDeliveryTable({ {t("#")} {t("item")} {t("batch")} - {!internal && {t("expiry")}} + {t("expiry")} {t("requested_qty")} {!internal && {t("pack_size")}} {!internal && {t("pack_qty")}} @@ -285,13 +285,11 @@ export function SupplyDeliveryTable({ {delivery.supplied_inventory_item?.product?.batch?.lot_number || "-"} - {!internal && ( - - {formatExpiryDate( - delivery.supplied_inventory_item?.product?.expiration_date, - )} - - )} + + {formatExpiryDate( + delivery.supplied_inventory_item?.product?.expiration_date, + )} + {delivery.supply_request ? round(delivery.supply_request.quantity)