@kenyaemr/esm-billing-app 5.4.1-pre.1799 → 5.4.1-pre.1818

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[{"component":"billableServicesHome","route":"billable-services"},{"component":"requirePaymentModal","routeRegex":"^patient/.+/chart","online":true,"offline":false}],"extensions":[{"component":"billingDashboardLink","name":"billing-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"billing","title":"billing","slot":"billing-dashboard-slot"}},{"component":"benefitsPackageDashboardLink","name":"benefits-package-dashboard-link","slot":"patient-chart-dashboard-slot","meta":{"name":"benefits-package","slot":"patient-chart-benefits-dashboard-slot","path":"insurance-benefits","columns":1,"columnSpan":1},"featureFlag":"healthInformationExchange"},{"component":"benefitsPackage","name":"benefits-package","slot":"patient-chart-benefits-dashboard-slot"},{"component":"root","name":"billing-dashboard-root","slot":"billing-dashboard-slot"},{"component":"benefitsEligibilyRequestForm","name":"benefits-eligibility-request-form"},{"component":"benefitsPreAuthForm","name":"benefits-pre-auth-form"},{"name":"billing-patient-summary","component":"billingPatientSummary","slot":"patient-chart-billing-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"billing-summary-dashboard-link","component":"billingSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":11,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-billing-dashboard-slot","path":"Billing","layoutMode":"anchored"}},{"name":"billing-check-in-form","slot":"extra-visit-attribute-slot","component":"billingCheckInForm"},{"name":"require-billing-modal","component":"requirePaymentModal"},{"name":"patient-banner-billing-tags","component":"visitAttributeTags","slot":"patient-banner-tags-slot","order":2},{"name":"initiate-payment-modal","component":"initiatePaymentDialog"},{"name":"delete-billableservice-modal","component":"deleteBillableServiceModal"},{"name":"refund-bill-modal","component":"refundBillModal"},{"name":"delete-bill-modal","component":"deleteBillModal"},{"name":"lab-order-billable-item","component":"labOrder","slot":"top-of-lab-order-form-slot"},{"name":"procedure-order-billable-item","component":"procedureOrder","slot":"top-of-procedure-order-form-slot"},{"name":"imaging-order-billable-item","component":"imagingOrder","slot":"top-of-imaging-order-form-slot"},{"name":"price-info-order","component":"priceInfoOrder"},{"name":"drug-order-billable-item","component":"drugOrder","slot":"medication-info-slot"},{"name":"billing-test-order-action","component":"testOrderAction","slot":"tests-ordered-actions-slot","order":0},{"component":"billingOverviewLink","name":"billing-overview-link","order":0,"slot":"billing-dashboard-link-slot"},{"component":"paymentHistoryLink","name":"payment-history-link","slot":"billing-dashboard-link-slot"},{"component":"paymentPointsLink","name":"payment-points-link","slot":"billing-dashboard-link-slot"},{"component":"paymentModesLink","name":"payment-modes-link","slot":"billing-dashboard-link-slot"},{"component":"billManagerLink","name":"bill-manager-link","slot":"billing-dashboard-link-slot"},{"component":"chargeableItemsLink","name":"chargeable-items-link","slot":"billing-dashboard-link-slot"},{"component":"billableExemptionsLink","name":"billable-exemptions-link","slot":"billing-dashboard-link-slot"},{"component":"claimsManagementSideNavGroup","name":"claims-management-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"claims-management","title":"Claims management Overview","slot":"case-management-slot"},"featureFlag":"healthInformationExchange"},{"component":"claimsManagementOverviewDashboardLink","name":"claims-management-overview-link","order":0,"slot":"claims-management-dashboard-link-slot"},{"component":"preAuthRequestsDashboardLink","name":"preauthrequest-overview-link","slot":"claims-management-dashboard-link-slot"},{"component":"claimsOverview","name":"claims-overview-dashboard-link","slot":"claims-management-overview-slot"},{"component":"waiveBillActionButton","name":"waive-bill-action-button","slot":"bill-actions-slot"},{"component":"deleteBillActionButton","name":"delete-bill-action-button","slot":"bill-actions-slot"},{"component":"refundLineItem","name":"refund-line-item","slot":"bill-actions-overflow-menu-slot"},{"name":"edit-line-item","component":"editLineItem","slot":"bill-actions-overflow-menu-slot"},{"name":"cancel-line-item","component":"cancelLineItem","slot":"bill-actions-overflow-menu-slot"}],"workspaces":[{"name":"waive-bill-form","component":"waiveBillForm","title":"Waive Bill Form","type":"other-form"},{"name":"edit-bill-form","component":"editBillForm","title":"Edit Bill Form","type":"other-form"},{"name":"billable-service-form","component":"addServiceForm","title":"Create Charge Item Form","type":"other-form"},{"name":"commodity-form","component":"addCommodityForm","title":"Create Charge Item Form","type":"other-form"},{"name":"billing-form","component":"billingForm","title":"Billing Form","type":"other-form","width":"extra-wide"},{"name":"payment-mode-workspace","component":"paymentModeWorkspace","title":"Payment Mode Workspace","type":"other-form"},{"name":"cancel-bill-workspace","component":"cancelBillWorkspace","title":"Cancel Bill Workspace","type":"other-form"}],"modals":[{"name":"create-payment-point","component":"createPaymentPoint"},{"name":"clock-out-modal","component":"clockOut"},{"name":"bulk-import-billable-services-modal","component":"bulkImportBillableServicesModal"},{"name":"delete-payment-mode-modal","component":"deletePaymentModeModal"},{"name":"retry-claim-request-modal","component":"retryClaimRequestModal"},{"name":"paid-bill-receipt-print-preview-modal","component":"paidBillReceiptPrintPreviewModal"},{"name":"clock-in-modal","component":"clockIn"}],"version":"5.4.1-pre.1799"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[{"component":"billableServicesHome","route":"billable-services"},{"component":"requirePaymentModal","routeRegex":"^patient/.+/chart","online":true,"offline":false}],"extensions":[{"component":"billingDashboardLink","name":"billing-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"billing","title":"billing","slot":"billing-dashboard-slot"}},{"component":"benefitsPackageDashboardLink","name":"benefits-package-dashboard-link","slot":"patient-chart-dashboard-slot","meta":{"name":"benefits-package","slot":"patient-chart-benefits-dashboard-slot","path":"insurance-benefits","columns":1,"columnSpan":1},"featureFlag":"healthInformationExchange"},{"component":"benefitsPackage","name":"benefits-package","slot":"patient-chart-benefits-dashboard-slot"},{"component":"root","name":"billing-dashboard-root","slot":"billing-dashboard-slot"},{"component":"benefitsEligibilyRequestForm","name":"benefits-eligibility-request-form"},{"component":"benefitsPreAuthForm","name":"benefits-pre-auth-form"},{"name":"billing-patient-summary","component":"billingPatientSummary","slot":"patient-chart-billing-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"billing-summary-dashboard-link","component":"billingSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":11,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-billing-dashboard-slot","path":"Billing","layoutMode":"anchored"}},{"name":"billing-check-in-form","slot":"extra-visit-attribute-slot","component":"billingCheckInForm"},{"name":"require-billing-modal","component":"requirePaymentModal"},{"name":"patient-banner-billing-tags","component":"visitAttributeTags","slot":"patient-banner-tags-slot","order":2},{"name":"initiate-payment-modal","component":"initiatePaymentDialog"},{"name":"delete-billableservice-modal","component":"deleteBillableServiceModal"},{"name":"refund-bill-modal","component":"refundBillModal"},{"name":"delete-bill-modal","component":"deleteBillModal"},{"name":"lab-order-billable-item","component":"labOrder","slot":"top-of-lab-order-form-slot"},{"name":"procedure-order-billable-item","component":"procedureOrder","slot":"top-of-procedure-order-form-slot"},{"name":"imaging-order-billable-item","component":"imagingOrder","slot":"top-of-imaging-order-form-slot"},{"name":"price-info-order","component":"priceInfoOrder"},{"name":"drug-order-billable-item","component":"drugOrder","slot":"medication-info-slot"},{"name":"billing-test-order-action","component":"testOrderAction","slot":"tests-ordered-actions-slot","order":0},{"component":"billingOverviewLink","name":"billing-overview-link","order":0,"slot":"billing-dashboard-link-slot"},{"component":"paymentHistoryLink","name":"payment-history-link","slot":"billing-dashboard-link-slot"},{"component":"paymentPointsLink","name":"payment-points-link","slot":"billing-dashboard-link-slot"},{"component":"paymentModesLink","name":"payment-modes-link","slot":"billing-dashboard-link-slot"},{"component":"billManagerLink","name":"bill-manager-link","slot":"billing-dashboard-link-slot"},{"component":"chargeableItemsLink","name":"chargeable-items-link","slot":"billing-dashboard-link-slot"},{"component":"billableExemptionsLink","name":"billable-exemptions-link","slot":"billing-dashboard-link-slot"},{"component":"claimsManagementSideNavGroup","name":"claims-management-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"claims-management","title":"Claims management Overview","slot":"case-management-slot"},"featureFlag":"healthInformationExchange"},{"component":"claimsManagementOverviewDashboardLink","name":"claims-management-overview-link","order":0,"slot":"claims-management-dashboard-link-slot"},{"component":"preAuthRequestsDashboardLink","name":"preauthrequest-overview-link","slot":"claims-management-dashboard-link-slot"},{"component":"claimsOverview","name":"claims-overview-dashboard-link","slot":"claims-management-overview-slot"},{"component":"waiveBillActionButton","name":"waive-bill-action-button","slot":"bill-actions-slot"},{"component":"deleteBillActionButton","name":"delete-bill-action-button","slot":"bill-actions-slot"},{"component":"refundLineItem","name":"refund-line-item","slot":"bill-actions-overflow-menu-slot"},{"name":"edit-line-item","component":"editLineItem","slot":"bill-actions-overflow-menu-slot"},{"name":"cancel-line-item","component":"cancelLineItem","slot":"bill-actions-overflow-menu-slot"}],"workspaces":[{"name":"waive-bill-form","component":"waiveBillForm","title":"Waive Bill Form","type":"other-form"},{"name":"edit-bill-form","component":"editBillForm","title":"Edit Bill Form","type":"other-form"},{"name":"billable-service-form","component":"addServiceForm","title":"Create Charge Item Form","type":"other-form"},{"name":"commodity-form","component":"addCommodityForm","title":"Create Charge Item Form","type":"other-form"},{"name":"billing-form","component":"billingForm","title":"Billing Form","type":"other-form","width":"extra-wide"},{"name":"payment-mode-workspace","component":"paymentModeWorkspace","title":"Payment Mode Workspace","type":"other-form"},{"name":"cancel-bill-workspace","component":"cancelBillWorkspace","title":"Cancel Bill Workspace","type":"other-form"}],"modals":[{"name":"create-payment-point","component":"createPaymentPoint"},{"name":"clock-out-modal","component":"clockOut"},{"name":"bulk-import-billable-services-modal","component":"bulkImportBillableServicesModal"},{"name":"delete-payment-mode-modal","component":"deletePaymentModeModal"},{"name":"retry-claim-request-modal","component":"retryClaimRequestModal"},{"name":"paid-bill-receipt-print-preview-modal","component":"paidBillReceiptPrintPreviewModal"},{"name":"clock-in-modal","component":"clockIn"},{"name":"create-bill-item-modal","component":"createBillItemModal"}],"version":"5.4.1-pre.1818"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-billing-app",
-  "version": "5.4.1-pre.1799",
+  "version": "5.4.1-pre.1818",
   "description": "Billing app for KenyaEMR",
   "browser": "dist/kenyaemr-esm-billing-app.js",
   "main": "src/index.ts",

