From e5182d5aac7160152b8ccf9fcd3a556e95106554 Mon Sep 17 00:00:00 2001
From: Muhammed Navas <navaspavil@gmail.com>
Date: Thu, 9 Jul 2026 13:08:32 +0530
Subject: [PATCH 01/23] fix: Overlapping buttons

---
 src/components/Common/ResourceDefinitionCategoryPicker.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/Common/ResourceDefinitionCategoryPicker.tsx b/src/components/Common/ResourceDefinitionCategoryPicker.tsx
index 2bc5a17e050..92a91510571 100644
--- a/src/components/Common/ResourceDefinitionCategoryPicker.tsx
+++ b/src/components/Common/ResourceDefinitionCategoryPicker.tsx
@@ -929,6 +929,7 @@ export function ResourceDefinitionCategoryPicker<T>({
                   "hover:bg-gray-50 hover:text-gray-900",
                   "transition-all duration-200",
                   disabled && "opacity-50 cursor-not-allowed",
+                  value && !shouldHideClearButton && "rounded-r-none",
                   className,
                 )}
                 disabled={disabled}
@@ -960,7 +961,7 @@ export function ResourceDefinitionCategoryPicker<T>({
               <Button
                 variant="outline"
                 onClick={handleClearSelection}
-                className="rounded-l-none -ml-2 shadow-none text-gray-400 border-gray-300"
+                className="rounded-l-none shadow-none text-gray-400 border-gray-300 border-l-0 h-[38px]"
               >
                 <X />
                 <span className="sr-only">{t("clear_selection")}</span>

From db46f8c136dba2872f5f2ce3475e965b54e959b3 Mon Sep 17 00:00:00 2001
From: Muhammed Navas <navaspavil@gmail.com>
Date: Thu, 9 Jul 2026 13:12:21 +0530
Subject: [PATCH 02/23] feat: implement drawer for displaying all supply
 deliveries when an inventory item is clicked

---
 .../services/inventory/InventoryList.tsx      | 114 +++++++++++++++++-
 1 file changed, 110 insertions(+), 4 deletions(-)

diff --git a/src/pages/Facility/services/inventory/InventoryList.tsx b/src/pages/Facility/services/inventory/InventoryList.tsx
index 96e649e7b23..47b3718e37c 100644
--- a/src/pages/Facility/services/inventory/InventoryList.tsx
+++ b/src/pages/Facility/services/inventory/InventoryList.tsx
@@ -1,5 +1,5 @@
 import { useQuery } from "@tanstack/react-query";
-import { ArrowDownUp } from "lucide-react";
+import { ArrowDownUp, Truck } from "lucide-react";
 import { Link } from "raviger";
 import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -26,6 +26,12 @@ import useFilters from "@/hooks/useFilters";
 
 import { isLessThan, round } from "@/Utils/decimal";
 import query from "@/Utils/request/query";
+import {
+  Drawer,
+  DrawerContent,
+  DrawerHeader,
+  DrawerTitle,
+} from "@/components/ui/drawer";
 import { FilterSelect } from "@/components/ui/filter-select";
 import { MonetaryDisplay } from "@/components/ui/monetary-display";
 import { MonetaryComponentType } from "@/types/base/monetaryComponent/monetaryComponent";
@@ -33,7 +39,9 @@ import { ACCOUNT_STATUS_COLORS } from "@/types/billing/account/Account";
 import { InventoryStatusOptions } from "@/types/inventory/product/inventory";
 import inventoryApi from "@/types/inventory/product/inventoryApi";
 import { ProductKnowledgeBase } from "@/types/inventory/productKnowledge/productKnowledge";
+import supplyDeliveryApi from "@/types/inventory/supplyDelivery/supplyDeliveryApi";
 import { ProductKnowledgeSelect } from "./ProductKnowledgeSelect";
+import { SupplyDeliveryTable } from "./SupplyDeliveryTable";
 
 const SORT_OPTIONS = {
   low_to_high: "net_content",
@@ -42,6 +50,57 @@ const SORT_OPTIONS = {
 
 type SortOptionKey = keyof typeof SORT_OPTIONS;
 
+interface ProductDeliveriesDrawerContentProps {
+  facilityId: string;
+  locationId: string;
+  selectedProductKnowledge?: ProductKnowledgeBase;
+}
+
+function ProductDeliveriesDrawerContent({
+  facilityId,
+  locationId,
+  selectedProductKnowledge,
+}: ProductDeliveriesDrawerContentProps) {
+  const { t } = useTranslation();
+
+  const { data: deliveries, isLoading } = useQuery({
+    queryKey: [
+      "productDeliveries",
+      facilityId,
+      locationId,
+      selectedProductKnowledge?.id,
+    ],
+    queryFn: query.paginated(supplyDeliveryApi.listSupplyDelivery, {
+      queryParams: {
+        facility: facilityId,
+        destination: locationId,
+        supplied_inventory_item_product_knowledge: selectedProductKnowledge?.id,
+      },
+    }),
+  });
+
+  return (
+    <div className="space-y-4 overflow-y-auto pt-4 max-h-[68vh]">
+      {isLoading ? (
+        <TableSkeleton count={2} />
+      ) : deliveries?.results && deliveries.results.length > 0 ? (
+        <SupplyDeliveryTable
+          deliveries={deliveries.results}
+          internal
+          facilityId={facilityId}
+          linkToProduct
+        />
+      ) : (
+        <EmptyState
+          icon={<Truck className="size-5 text-primary-600" />}
+          title={t("no_deliveries_found")}
+          description={t("no_deliveries_found_description")}
+        />
+      )}
+    </div>
+  );
+}
+
 interface InventoryListProps {
   facilityId: string;
   locationId: string;
@@ -58,6 +117,11 @@ export function InventoryList({ facilityId, locationId }: InventoryListProps) {
     ProductKnowledgeBase | undefined
   >(undefined);
 
+  // State for the "all deliveries" drawer
+  const [showAllDeliveries, setShowAllDeliveries] = useState(false);
+  const [selectedProductKnowledgeDrawer, setSelectedProductKnowledgeDrawer] =
+    useState<ProductKnowledgeBase | undefined>(undefined);
+
   // Clear selected product knowledge when query parameter is cleared
   useEffect(() => {
     if (!qParams.product_knowledge_id) {
@@ -163,16 +227,25 @@ export function InventoryList({ facilityId, locationId }: InventoryListProps) {
             <TableBody>
               {data?.results?.map((inventory) => (
                 <TableRow key={inventory.id}>
-                  <TableCell className="font-semibold">
+                  <TableCell
+                    onClick={() => {
+                      setSelectedProductKnowledgeDrawer(
+                        inventory.product.product_knowledge,
+                      );
+                      setShowAllDeliveries(true);
+                    }}
+                    className="font-semibold flex gap-2 cursor-pointer"
+                  >
+                    {inventory.product.product_knowledge.name}
                     <Link
                       href={`/facility/${facilityId}/settings/product/${inventory.product.id}`}
                       basePath="/"
                       className="flex items-center gap-2"
+                      onClick={(e) => e.stopPropagation()}
                     >
-                      {inventory.product.product_knowledge.name}
                       <CareIcon
                         icon="l-external-link-alt"
-                        className="size-4 text-gray-500"
+                        className="size-4 text-gray-500 hover:text-gray-700"
                       />
                     </Link>
                   </TableCell>
@@ -226,6 +299,39 @@ export function InventoryList({ facilityId, locationId }: InventoryListProps) {
       <div className="mt-8 flex justify-center">
         <Pagination totalCount={data?.count || 0} />
       </div>
+
+      <Drawer
+        open={showAllDeliveries}
+        onOpenChange={(open) => {
+          setShowAllDeliveries(open);
+          if (!open) {
+            setTimeout(() => {
+              setSelectedProductKnowledgeDrawer(undefined);
+            }, 100);
+          }
+        }}
+      >
+        <DrawerContent className="max-w-7xl mx-auto px-4 sm:px-16 pb-10">
+          <DrawerHeader>
+            <DrawerTitle>{t("all_deliveries")}</DrawerTitle>
+          </DrawerHeader>
+          <ProductKnowledgeSelect
+            value={selectedProductKnowledgeDrawer}
+            onChange={(value) => {
+              setSelectedProductKnowledgeDrawer(value);
+            }}
+            placeholder={t("filter_by_product")}
+            disableFavorites
+            alignContent="end"
+            className="max-w-min min-w-fit ml-auto"
+          />
+          <ProductDeliveriesDrawerContent
+            facilityId={facilityId}
+            locationId={locationId}
+            selectedProductKnowledge={selectedProductKnowledgeDrawer}
+          />
+        </DrawerContent>
+      </Drawer>
     </Page>
   );
 }

From b1084ff9db8b6130f4ccf27c5ec074bf3be3ae12 Mon Sep 17 00:00:00 2001
From: Muhammed Navas <navaspavil@gmail.com>
Date: Thu, 9 Jul 2026 16:25:49 +0530
Subject: [PATCH 03/23] Remove filter and update button

---
 .../services/inventory/InventoryList.tsx      | 52 ++++++++-----------
 1 file changed, 22 insertions(+), 30 deletions(-)

diff --git a/src/pages/Facility/services/inventory/InventoryList.tsx b/src/pages/Facility/services/inventory/InventoryList.tsx
index 47b3718e37c..f84e41e4975 100644
--- a/src/pages/Facility/services/inventory/InventoryList.tsx
+++ b/src/pages/Facility/services/inventory/InventoryList.tsx
@@ -227,27 +227,29 @@ export function InventoryList({ facilityId, locationId }: InventoryListProps) {
             <TableBody>
               {data?.results?.map((inventory) => (
                 <TableRow key={inventory.id}>
-                  <TableCell
-                    onClick={() => {
-                      setSelectedProductKnowledgeDrawer(
-                        inventory.product.product_knowledge,
-                      );
-                      setShowAllDeliveries(true);
-                    }}
-                    className="font-semibold flex gap-2 cursor-pointer"
-                  >
-                    {inventory.product.product_knowledge.name}
-                    <Link
-                      href={`/facility/${facilityId}/settings/product/${inventory.product.id}`}
-                      basePath="/"
-                      className="flex items-center gap-2"
-                      onClick={(e) => e.stopPropagation()}
+                  <TableCell className="font-semibold">
+                    <button
+                      onClick={() => {
+                        setSelectedProductKnowledgeDrawer(
+                          inventory.product.product_knowledge,
+                        );
+                        setShowAllDeliveries(true);
+                      }}
+                      className="w-full flex items-center gap-2 underline"
                     >
-                      <CareIcon
-                        icon="l-external-link-alt"
-                        className="size-4 text-gray-500 hover:text-gray-700"
-                      />
-                    </Link>
+                      {inventory.product.product_knowledge.name}
+                      <Link
+                        href={`/facility/${facilityId}/settings/product/${inventory.product.id}`}
+                        basePath="/"
+                        className="flex items-center gap-2"
+                        onClick={(e) => e.stopPropagation()}
+                      >
+                        <CareIcon
+                          icon="l-external-link-alt"
+                          className="size-4 text-gray-500 hover:text-gray-700"
+                        />
+                      </Link>
+                    </button>
                   </TableCell>
                   <TableCell
                     className={cn(
@@ -315,16 +317,6 @@ export function InventoryList({ facilityId, locationId }: InventoryListProps) {
           <DrawerHeader>
             <DrawerTitle>{t("all_deliveries")}</DrawerTitle>
           </DrawerHeader>
-          <ProductKnowledgeSelect
-            value={selectedProductKnowledgeDrawer}
-            onChange={(value) => {
-              setSelectedProductKnowledgeDrawer(value);
-            }}
-            placeholder={t("filter_by_product")}
-            disableFavorites
-            alignContent="end"
-            className="max-w-min min-w-fit ml-auto"
-          />
           <ProductDeliveriesDrawerContent
             facilityId={facilityId}
             locationId={locationId}

From 58197a99b414a474121886b9c4b59149469d3e32 Mon Sep 17 00:00:00 2001
From: Muhammed Navas <navaspavil@gmail.com>
Date: Thu, 9 Jul 2026 17:01:16 +0530
Subject: [PATCH 04/23] fix: update query key for supply deliveries and
 simplify drawer open state management

---
 .../services/inventory/InventoryList.tsx         | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/pages/Facility/services/inventory/InventoryList.tsx b/src/pages/Facility/services/inventory/InventoryList.tsx
index f84e41e4975..80300a107f7 100644
--- a/src/pages/Facility/services/inventory/InventoryList.tsx
+++ b/src/pages/Facility/services/inventory/InventoryList.tsx
@@ -65,7 +65,7 @@ function ProductDeliveriesDrawerContent({
 
   const { data: deliveries, isLoading } = useQuery({
     queryKey: [
-      "productDeliveries",
+      "supplyDeliveries",
       facilityId,
       locationId,
       selectedProductKnowledge?.id,
@@ -77,6 +77,7 @@ function ProductDeliveriesDrawerContent({
         supplied_inventory_item_product_knowledge: selectedProductKnowledge?.id,
       },
     }),
+    enabled: !!selectedProductKnowledge?.id,
   });
 
   return (
@@ -86,7 +87,6 @@ function ProductDeliveriesDrawerContent({
       ) : deliveries?.results && deliveries.results.length > 0 ? (
         <SupplyDeliveryTable
           deliveries={deliveries.results}
-          internal
           facilityId={facilityId}
           linkToProduct
         />
@@ -302,17 +302,7 @@ export function InventoryList({ facilityId, locationId }: InventoryListProps) {
         <Pagination totalCount={data?.count || 0} />
       </div>
 
-      <Drawer
-        open={showAllDeliveries}
-        onOpenChange={(open) => {
-          setShowAllDeliveries(open);
-          if (!open) {
-            setTimeout(() => {
-              setSelectedProductKnowledgeDrawer(undefined);
-            }, 100);
-          }
-        }}
-      >
+      <Drawer open={showAllDeliveries} onOpenChange={setShowAllDeliveries}>
         <DrawerContent className="max-w-7xl mx-auto px-4 sm:px-16 pb-10">
           <DrawerHeader>
             <DrawerTitle>{t("all_deliveries")}</DrawerTitle>

From 9bda0670116ce210509b4e7d66d91f0d6581a62f Mon Sep 17 00:00:00 2001
From: Muhammed Navas <navaspavil@gmail.com>
Date: Thu, 9 Jul 2026 17:05:35 +0530
Subject: [PATCH 05/23] fix: add button type attribute to clear selection
 button in ResourceDefinitionCategoryPicker

---
 src/components/Common/ResourceDefinitionCategoryPicker.tsx | 3 ++-
 src/pages/Facility/services/inventory/InventoryList.tsx    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/Common/ResourceDefinitionCategoryPicker.tsx b/src/components/Common/ResourceDefinitionCategoryPicker.tsx
index 92a91510571..c012c715d49 100644
--- a/src/components/Common/ResourceDefinitionCategoryPicker.tsx
+++ b/src/components/Common/ResourceDefinitionCategoryPicker.tsx
@@ -960,8 +960,9 @@ export function ResourceDefinitionCategoryPicker<T>({
             {value && !shouldHideClearButton && (
               <Button
                 variant="outline"
+                type="button"
                 onClick={handleClearSelection}
-                className="rounded-l-none shadow-none text-gray-400 border-gray-300 border-l-0 h-[38px]"
+                className="rounded-l-none shadow-none text-gray-400 border-gray-300 border-l-0 h-9.5"
               >
                 <X />
                 <span className="sr-only">{t("clear_selection")}</span>
diff --git a/src/pages/Facility/services/inventory/InventoryList.tsx b/src/pages/Facility/services/inventory/InventoryList.tsx
index 80300a107f7..bc7d96593b6 100644
--- a/src/pages/Facility/services/inventory/InventoryList.tsx
+++ b/src/pages/Facility/services/inventory/InventoryList.tsx
@@ -305,7 +305,7 @@ export function InventoryList({ facilityId, locationId }: InventoryListProps) {
       <Drawer open={showAllDeliveries} onOpenChange={setShowAllDeliveries}>
         <DrawerContent className="max-w-7xl mx-auto px-4 sm:px-16 pb-10">
           <DrawerHeader>
-            <DrawerTitle>{t("all_deliveries")}</DrawerTitle>
+            <DrawerTitle className="mb-2">{t("all_deliveries")}</DrawerTitle>
           </DrawerHeader>
           <ProductDeliveriesDrawerContent
             facilityId={facilityId}

From 641f3c041745af8702176701424f6bf70726092a Mon Sep 17 00:00:00 2001
From: Muhammed Navas <navaspavil@gmail.com>
Date: Thu, 9 Jul 2026 17:07:07 +0530
Subject: [PATCH 06/23] fix: adjust button styling and clear selection behavior
 in ResourceDefinitionCategoryPicker for mobile

---
 src/components/Common/ResourceDefinitionCategoryPicker.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/Common/ResourceDefinitionCategoryPicker.tsx b/src/components/Common/ResourceDefinitionCategoryPicker.tsx
index c012c715d49..169361d6f12 100644
--- a/src/components/Common/ResourceDefinitionCategoryPicker.tsx
+++ b/src/components/Common/ResourceDefinitionCategoryPicker.tsx
@@ -811,6 +811,7 @@ export function ResourceDefinitionCategoryPicker<T>({
                 className={cn(
                   "justify-between px-3 py-2 w-full shadow-xs border border-gray-300 font-medium h-auto min-h-9",
                   disabled && "opacity-50 cursor-not-allowed",
+                  value && !shouldHideClearButton && "rounded-r-none",
                   className,
                 )}
                 disabled={disabled}
@@ -830,7 +831,7 @@ export function ResourceDefinitionCategoryPicker<T>({
               <Button
                 variant="outline"
                 onClick={handleClearSelection}
-                className="rounded-l-none -ml-2 shadow-none text-gray-400 border-gray-300"
+                className="rounded-l-none shadow-none text-gray-400 border-gray-300 border-l-0 h-9.5"
               >
                 <X />
                 <span className="sr-only">{t("clear_selection")}</span>

From 628a6a8a9aae58014b837fbf74c4215b09220029 Mon Sep 17 00:00:00 2001
From: Muhammed Navas <navaspavil@gmail.com>
Date: Thu, 9 Jul 2026 17:39:46 +0530
Subject: [PATCH 07/23] feat: add accessibility label for product details link
 in InventoryList

---
 public/locale/en.json                                   | 1 +
 src/pages/Facility/services/inventory/InventoryList.tsx | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/public/locale/en.json b/public/locale/en.json
index 81d56c5b099..504c1ec0077 100644
--- a/public/locale/en.json
+++ b/public/locale/en.json
@@ -6580,6 +6580,7 @@
   "view_patients": "View Patients",
   "view_payments": "View Payments",
   "view_prescriptions": "View Prescriptions",
+  "view_product_details": "View product details",
   "view_profile": "View Profile",
   "view_real_time_bed_status": "View real-time bed status across all wards",
   "view_report": "View Report",
diff --git a/src/pages/Facility/services/inventory/InventoryList.tsx b/src/pages/Facility/services/inventory/InventoryList.tsx
index bc7d96593b6..609ab662039 100644
--- a/src/pages/Facility/services/inventory/InventoryList.tsx
+++ b/src/pages/Facility/services/inventory/InventoryList.tsx
@@ -248,6 +248,9 @@ export function InventoryList({ facilityId, locationId }: InventoryListProps) {
                           icon="l-external-link-alt"
                           className="size-4 text-gray-500 hover:text-gray-700"
                         />
+                        <span className="sr-only">
+                          {t("view_product_details")}
+                        </span>
                       </Link>
                     </button>
                   </TableCell>

From 5d4b65dc84ed04d1ce64fbc241811d22be0d6dd1 Mon Sep 17 00:00:00 2001
From: Muhammed Navas <navaspavil@gmail.com>
Date: Thu, 9 Jul 2026 18:05:26 +0530
Subject: [PATCH 08/23] fix: add button type attribute to clear selection
 button in ResourceDefinitionCategoryPicker

---
 src/components/Common/ResourceDefinitionCategoryPicker.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/Common/ResourceDefinitionCategoryPicker.tsx b/src/components/Common/ResourceDefinitionCategoryPicker.tsx
index 169361d6f12..d77e4ba8a0d 100644
--- a/src/components/Common/ResourceDefinitionCategoryPicker.tsx
+++ b/src/components/Common/ResourceDefinitionCategoryPicker.tsx
@@ -830,6 +830,7 @@ export function ResourceDefinitionCategoryPicker<T>({
             {value && !shouldHideClearButton && (
               <Button
                 variant="outline"
+                type="button"
                 onClick={handleClearSelection}
                 className="rounded-l-none shadow-none text-gray-400 border-gray-300 border-l-0 h-9.5"
               >

From 826b694a13b405481471d7d2580f6902ca941b8e Mon Sep 17 00:00:00 2001
From: Muhammed Navas <navaspavil@gmail.com>
Date: Thu, 9 Jul 2026 18:09:12 +0530
Subject: [PATCH 09/23] fix: reset selected product knowledge when closing
 deliveries drawer

---
 src/pages/Facility/services/inventory/InventoryList.tsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/pages/Facility/services/inventory/InventoryList.tsx b/src/pages/Facility/services/inventory/InventoryList.tsx
index 609ab662039..4755d66d584 100644
--- a/src/pages/Facility/services/inventory/InventoryList.tsx
+++ b/src/pages/Facility/services/inventory/InventoryList.tsx
@@ -229,6 +229,7 @@ export function InventoryList({ facilityId, locationId }: InventoryListProps) {
                 <TableRow key={inventory.id}>
                   <TableCell className="font-semibold">
                     <button
+                      type="button"
                       onClick={() => {
                         setSelectedProductKnowledgeDrawer(
                           inventory.product.product_knowledge,
@@ -305,7 +306,13 @@ export function InventoryList({ facilityId, locationId }: InventoryListProps) {
         <Pagination totalCount={data?.count || 0} />
       </div>
 
-      <Drawer open={showAllDeliveries} onOpenChange={setShowAllDeliveries}>
+      <Drawer
+        open={showAllDeliveries}
+        onOpenChange={(open) => {
+          setShowAllDeliveries(open);
+          if (!open) setSelectedProductKnowledgeDrawer(undefined);
+        }}
+      >
         <DrawerContent className="max-w-7xl mx-auto px-4 sm:px-16 pb-10">
           <DrawerHeader>
             <DrawerTitle className="mb-2">{t("all_deliveries")}</DrawerTitle>

From 1cbc144d8e0d233c9671afa428544978a04ba05c Mon Sep 17 00:00:00 2001
From: Muhammed Navas <navaspavil@gmail.com>
Date: Thu, 9 Jul 2026 18:16:44 +0530
Subject: [PATCH 10/23] fix: update button styling and link behavior in
 InventoryList for better accessibility

---
 .../services/inventory/InventoryList.tsx      | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/pages/Facility/services/inventory/InventoryList.tsx b/src/pages/Facility/services/inventory/InventoryList.tsx
index 4755d66d584..5cbc7e2044f 100644
--- a/src/pages/Facility/services/inventory/InventoryList.tsx
+++ b/src/pages/Facility/services/inventory/InventoryList.tsx
@@ -227,7 +227,7 @@ export function InventoryList({ facilityId, locationId }: InventoryListProps) {
             <TableBody>
               {data?.results?.map((inventory) => (
                 <TableRow key={inventory.id}>
-                  <TableCell className="font-semibold">
+                  <TableCell className="font-semibold flex items-center gap-2 underline">
                     <button
                       type="button"
                       onClick={() => {
@@ -236,24 +236,22 @@ export function InventoryList({ facilityId, locationId }: InventoryListProps) {
                         );
                         setShowAllDeliveries(true);
                       }}
-                      className="w-full flex items-center gap-2 underline"
                     >
                       {inventory.product.product_knowledge.name}
-                      <Link
-                        href={`/facility/${facilityId}/settings/product/${inventory.product.id}`}
-                        basePath="/"
-                        className="flex items-center gap-2"
-                        onClick={(e) => e.stopPropagation()}
-                      >
-                        <CareIcon
-                          icon="l-external-link-alt"
-                          className="size-4 text-gray-500 hover:text-gray-700"
-                        />
-                        <span className="sr-only">
-                          {t("view_product_details")}
-                        </span>
-                      </Link>
                     </button>
+                    <Link
+                      href={`/facility/${facilityId}/settings/product/${inventory.product.id}`}
+                      basePath="/"
+                      onClick={(e) => e.stopPropagation()}
+                    >
+                      <CareIcon
+                        icon="l-external-link-alt"
+                        className="size-4 text-gray-500 hover:text-gray-700"
+                      />
+                      <span className="sr-only">
+                        {t("view_product_details")}
+                      </span>
+                    </Link>
                   </TableCell>
                   <TableCell
                     className={cn(

From 913e41ef22b99d0908799dde2af9e4c5eee584c2 Mon Sep 17 00:00:00 2001
From: Muhammed Navas <navaspavil@gmail.com>
Date: Thu, 9 Jul 2026 18:28:08 +0530
Subject: [PATCH 11/23] fix: add hover effect to product knowledge selection
 button in InventoryList

---
 src/pages/Facility/services/inventory/InventoryList.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Facility/services/inventory/InventoryList.tsx b/src/pages/Facility/services/inventory/InventoryList.tsx
index 5cbc7e2044f..de9233f30b5 100644
--- a/src/pages/Facility/services/inventory/InventoryList.tsx
+++ b/src/pages/Facility/services/inventory/InventoryList.tsx
@@ -230,6 +230,7 @@ export function InventoryList({ facilityId, locationId }: InventoryListProps) {
                   <TableCell className="font-semibold flex items-center gap-2 underline">
                     <button
                       type="button"
+                      className="hover:text-gray-700"
                       onClick={() => {
                         setSelectedProductKnowledgeDrawer(
                           inventory.product.product_knowledge,

From 6af981aeafa8e8ab6ebc42cc60e226689b4cc7f3 Mon Sep 17 00:00:00 2001
From: Muhammed Navas <navaspavil@gmail.com>
Date: Thu, 9 Jul 2026 19:47:27 +0530
Subject: [PATCH 12/23] feat: add tests for All Deliveries drawer in Inventory
 Summary

---
 .../locations/inventory/allDeliveries.spec.ts | 109 ++++++++++++++++++
 1 file changed, 109 insertions(+)
 create mode 100644 tests/facility/services/locations/inventory/allDeliveries.spec.ts

diff --git a/tests/facility/services/locations/inventory/allDeliveries.spec.ts b/tests/facility/services/locations/inventory/allDeliveries.spec.ts
new file mode 100644
index 00000000000..4c8fdc441a7
--- /dev/null
+++ b/tests/facility/services/locations/inventory/allDeliveries.spec.ts
@@ -0,0 +1,109 @@
+import { expect, test } from "@playwright/test";
+import { getFacilityId } from "tests/support/facilityId";
+
+// Use the authenticated (admin) state
+test.use({ storageState: "tests/.auth/user.json" });
+
+const PRODUCT_NAME = "Paracetamol";
+
+test.describe("Inventory Summary — All Deliveries drawer", () => {
+  let pharmacyBasePath: string;
+
+  test.beforeEach(async ({ page }) => {
+    const facilityId = getFacilityId();
+
+    // Reach the seeded "Main Pharmacy" location, which the fixtures stock with
+    // products (Amoxicillin, Paracetamol, Ibuprofen, Gloves) via completed
+    // supply deliveries destined to it.
+    await page.goto(`/facility/${facilityId}/services/`);
+    await page.getByRole("link", { name: "Main Pharmacy" }).click();
+    await page.getByRole("link", { name: "Pharmacy" }).click();
+
+    const pharmacyLocationId =
+      page
+        .url()
+        .match(
+          new RegExp(
+            `/facility/${facilityId}/locations/([^/]+)/medication_requests`,
+          ),
+        )?.[1] ?? "";
+    expect(pharmacyLocationId).not.toBe("");
+    pharmacyBasePath = `/facility/${facilityId}/locations/${pharmacyLocationId}`;
+
+    await page.goto(`${pharmacyBasePath}/inventory/summary`);
+    await expect(
+      page.getByRole("heading", { name: "Inventory" }),
+    ).toBeVisible();
+  });
+
+  test("opens the drawer and lists deliveries for a stocked product", async ({
+    page,
+  }) => {
+    await test.step("Wait for the inventory row to render", async () => {
+      await expect(
+        page.getByRole("button", { name: PRODUCT_NAME }),
+      ).toBeVisible();
+    });
+
+    await test.step("Open the All Deliveries drawer and assert its API call", async () => {
+      const deliveriesResponse = page.waitForResponse(
+        (resp) =>
+          resp.url().includes("/api/v1/supply_delivery/") &&
+          resp.request().method() === "GET" &&
+          resp.url().includes("supplied_inventory_item_product_knowledge=") &&
+          resp.ok(),
+      );
+      await page.getByRole("button", { name: PRODUCT_NAME }).click();
+      await deliveriesResponse;
+    });
+
+    await test.step("Verify the deliveries table is shown in the drawer", async () => {
+      const drawer = page.locator('[data-slot="drawer-content"]');
+      await expect(drawer.getByText("All Deliveries")).toBeVisible();
+      // The delivered product renders as a link inside the deliveries table —
+      // its presence proves a delivery row was rendered (not the empty state).
+      await expect(
+        drawer.getByRole("link", { name: PRODUCT_NAME }),
+      ).toBeVisible();
+    });
+  });
+
+  test("shows the empty state in the drawer when a product has no deliveries", async ({
+    page,
+  }) => {
+    await test.step("Wait for the inventory row to render", async () => {
+      await expect(
+        page.getByRole("button", { name: PRODUCT_NAME }),
+      ).toBeVisible();
+    });
+
+    // The empty state is a defensive UI branch: every product surfaced on the
+    // summary necessarily has at least one delivery, so it is unreachable with
+    // seeded data. Stub the deliveries list as empty to exercise that branch.
+    await test.step("Stub the deliveries response as empty", async () => {
+      await page.route(
+        (url) =>
+          url.pathname === "/api/v1/supply_delivery/" &&
+          url.searchParams.has("supplied_inventory_item_product_knowledge"),
+        (route) =>
+          route.fulfill({
+            status: 200,
+            contentType: "application/json",
+            body: JSON.stringify({
+              count: 0,
+              results: [],
+              next: null,
+              previous: null,
+            }),
+          }),
+      );
+    });
+
+    await test.step("Open the drawer and verify the empty state", async () => {
+      await page.getByRole("button", { name: PRODUCT_NAME }).click();
+      const drawer = page.locator('[data-slot="drawer-content"]');
+      await expect(drawer.getByText("All Deliveries")).toBeVisible();
+      await expect(drawer.getByText("No delivery found")).toBeVisible();
+    });
+  });
+});

From 8214517f4a0a1700690a638a71212c7239f621f5 Mon Sep 17 00:00:00 2001
From: Muhammed Navas <navaspavil@gmail.com>
Date: Fri, 10 Jul 2026 19:06:35 +0530
Subject: [PATCH 13/23] feat: add pagination to deliveries table in
 ProductDeliveriesDrawerContent

---
 .../services/inventory/InventoryList.tsx      | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/pages/Facility/services/inventory/InventoryList.tsx b/src/pages/Facility/services/inventory/InventoryList.tsx
index de9233f30b5..337c6a4eb62 100644
--- a/src/pages/Facility/services/inventory/InventoryList.tsx
+++ b/src/pages/Facility/services/inventory/InventoryList.tsx
@@ -12,6 +12,7 @@ import { Badge } from "@/components/ui/badge";
 import { EmptyState } from "@/components/ui/empty-state";
 
 import Page from "@/components/Common/Page";
+import Pagination from "@/components/Common/Pagination";
 import { TableSkeleton } from "@/components/Common/SkeletonLoading";
 import {
   Table,
@@ -50,6 +51,8 @@ const SORT_OPTIONS = {
 
 type SortOptionKey = keyof typeof SORT_OPTIONS;
 
+const DELIVERIES_PER_PAGE = 10;
+
 interface ProductDeliveriesDrawerContentProps {
   facilityId: string;
   locationId: string;
@@ -62,6 +65,7 @@ function ProductDeliveriesDrawerContent({
   selectedProductKnowledge,
 }: ProductDeliveriesDrawerContentProps) {
   const { t } = useTranslation();
+  const [page, setPage] = useState(1);
 
   const { data: deliveries, isLoading } = useQuery({
     queryKey: [
@@ -69,12 +73,15 @@ function ProductDeliveriesDrawerContent({
       facilityId,
       locationId,
       selectedProductKnowledge?.id,
+      page,
     ],
-    queryFn: query.paginated(supplyDeliveryApi.listSupplyDelivery, {
+    queryFn: query(supplyDeliveryApi.listSupplyDelivery, {
       queryParams: {
         facility: facilityId,
         destination: locationId,
         supplied_inventory_item_product_knowledge: selectedProductKnowledge?.id,
+        limit: DELIVERIES_PER_PAGE,
+        offset: (page - 1) * DELIVERIES_PER_PAGE,
       },
     }),
     enabled: !!selectedProductKnowledge?.id,
@@ -85,11 +92,19 @@ function ProductDeliveriesDrawerContent({
       {isLoading ? (
         <TableSkeleton count={2} />
       ) : deliveries?.results && deliveries.results.length > 0 ? (
-        <SupplyDeliveryTable
-          deliveries={deliveries.results}
-          facilityId={facilityId}
-          linkToProduct
-        />
+        <>
+          <SupplyDeliveryTable
+            deliveries={deliveries.results}
+            facilityId={facilityId}
+            linkToProduct
+          />
+          <Pagination
+            data={{ totalCount: deliveries.count }}
+            onChange={(newPage) => setPage(newPage)}
+            defaultPerPage={DELIVERIES_PER_PAGE}
+            cPage={page}
+          />
+        </>
       ) : (
         <EmptyState
           icon={<Truck className="size-5 text-primary-600" />}

From b6fbcfaba31f3c80a6d8d0877cd41ea94c0a92b7 Mon Sep 17 00:00:00 2001
From: Muhammed Navas <navaspavil@gmail.com>
Date: Mon, 13 Jul 2026 12:05:54 +0530
Subject: [PATCH 14/23] fix: reset page number when selecting a new product
 knowledge in deliveries drawer

---
 src/pages/Facility/services/inventory/InventoryList.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pages/Facility/services/inventory/InventoryList.tsx b/src/pages/Facility/services/inventory/InventoryList.tsx
index 337c6a4eb62..154795949f0 100644
--- a/src/pages/Facility/services/inventory/InventoryList.tsx
+++ b/src/pages/Facility/services/inventory/InventoryList.tsx
@@ -67,6 +67,10 @@ function ProductDeliveriesDrawerContent({
   const { t } = useTranslation();
   const [page, setPage] = useState(1);
 
+  useEffect(() => {
+    setPage(1);
+  }, [selectedProductKnowledge?.id]);
+
   const { data: deliveries, isLoading } = useQuery({
     queryKey: [
       "supplyDeliveries",
@@ -92,7 +96,7 @@ function ProductDeliveriesDrawerContent({
       {isLoading ? (
         <TableSkeleton count={2} />
       ) : deliveries?.results && deliveries.results.length > 0 ? (
-        <>
+        <div className="flex flex-col item-center">
           <SupplyDeliveryTable
             deliveries={deliveries.results}
             facilityId={facilityId}
@@ -104,7 +108,7 @@ function ProductDeliveriesDrawerContent({
             defaultPerPage={DELIVERIES_PER_PAGE}
             cPage={page}
           />
-        </>
+        </div>
       ) : (
         <EmptyState
           icon={<Truck className="size-5 text-primary-600" />}

From 7220cb9fdcc1c64a4e47a102bc025397c1ca3d27 Mon Sep 17 00:00:00 2001
From: Muhammed Navas <navaspavil@gmail.com>
Date: Mon, 13 Jul 2026 13:25:57 +0530
Subject: [PATCH 15/23] fix: correct class name for alignment in
 SupplyDeliveryTable component

---
 src/pages/Facility/services/inventory/InventoryList.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Facility/services/inventory/InventoryList.tsx b/src/pages/Facility/services/inventory/InventoryList.tsx
index 154795949f0..03dbdf0ece6 100644
--- a/src/pages/Facility/services/inventory/InventoryList.tsx
+++ b/src/pages/Facility/services/inventory/InventoryList.tsx
@@ -96,7 +96,7 @@ function ProductDeliveriesDrawerContent({
       {isLoading ? (
         <TableSkeleton count={2} />
       ) : deliveries?.results && deliveries.results.length > 0 ? (
-        <div className="flex flex-col item-center">
+        <div className="flex flex-col items-center">
           <SupplyDeliveryTable
             deliveries={deliveries.results}
             facilityId={facilityId}

From 39b6bbda6f5ec78b8f9f54321afdde495e654e31 Mon Sep 17 00:00:00 2001
From: Muhammed Navas <navaspavil@gmail.com>
Date: Mon, 13 Jul 2026 13:34:21 +0530
Subject: [PATCH 16/23] fix: update button styling for inventory item selection
 in InventoryList

---
 src/pages/Facility/services/inventory/InventoryList.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Facility/services/inventory/InventoryList.tsx b/src/pages/Facility/services/inventory/InventoryList.tsx
index 03dbdf0ece6..363c6b85824 100644
--- a/src/pages/Facility/services/inventory/InventoryList.tsx
+++ b/src/pages/Facility/services/inventory/InventoryList.tsx
@@ -246,10 +246,10 @@ export function InventoryList({ facilityId, locationId }: InventoryListProps) {
             <TableBody>
               {data?.results?.map((inventory) => (
                 <TableRow key={inventory.id}>
-                  <TableCell className="font-semibold flex items-center gap-2 underline">
+                  <TableCell className="font-semibold space-x-2">
                     <button
                       type="button"
-                      className="hover:text-gray-700"
+                      className="hover:text-gray-700 underline"
                       onClick={() => {
                         setSelectedProductKnowledgeDrawer(
                           inventory.product.product_knowledge,

From 610fe17c6465d43487553350b3965dbab44cf815 Mon Sep 17 00:00:00 2001
From: Muhammed Navas <navaspavil@gmail.com>
Date: Mon, 13 Jul 2026 13:54:20 +0530
Subject: [PATCH 17/23] fix: rename Pagination component to PaginationComponent

---
 src/pages/Facility/services/inventory/InventoryList.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Facility/services/inventory/InventoryList.tsx b/src/pages/Facility/services/inventory/InventoryList.tsx
index 363c6b85824..8ab50b9f71f 100644
--- a/src/pages/Facility/services/inventory/InventoryList.tsx
+++ b/src/pages/Facility/services/inventory/InventoryList.tsx
@@ -12,7 +12,7 @@ import { Badge } from "@/components/ui/badge";
 import { EmptyState } from "@/components/ui/empty-state";
 
 import Page from "@/components/Common/Page";
-import Pagination from "@/components/Common/Pagination";
+import PaginationComponent from "@/components/Common/Pagination";
 import { TableSkeleton } from "@/components/Common/SkeletonLoading";
 import {
   Table,
@@ -102,7 +102,7 @@ function ProductDeliveriesDrawerContent({
             facilityId={facilityId}
             linkToProduct
           />
-          <Pagination
+          <PaginationComponent
             data={{ totalCount: deliveries.count }}
             onChange={(newPage) => setPage(newPage)}
             defaultPerPage={DELIVERIES_PER_PAGE}

From 369d56f494989a4fa5b0c7eb078af515cb44379b Mon Sep 17 00:00:00 2001
From: Muhammed Navas <navaspavil@gmail.com>
Date: Mon, 13 Jul 2026 14:54:30 +0530
Subject: [PATCH 18/23] feat: add pagination test for deliveries in All
 Deliveries drawer

---
 .../locations/inventory/allDeliveries.spec.ts | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/tests/facility/services/locations/inventory/allDeliveries.spec.ts b/tests/facility/services/locations/inventory/allDeliveries.spec.ts
index 4c8fdc441a7..9b8bb1dc1ad 100644
--- a/tests/facility/services/locations/inventory/allDeliveries.spec.ts
+++ b/tests/facility/services/locations/inventory/allDeliveries.spec.ts
@@ -106,4 +106,52 @@ test.describe("Inventory Summary — All Deliveries drawer", () => {
       await expect(drawer.getByText("No delivery found")).toBeVisible();
     });
   });
+
+  test("paginates the deliveries within the drawer", async ({ page }) => {
+    await test.step("Wait for the inventory row to render", async () => {
+      await expect(
+        page.getByRole("button", { name: PRODUCT_NAME }),
+      ).toBeVisible();
+    });
+
+    // Seeded pharmacy products have a single delivery, so the pagination
+    // controls are otherwise hidden. Keep the real (valid) delivery rows but
+    // inflate the reported count past DELIVERIES_PER_PAGE (10) so a second page
+    // exists and the controls render.
+    await test.step("Inflate the deliveries count to expose pagination", async () => {
+      await page.route(
+        (url) =>
+          url.pathname === "/api/v1/supply_delivery/" &&
+          url.searchParams.has("supplied_inventory_item_product_knowledge"),
+        async (route) => {
+          const response = await route.fetch();
+          const json = await response.json();
+          json.count = 15;
+          await route.fulfill({ response, json });
+        },
+      );
+    });
+
+    await test.step("Open the drawer and confirm the first page renders", async () => {
+      await page.getByRole("button", { name: PRODUCT_NAME }).click();
+      const drawer = page.locator('[data-slot="drawer-content"]');
+      await expect(drawer.getByText("All Deliveries")).toBeVisible();
+      await expect(
+        drawer.getByRole("link", { name: PRODUCT_NAME }),
+      ).toBeVisible();
+    });
+
+    await test.step("Navigate to page 2 and assert the offset advances", async () => {
+      const drawer = page.locator('[data-slot="drawer-content"]');
+      const page2Response = page.waitForResponse(
+        (resp) =>
+          resp.url().includes("/api/v1/supply_delivery/") &&
+          resp.request().method() === "GET" &&
+          resp.url().includes("offset=10") &&
+          resp.ok(),
+      );
+      await drawer.getByRole("button", { name: "2", exact: true }).click();
+      await page2Response;
+    });
+  });
 });

From 43f696c40423d17339f226792239ceed81e47422 Mon Sep 17 00:00:00 2001
From: Muhammed Navas <navaspavil@gmail.com>
Date: Mon, 13 Jul 2026 15:17:43 +0530
Subject: [PATCH 19/23] Update ProductDeliveriesDrawerContent to reset page on
 product selection and pass initialSerialNumber to SupplyDeliveryTable

---
 .../Facility/services/inventory/InventoryList.tsx     | 11 ++++-------
 .../services/inventory/SupplyDeliveryTable.tsx        |  6 ++++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/pages/Facility/services/inventory/InventoryList.tsx b/src/pages/Facility/services/inventory/InventoryList.tsx
index 8ab50b9f71f..d142b1e6a75 100644
--- a/src/pages/Facility/services/inventory/InventoryList.tsx
+++ b/src/pages/Facility/services/inventory/InventoryList.tsx
@@ -67,10 +67,6 @@ function ProductDeliveriesDrawerContent({
   const { t } = useTranslation();
   const [page, setPage] = useState(1);
 
-  useEffect(() => {
-    setPage(1);
-  }, [selectedProductKnowledge?.id]);
-
   const { data: deliveries, isLoading } = useQuery({
     queryKey: [
       "supplyDeliveries",
@@ -92,15 +88,16 @@ function ProductDeliveriesDrawerContent({
   });
 
   return (
-    <div className="space-y-4 overflow-y-auto pt-4 max-h-[68vh]">
+    <div className="flex flex-col overflow-y-auto pt-4 max-h-[68vh]">
       {isLoading ? (
         <TableSkeleton count={2} />
       ) : deliveries?.results && deliveries.results.length > 0 ? (
-        <div className="flex flex-col items-center">
+        <>
           <SupplyDeliveryTable
             deliveries={deliveries.results}
             facilityId={facilityId}
             linkToProduct
+            initialSerialNumber={(page - 1) * DELIVERIES_PER_PAGE}
           />
           <PaginationComponent
             data={{ totalCount: deliveries.count }}
@@ -108,7 +105,7 @@ function ProductDeliveriesDrawerContent({
             defaultPerPage={DELIVERIES_PER_PAGE}
             cPage={page}
           />
-        </div>
+        </>
       ) : (
         <EmptyState
           icon={<Truck className="size-5 text-primary-600" />}
diff --git a/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx b/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx
index e48de511eaa..ded5c540991 100644
--- a/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx
+++ b/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx
@@ -63,6 +63,7 @@ interface SupplyDeliveryTableProps {
   isRequester?: boolean;
   facilityId?: string;
   linkToProduct?: boolean;
+  initialSerialNumber?: number;
 }
 
 export function SupplyDeliveryTable({
@@ -78,6 +79,7 @@ export function SupplyDeliveryTable({
   isRequester = false,
   facilityId,
   linkToProduct = false,
+  initialSerialNumber = 0,
 }: SupplyDeliveryTableProps) {
   const { t } = useTranslation();
   const queryClient = useQueryClient();
@@ -157,7 +159,7 @@ export function SupplyDeliveryTable({
   // Build a map of delivery id -> serial number for non-cancelled deliveries
   const serialNumberMap = useMemo(() => {
     const map = new Map<string, number>();
-    let serial = 1;
+    let serial = initialSerialNumber + 1;
     for (const delivery of deliveries) {
       if (
         ACTIVE_SUPPLY_DELIVERY_STATUSES.includes(
@@ -168,7 +170,7 @@ export function SupplyDeliveryTable({
       }
     }
     return map;
-  }, [deliveries]);
+  }, [deliveries, initialSerialNumber]);
 
   return (
     <Table>

From 30c7b6b9aa039624137e2cf71e34393d2b644ee7 Mon Sep 17 00:00:00 2001
From: Muhammed Navas <navaspavil@gmail.com>
Date: Mon, 13 Jul 2026 15:29:05 +0530
Subject: [PATCH 20/23] fix: remove initialSerialNumber prop from
 SupplyDeliveryTable and adjust serial number logic

---
 src/pages/Facility/services/inventory/InventoryList.tsx     | 1 -
 .../Facility/services/inventory/SupplyDeliveryTable.tsx     | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/pages/Facility/services/inventory/InventoryList.tsx b/src/pages/Facility/services/inventory/InventoryList.tsx
index d142b1e6a75..9215ccb1017 100644
--- a/src/pages/Facility/services/inventory/InventoryList.tsx
+++ b/src/pages/Facility/services/inventory/InventoryList.tsx
@@ -97,7 +97,6 @@ function ProductDeliveriesDrawerContent({
             deliveries={deliveries.results}
             facilityId={facilityId}
             linkToProduct
-            initialSerialNumber={(page - 1) * DELIVERIES_PER_PAGE}
           />
           <PaginationComponent
             data={{ totalCount: deliveries.count }}
diff --git a/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx b/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx
index ded5c540991..e48de511eaa 100644
--- a/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx
+++ b/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx
@@ -63,7 +63,6 @@ interface SupplyDeliveryTableProps {
   isRequester?: boolean;
   facilityId?: string;
   linkToProduct?: boolean;
-  initialSerialNumber?: number;
 }
 
 export function SupplyDeliveryTable({
@@ -79,7 +78,6 @@ export function SupplyDeliveryTable({
   isRequester = false,
   facilityId,
   linkToProduct = false,
-  initialSerialNumber = 0,
 }: SupplyDeliveryTableProps) {
   const { t } = useTranslation();
   const queryClient = useQueryClient();
@@ -159,7 +157,7 @@ export function SupplyDeliveryTable({
   // Build a map of delivery id -> serial number for non-cancelled deliveries
   const serialNumberMap = useMemo(() => {
     const map = new Map<string, number>();
-    let serial = initialSerialNumber + 1;
+    let serial = 1;
     for (const delivery of deliveries) {
       if (
         ACTIVE_SUPPLY_DELIVERY_STATUSES.includes(
@@ -170,7 +168,7 @@ export function SupplyDeliveryTable({
       }
     }
     return map;
-  }, [deliveries, initialSerialNumber]);
+  }, [deliveries]);
 
   return (
     <Table>

From d65681b4765da82339c4e94e0d2928350a593466 Mon Sep 17 00:00:00 2001
From: Muhammed Navas <navaspavil@gmail.com>
Date: Tue, 14 Jul 2026 17:48:57 +0530
Subject: [PATCH 21/23] feat: add showLocations prop to SupplyDeliveryTable and
 update related components

---
 .../services/inventory/InventoryList.tsx      |  1 +
 .../inventory/SupplyDeliveryTable.tsx         | 28 +++++++++++++++++--
 .../inventory/requestOrder/requestOrder.ts    |  2 ++
 .../supplyDelivery/supplyDelivery.ts          |  2 ++
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/pages/Facility/services/inventory/InventoryList.tsx b/src/pages/Facility/services/inventory/InventoryList.tsx
index 9215ccb1017..16d7196fe45 100644
--- a/src/pages/Facility/services/inventory/InventoryList.tsx
+++ b/src/pages/Facility/services/inventory/InventoryList.tsx
@@ -97,6 +97,7 @@ function ProductDeliveriesDrawerContent({
             deliveries={deliveries.results}
             facilityId={facilityId}
             linkToProduct
+            showLocations
           />
           <PaginationComponent
             data={{ totalCount: deliveries.count }}
diff --git a/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx b/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx
index e48de511eaa..06c73794fa2 100644
--- a/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx
+++ b/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx
@@ -63,6 +63,7 @@ interface SupplyDeliveryTableProps {
   isRequester?: boolean;
   facilityId?: string;
   linkToProduct?: boolean;
+  showLocations?: boolean;
 }
 
 export function SupplyDeliveryTable({
@@ -78,6 +79,7 @@ export function SupplyDeliveryTable({
   isRequester = false,
   facilityId,
   linkToProduct = false,
+  showLocations = false,
 }: SupplyDeliveryTableProps) {
   const { t } = useTranslation();
   const queryClient = useQueryClient();
@@ -190,6 +192,12 @@ export function SupplyDeliveryTable({
           <TableHead rowSpan={2}>{t("#")}</TableHead>
           <TableHead rowSpan={2}>{t("item")}</TableHead>
           <TableHead rowSpan={2}>{t("batch")}</TableHead>
+          {showLocations && (
+            <>
+              <TableHead rowSpan={2}>{t("origin")}</TableHead>
+              <TableHead rowSpan={2}>{t("destination")}</TableHead>
+            </>
+          )}
           <TableHead rowSpan={2}>{t("requested_qty")}</TableHead>
           {!internal && <TableHead rowSpan={2}>{t("pack_size")}</TableHead>}
           {!internal && <TableHead rowSpan={2}>{t("pack_qty")}</TableHead>}
@@ -255,10 +263,13 @@ export function SupplyDeliveryTable({
               onClick={() => onDeliveryClick?.(delivery)}
             >
               {(() => {
-                const productId = internal
+                const internalDelivery =
+                  internal || !!delivery.supplied_inventory_item?.product?.id;
+
+                const productId = internalDelivery
                   ? delivery.supplied_inventory_item?.product?.id
                   : delivery.supplied_item?.id;
-                const productName = internal
+                const productName = internalDelivery
                   ? delivery.supplied_inventory_item?.product?.product_knowledge
                       ?.name
                   : delivery.supplied_item?.product_knowledge?.name;
@@ -286,6 +297,19 @@ export function SupplyDeliveryTable({
               {delivery.supplied_inventory_item?.product?.batch?.lot_number ||
                 "-"}
             </TableCell>
+            {showLocations && (
+              <>
+                <TableCell>
+                  {delivery?.order?.origin?.name ||
+                    delivery?.order?.supplier?.name ||
+                    delivery?.order?.patient?.name ||
+                    "-"}
+                </TableCell>
+                <TableCell>
+                  {delivery?.order?.destination?.name || "-"}
+                </TableCell>
+              </>
+            )}
             <TableCell>
               {delivery.supply_request
                 ? round(delivery.supply_request.quantity)
diff --git a/src/types/inventory/requestOrder/requestOrder.ts b/src/types/inventory/requestOrder/requestOrder.ts
index 5e3086b2368..e0a9618bc36 100644
--- a/src/types/inventory/requestOrder/requestOrder.ts
+++ b/src/types/inventory/requestOrder/requestOrder.ts
@@ -1,4 +1,5 @@
 import { Badge } from "@/components/ui/badge";
+import { PatientListRead } from "@/types/emr/patient/patient";
 import { TagConfig } from "@/types/emr/tagConfig/tagConfig";
 import { LocationDetail } from "@/types/location/location";
 import { Organization } from "@/types/organization/organization";
@@ -90,4 +91,5 @@ export interface RequestOrderRetrieve extends RequestOrder {
   destination: LocationDetail;
   supplier?: Organization;
   tags: TagConfig[];
+  patient?: PatientListRead;
 }
diff --git a/src/types/inventory/supplyDelivery/supplyDelivery.ts b/src/types/inventory/supplyDelivery/supplyDelivery.ts
index 742d8f0e673..6ef0924a802 100644
--- a/src/types/inventory/supplyDelivery/supplyDelivery.ts
+++ b/src/types/inventory/supplyDelivery/supplyDelivery.ts
@@ -1,5 +1,6 @@
 import { InventoryRead } from "@/types/inventory/product/inventory";
 import { ProductRead } from "@/types/inventory/product/product";
+import { RequestOrderRetrieve } from "@/types/inventory/requestOrder/requestOrder";
 import { SupplyRequestRead } from "@/types/inventory/supplyRequest/supplyRequest";
 
 export enum SupplyDeliveryStatus {
@@ -79,4 +80,5 @@ export interface SupplyDeliveryRead extends SupplyDeliveryBase {
   modified_date?: string;
   supply_request?: SupplyRequestRead;
   extensions: Record<string, unknown>;
+  order?: RequestOrderRetrieve;
 }

From f762adc901d96fe32750aeef44c3542064d020ce Mon Sep 17 00:00:00 2001
From: Muhammed Navas <navaspavil@gmail.com>
Date: Tue, 14 Jul 2026 18:09:53 +0530
Subject: [PATCH 22/23] fix: add button type to
 ResourceDefinitionCategoryPicker for accessibility

---
 src/components/Common/ResourceDefinitionCategoryPicker.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/Common/ResourceDefinitionCategoryPicker.tsx b/src/components/Common/ResourceDefinitionCategoryPicker.tsx
index d77e4ba8a0d..31699930ddf 100644
--- a/src/components/Common/ResourceDefinitionCategoryPicker.tsx
+++ b/src/components/Common/ResourceDefinitionCategoryPicker.tsx
@@ -808,6 +808,7 @@ export function ResourceDefinitionCategoryPicker<T>({
                 variant="outline"
                 role="combobox"
                 aria-expanded={open}
+                type="button"
                 className={cn(
                   "justify-between px-3 py-2 w-full shadow-xs border border-gray-300 font-medium h-auto min-h-9",
                   disabled && "opacity-50 cursor-not-allowed",

From 5af00b3c4ad7639f5a010ff2271e5e16e0344955 Mon Sep 17 00:00:00 2001
From: Muhammed Navas <navaspavil@gmail.com>
Date: Fri, 17 Jul 2026 15:57:23 +0530
Subject: [PATCH 23/23] feat: update delivery filtering and add serial number
 offset to SupplyDeliveryTable

---
 src/pages/Facility/services/inventory/InventoryList.tsx     | 6 ++++++
 .../Facility/services/inventory/SupplyDeliveryTable.tsx     | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/pages/Facility/services/inventory/InventoryList.tsx b/src/pages/Facility/services/inventory/InventoryList.tsx
index 16d7196fe45..d3afdf3f6df 100644
--- a/src/pages/Facility/services/inventory/InventoryList.tsx
+++ b/src/pages/Facility/services/inventory/InventoryList.tsx
@@ -40,6 +40,7 @@ import { ACCOUNT_STATUS_COLORS } from "@/types/billing/account/Account";
 import { InventoryStatusOptions } from "@/types/inventory/product/inventory";
 import inventoryApi from "@/types/inventory/product/inventoryApi";
 import { ProductKnowledgeBase } from "@/types/inventory/productKnowledge/productKnowledge";
+import { ACTIVE_SUPPLY_DELIVERY_STATUSES } from "@/types/inventory/supplyDelivery/supplyDelivery";
 import supplyDeliveryApi from "@/types/inventory/supplyDelivery/supplyDeliveryApi";
 import { ProductKnowledgeSelect } from "./ProductKnowledgeSelect";
 import { SupplyDeliveryTable } from "./SupplyDeliveryTable";
@@ -53,6 +54,9 @@ type SortOptionKey = keyof typeof SORT_OPTIONS;
 
 const DELIVERIES_PER_PAGE = 10;
 
+// Only in-progress and completed deliveries are shown in the deliveries drawer.
+const ACTIVE_DELIVERY_STATUS_FILTER = ACTIVE_SUPPLY_DELIVERY_STATUSES.join(",");
+
 interface ProductDeliveriesDrawerContentProps {
   facilityId: string;
   locationId: string;
@@ -80,6 +84,7 @@ function ProductDeliveriesDrawerContent({
         facility: facilityId,
         destination: locationId,
         supplied_inventory_item_product_knowledge: selectedProductKnowledge?.id,
+        status: ACTIVE_DELIVERY_STATUS_FILTER,
         limit: DELIVERIES_PER_PAGE,
         offset: (page - 1) * DELIVERIES_PER_PAGE,
       },
@@ -96,6 +101,7 @@ function ProductDeliveriesDrawerContent({
           <SupplyDeliveryTable
             deliveries={deliveries.results}
             facilityId={facilityId}
+            serialNumberOffset={DELIVERIES_PER_PAGE * (page - 1)}
             linkToProduct
             showLocations
           />
diff --git a/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx b/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx
index 06c73794fa2..590438aca60 100644
--- a/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx
+++ b/src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx
@@ -64,6 +64,7 @@ interface SupplyDeliveryTableProps {
   facilityId?: string;
   linkToProduct?: boolean;
   showLocations?: boolean;
+  serialNumberOffset?: number;
 }
 
 export function SupplyDeliveryTable({
@@ -80,6 +81,7 @@ export function SupplyDeliveryTable({
   facilityId,
   linkToProduct = false,
   showLocations = false,
+  serialNumberOffset = 0,
 }: SupplyDeliveryTableProps) {
   const { t } = useTranslation();
   const queryClient = useQueryClient();
@@ -159,7 +161,7 @@ export function SupplyDeliveryTable({
   // Build a map of delivery id -> serial number for non-cancelled deliveries
   const serialNumberMap = useMemo(() => {
     const map = new Map<string, number>();
-    let serial = 1;
+    let serial = serialNumberOffset + 1;
     for (const delivery of deliveries) {
       if (
         ACTIVE_SUPPLY_DELIVERY_STATUSES.includes(