Skip to content

ENG-613 Add expiry date to supply delivery table #16479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Copilot wants to merge 6 commits into
base: develop
Choose a base branch
from
+11 −2
Open

ENG-613 Add expiry date to supply delivery table #16479

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5199d33
Initial plan
Copilot Jun 25, 2026
b39df8d
fix: show expiry date in purchase delivery table
Copilot Jun 25, 2026
1069a54
fix: refine purchase delivery expiry rendering
Copilot Jun 25, 2026
e35e92b
fix: simplify expiry date rendering
Copilot Jun 25, 2026
1fc991d
fix: remove redundant delivery fallbacks
Copilot Jun 25, 2026
f6e8cbd
fix: always show delivery expiry
Copilot Jun 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ export function SupplyDeliveryTable({
<TableHead rowSpan={2}>{t("#")}</TableHead>
<TableHead rowSpan={2}>{t("item")}</TableHead>
<TableHead rowSpan={2}>{t("batch")}</TableHead>
{!internal && <TableHead rowSpan={2}>{t("expiry")}</TableHead>}
Comment thread
Jacobjeevan marked this conversation as resolved.
Outdated
<TableHead rowSpan={2}>{t("requested_qty")}</TableHead>
{!internal && <TableHead rowSpan={2}>{t("pack_size")}</TableHead>}
{!internal && <TableHead rowSpan={2}>{t("pack_qty")}</TableHead>}
Expand Down Expand Up @@ -278,9 +279,25 @@ export function SupplyDeliveryTable({
})()}
</TableCell>
<TableCell>
{delivery.supplied_inventory_item?.product?.batch?.lot_number ||
{delivery.supplied_inventory_item?.product?.batch?.lot_number ??
delivery.supplied_item?.batch?.lot_number ??
Comment thread
Jacobjeevan marked this conversation as resolved.
Outdated
"-"}
</TableCell>
{!internal && (
Comment thread
Jacobjeevan marked this conversation as resolved.
Outdated
<TableCell>
{(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",
)
: "-"}
</TableCell>
)}
<TableCell>
{delivery.supply_request
? round(delivery.supply_request.quantity)
Expand Down