package/src/billable-services/bill-manager/modals/create-bill-item-modal.component.tsx

@@ -0,0 +1,208 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import {
+  Button,
+  ModalBody,
+  ModalFooter,
+  ModalHeader,
+  Column,
+  Dropdown,
+  Stack,
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeader,
+  TableRow,
+} from '@carbon/react';
+import { z } from 'zod';
+import { Controller, useForm } from 'react-hook-form';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { useBillableServices } from '../../billable-service.resource';
+import { showSnackbar, useConfig } from '@openmrs/esm-framework';
+import { BillingConfig } from '../../../config-schema';
+import { billingFormSchema, processBillItems } from '../../../billing.resource';
+import styles from './create-bill-item-modal.scss';
+import { useStockItemQuantity } from '../../billiable-item/useBillableItem';
+
+interface CreateBillItemModalProps {
+  closeModal: () => void;
+  medicationRequestBundle: {
+    request: fhir.MedicationRequest;
+  };
+}
+
+type FormType = z.infer<typeof billingFormSchema>;
+
+const CreateBillItemModal: React.FC<CreateBillItemModalProps> = ({ closeModal, medicationRequestBundle }) => {
+  const { t } = useTranslation();
+  const { billableServices, error, isLoading } = useBillableServices();
+  const { cashPointUuid, cashierUuid } = useConfig<BillingConfig>();
+
+  const patientUuid = medicationRequestBundle?.request?.subject?.reference?.split('/')[1];
+  const orderUuid = medicationRequestBundle?.request?.id;
+  const quantityToDispense = medicationRequestBundle?.request?.dispenseRequest?.quantity?.value;
+  const drugUuid = medicationRequestBundle?.request?.medicationReference?.reference?.split('/')[1];
+  const { stockItemUuid } = useStockItemQuantity(drugUuid);
+
+  const billableItem =
+    billableServices?.filter((service) => {
+      const stockItem = service?.stockItem.split(':')[0];
+      return stockItem === stockItemUuid;
+    }) || [];
+  const defaultPaymentStatus = 'PENDING';
+
+  const form = useForm<FormType>({
+    mode: 'onChange',
+    resolver: zodResolver(billingFormSchema),
+    defaultValues: {
+      cashPoint: cashPointUuid,
+      cashier: cashierUuid,
+      patient: patientUuid,
+      status: 'PENDING',
+      lineItems: billableItem.map((service) => ({
+        billableService: service.uuid,
+        lineItemOrder: 0,
+        quantity: quantityToDispense || 1,
+        price: 0,
+        paymentStatus: defaultPaymentStatus,
+        priceUuid: '',
+        priceName: '',
+        order: orderUuid,
+      })),
+      payments: [],
+    },
+  });
+
+  const handleSubmit = async (data: FormType) => {
+    const validatedLineItems = data.lineItems.map((item, index) => ({
+      ...item,
+      billableService: billableItem[index]?.uuid,
+      order: orderUuid,
+      paymentStatus: defaultPaymentStatus,
+    }));
+
+    const validatedData = {
+      ...data,
+      lineItems: validatedLineItems,
+    };
+
+    try {
+      await processBillItems(validatedData);
+      showSnackbar({
+        title: t('billItems', 'Save Bill'),
+        subtitle: 'Bill processing has been successful',
+        kind: 'success',
+        timeoutInMs: 3000,
+      });
+      // TODO:  mutate the bill
+      closeModal();
+    } catch (error) {
+      console.error('Bill processing error:', error);
+      showSnackbar({
+        title: 'Bill processing error',
+        kind: 'error',
+        subtitle: error instanceof Error ? error.message : 'Unknown error occurred',
+      });
+    }
+  };
+
+  const calculateTotal = (index: number) => {
+    const price = form.watch(`lineItems.${index}.price`) || 0;
+    const quantity = form.watch(`lineItems.${index}.quantity`) || 1;
+    return price * quantity;
+  };
+
+  return (
+    <div>
+      <form onSubmit={form.handleSubmit(handleSubmit)}>
+        <ModalHeader closeModal={closeModal} title={t('billing', 'Billing')} />
+        <ModalBody>
+          <Stack gap={4} className={styles.grid}>
+            <Column className={styles.billingItem}>
+              <Table aria-label="billing items table">
+                <TableHead>
+                  <TableRow>
+                    <TableHeader>Item</TableHeader>
+                    <TableHeader>Quantity</TableHeader>
+                    <TableHeader>PaymentMethod</TableHeader>
+                    <TableHeader>Price</TableHeader>
+                    <TableHeader>Total</TableHeader>
+                  </TableRow>
+                </TableHead>
+                <TableBody>
+                  {billableItem.map((service, index) => (
+                    <TableRow key={service.uuid}>
+                      <TableCell>{service?.name || 'Service Not Found'}</TableCell>
+                      <TableCell>
+                        <Controller
+                          control={form.control}
+                          name={`lineItems.${index}.quantity`}
+                          defaultValue={quantityToDispense}
+                          render={({ field }) => (
+                            <input
+                              {...field}
+                              type="number"
+                              className="form-control"
+                              min={1}
+                              max={quantityToDispense}
+                              onChange={(e) => {
+                                const value = parseInt(e.target.value, 10);
+                                field.onChange(value);
+                              }}
+                            />
+                          )}
+                        />
+                      </TableCell>
+                      <TableCell>
+                        <Controller
+                          control={form.control}
+                          name={`lineItems.${index}.priceUuid`}
+                          render={({ field }) => (
+                            <Dropdown
+                              id={`priceUuid-${index}`}
+                              invalid={!!form.formState.errors.lineItems?.[index]?.priceUuid}
+                              invalidText={form.formState.errors.lineItems?.[index]?.priceUuid?.message}
+                              onChange={(e) => {
+                                const selectedPrice = service?.servicePrices.find((p) => p.uuid === e.selectedItem);
+                                if (selectedPrice) {
+                                  field.onChange(e.selectedItem);
+                                  form.setValue(`lineItems.${index}.price`, selectedPrice.price);
+                                  form.setValue(`lineItems.${index}.priceName`, selectedPrice.name);
+                                  form.setValue(`lineItems.${index}.billableService`, service.uuid);
+                                  form.setValue(`lineItems.${index}.order`, orderUuid);
+                                  form.setValue(`lineItems.${index}.paymentStatus`, defaultPaymentStatus);
+                                }
+                              }}
+                              selectedItem={field.value}
+                              label="Choose method"
+                              items={service?.servicePrices.map((r) => r.uuid) ?? []}
+                              itemToString={(item) => service?.servicePrices.find((r) => r.uuid === item)?.name ?? ''}
+                              direction="top"
+                            />
+                          )}
+                        />
+                      </TableCell>
+                      <TableCell>{form.watch(`lineItems.${index}.price`) ?? ' '}</TableCell>
+                      <TableCell>{calculateTotal(index)}</TableCell>
+                    </TableRow>
+                  ))}
+                </TableBody>
+              </Table>
+            </Column>
+          </Stack>
+        </ModalBody>
+        <ModalFooter>
+          <Button className={styles.button} kind="secondary" onClick={closeModal}>
+            {t('discard', 'Discard')}
+          </Button>
+          <Button className={styles.button} kind="primary" type="submit" disabled={form.formState.isSubmitting}>
+            {t('saveAndClose', 'Save & Close')}
+          </Button>
+        </ModalFooter>
+      </form>
+    </div>
+  );
+};
+
+export default CreateBillItemModal;

package/src/billable-services/bill-manager/modals/create-bill-item-modal.scss

@@ -0,0 +1,26 @@
+@use '@carbon/type';
+@use '@carbon/layout';
+@use '@carbon/colors';
+
+.heading {
+  @include type.type-style('heading-compact-01');
+  margin: layout.$spacing-05 0 layout.$spacing-05;
+}
+
+.grid {
+  margin: layout.$spacing-05 layout.$spacing-05;
+  padding-top: layout.$spacing-05;
+}
+
+.billingItem {
+  margin-top: layout.$spacing-10;
+  overflow-x: auto;
+}
+
+.button {
+  height: layout.$spacing-10;
+  display: flex;
+  align-content: flex-start;
+  align-items: baseline;
+  min-width: 50%;
+}

package/src/billable-services/billable-service.resource.tsx

@@ -7,7 +7,7 @@ type ResponseObject = {
 };
 
 export const useBillableServices = () => {
-  const url = `/ws/rest/v1/cashier/billableService?v=custom:(uuid,name,shortName,serviceStatus,serviceType:(uuid,display),servicePrices:(uuid,name,paymentMode,price),concept:(uuid,display))`;
+  const url = `/ws/rest/v1/cashier/billableService?v=custom:(uuid,name,shortName,stockItem:(uuid, display),serviceStatus,serviceType:(uuid,display),servicePrices:(uuid,name,paymentMode,price),concept:(uuid,display))`;
   const { data, isLoading, isValidating, error, mutate } = useSWR<{ data: ResponseObject }>(url, openmrsFetch, {});
   return { billableServices: data?.data.results ?? [], isLoading, isValidating, error, mutate };
 };

package/src/billable-services/billiable-item/drug-order/drug-order.component.tsx

@@ -28,7 +28,6 @@ const DrugOrder: React.FC<DrugOrderProps> = ({ order }) => {
   if (isLoading || isLoadingInventory) {
     return null;
   }
-
   return (
     <div className={styles.drugOrderContainer}>
       {stockItem && stockItem.length > 0 ? (

package/src/billable-services/billiable-item/test-order/test-order-action.component.tsx

@@ -1,12 +1,14 @@
 import { InlineLoading, Button } from '@carbon/react';
-import { Order } from '@openmrs/esm-patient-common-lib';
 import React, { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useTestOrderBillStatus } from './test-order-action.resource';
-import { launchWorkspace, showModal } from '@openmrs/esm-framework';
 import { mutate } from 'swr';
-import styles from './test-order-action.scss';
+import { useOrderBill, useTestOrderBillStatus } from './test-order-action.resource';
+import { launchWorkspace, showModal } from '@openmrs/esm-framework';
+import { Order } from '@openmrs/esm-patient-common-lib';
 import { createMedicationDispenseProps } from './dispense.resource';
+import { useStockItemQuantity } from '../useBillableItem';
+import { useBillableServices } from '../../billable-service.resource';
+import styles from './test-order-action.scss';
 
 type TestOrderProps = {
   order?: Order;
@@ -32,9 +34,16 @@ const TestOrderAction: React.FC<TestOrderProps> = (props) => {
   const dispenseFormProps = isDispenseOrder ? createMedicationDispenseProps(props) : null;
   const orderUuid = order?.uuid ?? medicationRequestBundle?.request?.id;
   const patientUuid = order?.patient?.uuid ?? medicationRequestBundle?.request?.subject?.reference?.split('/')[1];
-
   const { isLoading, hasPendingPayment } = useTestOrderBillStatus(orderUuid, patientUuid);
-
+  const drugUuid = medicationRequestBundle?.request?.medicationReference?.reference?.split('/')[1];
+  const { billableServices } = useBillableServices();
+  const { stockItemQuantity, stockItemUuid } = useStockItemQuantity(drugUuid);
+  const billableItem =
+    billableServices?.filter((service) => {
+      const stockItem = service?.stockItem.split(':')[0];
+      return stockItem === stockItemUuid;
+    }) || [];
+  const { itemHasBill } = useOrderBill(patientUuid, orderUuid);
   // Handle modal close and revalidation
   const handleModalClose = useCallback(() => {
     mutate((key) => typeof key === 'string' && key.startsWith(additionalProps?.mutateUrl as string), undefined, {
@@ -43,6 +52,17 @@ const TestOrderAction: React.FC<TestOrderProps> = (props) => {
   }, [additionalProps?.mutateUrl]);
 
   const launchModal = useCallback(() => {
+    if (stockItemQuantity > 0 && itemHasBill.length < 1 && billableItem.length > 0) {
+      const disposeBill = showModal(modalName ?? 'create-bill-item-modal', {
+        closeModal: () => {
+          handleModalClose();
+          disposeBill();
+        },
+        medicationRequestBundle,
+      });
+      return;
+    }
+
     if (isDispenseOrder) {
       launchWorkspace('dispense-workspace', dispenseFormProps);
       return;
@@ -56,7 +76,18 @@ const TestOrderAction: React.FC<TestOrderProps> = (props) => {
       order,
       ...(additionalProps && { additionalProps }),
     });
-  }, [isDispenseOrder, modalName, order, additionalProps, dispenseFormProps, handleModalClose]);
+  }, [
+    isDispenseOrder,
+    modalName,
+    order,
+    additionalProps,
+    dispenseFormProps,
+    handleModalClose,
+    medicationRequestBundle,
+    stockItemQuantity,
+    billableItem.length,
+    itemHasBill.length,
+  ]);
 
   if (isLoading) {
     return (
@@ -70,18 +101,30 @@ const TestOrderAction: React.FC<TestOrderProps> = (props) => {
     return null;
   }
 
-  const buttonText = hasPendingPayment
-    ? t('unsettledBill', 'Unsettled bill')
-    : isDispenseOrder
-    ? actionText ?? t('dispense', 'Dispense')
-    : actionText ?? t('pickLabRequest', 'Pick Lab Request');
+  const buttonText = (() => {
+    if (hasPendingPayment) {
+      return t('unsettledBill', 'Unsettled bill');
+    }
+
+    if (stockItemQuantity < 1) {
+      return t('outOfStock', 'Out of Stock');
+    }
+
+    if (stockItemQuantity > 0 && itemHasBill.length === 0 && billableItem.length > 0) {
+      return t('bill', 'Bill');
+    }
+
+    return isDispenseOrder
+      ? actionText ?? t('dispense', 'Dispense')
+      : actionText ?? t('pickLabRequest', 'Pick Lab Request');
+  })();
 
   return (
     <Button
       kind="primary"
       className={!isDispenseOrder ? styles.actionButton : ''}
       size={!isDispenseOrder ? 'md' : ''}
-      disabled={hasPendingPayment}
+      disabled={hasPendingPayment || stockItemQuantity < 1}
       onClick={launchModal}>
       {buttonText}
     </Button>

package/src/billable-services/billiable-item/test-order/test-order-action.resource.tsx

@@ -9,7 +9,7 @@ export const useTestOrderBillStatus = (orderUuid: string, patientUuid: string) =
   const config = useConfig<BillingConfig>();
   const { currentVisit } = useVisit(patientUuid);
   const { isEmergencyPatient, isLoading: isLoadingQueue } = usePatientQueue(patientUuid);
-  const { isLoading: isLoadingBill, hasPendingPayment } = useOrderPendingPaymentStatus(patientUuid, orderUuid);
+  const { isLoading, hasPendingPayment } = useOrderPendingPaymentStatus(patientUuid, orderUuid);
 
   // We want to check if the payment method is in the excluded list this includes insurances, where patient do not need to pay immediately
   const isExcludedPaymentMethod = checkPaymentMethodExclusion(
@@ -18,7 +18,7 @@ export const useTestOrderBillStatus = (orderUuid: string, patientUuid: string) =
   );
 
   return useMemo(() => {
-    if (isLoadingBill || isLoadingQueue) {
+    if (isLoading || isLoadingQueue) {
       return { hasPendingPayment: false, isLoading: true };
     }
 
@@ -33,7 +33,7 @@ export const useTestOrderBillStatus = (orderUuid: string, patientUuid: string) =
     return { hasPendingPayment, isLoading: false };
   }, [
     isLoadingQueue,
-    isLoadingBill,
+    isLoading,
     currentVisit?.visitType?.uuid,
     config?.inPatientVisitTypeUuid,
     isExcludedPaymentMethod,
@@ -74,3 +74,14 @@ export const useOrderPendingPaymentStatus = (patientUuid: string, orderUuid: str
 
   return useMemo(() => ({ hasPendingPayment, isLoading, error }), [hasPendingPayment, isLoading, error]);
 };
+
+export const useOrderBill = (patientUuid: string, orderUuid: string) => {
+  const { patientBills, isLoading, error } = usePatientBills(patientUuid);
+  const itemHasBill = useMemo(() => {
+    return patientBills
+      ?.map((bill) => bill.lineItems)
+      .flat()
+      .filter((lineItem) => lineItem.order && lineItem.order.uuid === orderUuid);
+  }, [patientBills, orderUuid]);
+  return { itemHasBill };
+};

package/src/billable-services/billiable-item/test-order/test-order-action.test.tsx

@@ -6,8 +6,12 @@ import * as resource from './test-order-action.resource';
 import userEvent from '@testing-library/user-event';
 import { launchWorkspace, showModal } from '@openmrs/esm-framework';
 import { createMedicationDispenseProps } from './dispense.resource';
+import { useStockItemQuantity } from '../useBillableItem';
 
 jest.mock('./test-order-action.resource');
+jest.mock('../useBillableItem', () => ({
+  useStockItemQuantity: jest.fn(),
+}));
 
 const mockTestProps = {
   order: { uuid: '123', patient: { uuid: '456' } } as Order,
@@ -75,13 +79,31 @@ describe('TestOrderAction', () => {
   });
 
   test('should render loading when isLoading is true', () => {
-    jest.spyOn(resource, 'useTestOrderBillStatus').mockReturnValueOnce({ isLoading: true, hasPendingPayment: false });
+    jest.spyOn(resource, 'useTestOrderBillStatus').mockReturnValue({ isLoading: true, hasPendingPayment: false });
+    jest.spyOn(resource, 'useOrderBill').mockReturnValue({
+      itemHasBill: [],
+    });
+    (useStockItemQuantity as jest.Mock).mockReturnValue({
+      stockItemQuantity: 5,
+      stockItemUuid: 'some-uuid',
+      isLoading: false,
+      error: undefined,
+    });
     render(<TestOrderAction {...testProps} />);
     expect(screen.getByText('Verifying bill status...')).toBeInTheDocument();
   });
 
   test("should display `Unsettled bill for test` when there's a pending payment", () => {
     jest.spyOn(resource, 'useTestOrderBillStatus').mockReturnValueOnce({ isLoading: false, hasPendingPayment: true });
+    jest.spyOn(resource, 'useOrderBill').mockReturnValueOnce({
+      itemHasBill: [],
+    });
+    (useStockItemQuantity as jest.Mock).mockReturnValueOnce({
+      stockItemQuantity: 5,
+      stockItemUuid: 'some-uuid',
+      isLoading: false,
+      error: undefined,
+    });
     render(<TestOrderAction {...testProps} />);
     expect(screen.getByText('Unsettled bill')).toBeInTheDocument();
   });
@@ -89,6 +111,15 @@ describe('TestOrderAction', () => {
   test("should display `Pick Lab Request` when there's no pending payment", async () => {
     const user = userEvent.setup();
     jest.spyOn(resource, 'useTestOrderBillStatus').mockReturnValueOnce({ isLoading: false, hasPendingPayment: false });
+    jest.spyOn(resource, 'useOrderBill').mockReturnValueOnce({
+      itemHasBill: [],
+    });
+    (useStockItemQuantity as jest.Mock).mockReturnValueOnce({
+      stockItemQuantity: 5,
+      stockItemUuid: 'some-uuid',
+      isLoading: false,
+      error: undefined,
+    });
     render(<TestOrderAction {...testProps} />);
     const pickLabRequestMenuItem = screen.getByText('Pick Lab Request');
     await user.click(pickLabRequestMenuItem);
@@ -101,7 +132,16 @@ describe('TestOrderAction', () => {
   });
 
   test('should not render the dispense form if closeable is false', () => {
-    jest.spyOn(resource, 'useTestOrderBillStatus').mockReturnValueOnce({ isLoading: false, hasPendingPayment: false });
+    jest.spyOn(resource, 'useTestOrderBillStatus').mockReturnValue({ isLoading: false, hasPendingPayment: false });
+    jest.spyOn(resource, 'useOrderBill').mockReturnValue({
+      itemHasBill: [],
+    });
+    (useStockItemQuantity as jest.Mock).mockReturnValue({
+      stockItemQuantity: 5,
+      stockItemUuid: 'some-uuid',
+      isLoading: false,
+      error: undefined,
+    });
     render(<TestOrderAction {...testProps} closeable={false} />);
     expect(screen.queryByText('Dispense')).not.toBeInTheDocument();
   });
@@ -109,6 +149,15 @@ describe('TestOrderAction', () => {
   test('should launch the dispense form when dispense order is part of props', async () => {
     const user = userEvent.setup();
     jest.spyOn(resource, 'useTestOrderBillStatus').mockReturnValueOnce({ isLoading: false, hasPendingPayment: false });
+    jest.spyOn(resource, 'useOrderBill').mockReturnValueOnce({
+      itemHasBill: [],
+    });
+    (useStockItemQuantity as jest.Mock).mockReturnValueOnce({
+      stockItemQuantity: 5,
+      stockItemUuid: 'some-uuid',
+      isLoading: false,
+      error: undefined,
+    });
     render(<TestOrderAction {...mockTestProps} />);
     const dispenseButton = screen.getByRole('button', { name: 'Dispense' });
     expect(dispenseButton).toBeInTheDocument();

package/src/billable-services/billiable-item/useBillableItem.tsx

@@ -39,10 +39,25 @@ export const useSockItemInventory = (stockItemId: string) => {
   const { data, error, isLoading } = useSWR<{
     data: { results: Array<{ quantityUoM: string; quantity: number; partyName: string }> };
   }>(url, openmrsFetch);
-
   return {
     stockItem: (data?.data?.results as Array<any>) ?? [],
     isLoading: isLoading,
     error,
   };
 };
+
+export const useStockItemQuantity = (drugUuid: string) => {
+  const url = `/ws/rest/v1/stockmanagement/stockiteminventory?v=default&limit=10&totalCount=true&drugUuid=${drugUuid}`;
+  const { data, error, isLoading } = useSWR<{
+    data: {
+      results: Array<{ quantityUoM: string; quantity: number; partyName: string; stockItemUuid: string }>;
+      total: number;
+    };
+  }>(url, openmrsFetch);
+  return {
+    stockItemQuantity: data?.data?.total ?? 0,
+    stockItemUuid: data?.data?.results[0]?.stockItemUuid ?? '',
+    isLoading: isLoading,
+    error,
+  };
+};

package/src/billing.resource.ts

@@ -275,6 +275,7 @@ export const billingFormSchema = z.object({
         priceName: z.string().optional().default('Default'),
         priceUuid: z.string().uuid(),
         lineItemOrder: z.number().optional().default(0),
+        order: z.string().optional().default(''),
         paymentStatus: z.enum(['PENDING']),
       }),
     )

package/src/index.ts

@@ -1,4 +1,4 @@
-import { defineConfigSchema, getSyncLifecycle, registerFeatureFlag } from '@openmrs/esm-framework';
+import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle, registerFeatureFlag } from '@openmrs/esm-framework';
 import { createDashboardGroup, createDashboardLink } from '@openmrs/esm-patient-common-lib';
 import BenefitsPackage from './benefits-package/benefits-package.component';
 import Benefits from './benefits-package/benefits/benefits.component';
@@ -12,6 +12,7 @@ import WaiveBillActionButton from './billable-services/bill-manager/bill-actions
 import { DeleteBillModal } from './billable-services/bill-manager/modals/delete-bill.modal';
 import { RefundBillModal } from './billable-services/bill-manager/modals/refund-bill.modal';
 import { DeleteBillableServiceModal } from './billable-services/bill-manager/modals/serviceItemCard.component';
+import CreateBillItemModal from './billable-services/bill-manager/modals/create-bill-item-modal.component';
 import CancelBillWorkspace from './billable-services/bill-manager/workspaces/cancel-bill/cancel-bill.workspace';
 import { EditBillForm } from './billable-services/bill-manager/workspaces/edit-bill/edit-bill-form.workspace';
 import { WaiveBillForm } from './billable-services/bill-manager/workspaces/waive-bill/waive-bill-form.workspace';
@@ -156,6 +157,7 @@ export const root = getSyncLifecycle(rootComponent, options);
 export const billingPatientSummary = getSyncLifecycle(BillHistory, options);
 export const billingCheckInForm = getSyncLifecycle(BillingCheckInForm, options);
 export const deleteBillableServiceModal = getSyncLifecycle(DeleteBillableServiceModal, options);
+export const createBillItemModal = getSyncLifecycle(CreateBillItemModal, options);
 
 export const billingForm = getSyncLifecycle(BillingForm, options);
 export const requirePaymentModal = getSyncLifecycle(RequirePaymentModal, options);

package/src/routes.json

@@ -302,6 +302,10 @@
     {
       "name": "clock-in-modal",
       "component": "clockIn"
+    },
+    {
+      "name": "create-bill-item-modal",
+      "component": "createBillItemModal"
     }
   ]
 }

package/translations/en.json

@@ -22,6 +22,7 @@
   "attributeRetired": "Attribute retired",
   "attributeRetiredReason": "Attribute retired reason",
   "benefits": "Benefits",
+  "bill": "Bill",
   "billableExemptionAdministration": "Exemption Administration",
   "billableServicesError": "Billable services error",
   "billAmount": "Bill Amount",
@@ -176,6 +177,7 @@
   "noTransactionHistory": "No transaction history",
   "noTransactionHistorySubtitle": "No transaction history loaded for the selected filters",
   "notSearchedState": "Please search for a patient in the input above",
+  "outOfStock": "Out of Stock",
   "overflowMenu": "Overflow menu",
   "overPayment": "Over payment",
   "overPaymentSubtitle": "Amount paid {{totalAmountTendered}} should not be greater than amount due {{selectedLineItemsAmountDue}} for selected line items",