@kenyaemr/esm-billing-app 5.4.1-pre.1801 → 5.4.1-pre.1821

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.1801"}
+{"$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.1821"}

package/package.json

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

package/src/benefits-package/forms/package-interventions.component.tsx

@@ -1,9 +1,9 @@
+import React from 'react';
 import { InlineLoading, InlineNotification, MultiSelect } from '@carbon/react';
-import React, { useEffect, useState } from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { z } from 'zod';
-import { InterventionsFilter, toQueryParams, useInterventions } from '../../hooks/useInterventions';
+import { InterventionsFilter, useInterventions } from '../../hooks/useInterventions';
 import { eligibilityRequestShema } from '../benefits-package.resources';
 import { usePatient } from '@openmrs/esm-framework';
 
@@ -14,25 +14,16 @@ type PackageInterventionsProps = {
   patientUuid: string;
 };
 const PackageInterventions: React.FC<PackageInterventionsProps> = ({ category, patientUuid }) => {
-  const [filters, setFilters] = useState<InterventionsFilter>({ package_code: category });
   const { error: patientError, isLoading: isPatientLoading, patient } = usePatient(patientUuid);
+  const filters: InterventionsFilter = {
+    package_code: category,
+    applicable_gender: patient?.gender === 'male' ? 'MALE' : 'FEMALE',
+  };
   const { error, interventions, isLoading } = useInterventions(filters);
 
   const form = useFormContext<EligibilityRequest>();
   const { t } = useTranslation();
 
-  useEffect(() => {
-    setFilters((state) => ({
-      ...state,
-      package_code: category,
-      applicable_gender: patient?.gender === 'male' ? 'MALE' : patient?.gender === 'female' ? 'FEMALE' : undefined,
-    }));
-  }, [category, patient]);
-
-  useEffect(() => {
-    form.setValue('interventions', []);
-  }, [category]);
-
   if (isLoading || isPatientLoading) {
     return (
       <InlineLoading
@@ -56,6 +47,10 @@ const PackageInterventions: React.FC<PackageInterventionsProps> = ({ category, p
     );
   }
 
+  if (interventions.length === 0) {
+    return null;
+  }
+
   return (
     <Controller
       control={form.control}
@@ -71,7 +66,7 @@ const PackageInterventions: React.FC<PackageInterventionsProps> = ({ category, p
             field.onChange(e.selectedItems);
           }}
           initialSelectedItems={field.value}
-          label="Choose option"
+          label={t('chooseInterventions', 'Choose interventions')}
           items={interventions.map((r) => r.interventionCode)}
           itemToString={(item) => interventions.find((r) => r.interventionCode === item)?.interventionName ?? ''}
         />

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/bill-manager/modals/refund-bill.modal.tsx

@@ -71,7 +71,7 @@ export const RefundBillModal: React.FC<RefundBillModalProps> = ({ onClose, bill,
     } finally {
       setIsLoading(false);
     }
-  }, [bill, lineItem, onClose, t]);
+  }, [bill, lineItem, onClose, t, billableServiceUuid, itemUuid]);
 
   return (
     <>

package/src/billable-services/bill-manager/workspaces/edit-bill/edit-bill-form.workspace.tsx

@@ -60,7 +60,7 @@ export const EditBillForm: React.FC<EditBillFormProps> = ({
 
   useEffect(() => {
     promptBeforeClosing(() => isDirty);
-  }, [isDirty]);
+  }, [isDirty, promptBeforeClosing]);
 
   const onSubmit: SubmitHandler<EditBillFormData> = async (formData) => {
     const updateBill = createEditBillPayload(lineItem, formData, bill, formData.adjustmentReason);

package/src/billable-services/bill-manager/workspaces/waive-bill/waive-bill-form.workspace.tsx

@@ -89,7 +89,7 @@ export const WaiveBillForm: React.FC<BillWaiverFormProps> = ({
 
   useEffect(() => {
     promptBeforeClosing(() => isDirty);
-  }, [isDirty]);
+  }, [isDirty, promptBeforeClosing]);
 
   if (lineItems?.length === 0) {
     return null;

package/src/billable-services/billable-exemptions/billable-exemptions-viewer.component.tsx

@@ -62,17 +62,20 @@ export const BillableExemptionsViewer = () => {
         setInvalidJsonErrorMessage(t('invalidJsonError', 'Invalid JSON input.'));
       }
     },
-    [resetErrorMessage],
+    [resetErrorMessage, t],
   );
 
-  const updateSchema = useCallback((updatedSchema: Schema) => {
-    try {
-      setSchema(updatedSchema);
-      setStringifiedSchema(JSON.stringify(updatedSchema, null, 2));
-    } catch (error) {
-      setInvalidJsonErrorMessage(t('saveError', 'Failed to save schema.'));
-    }
-  }, []);
+  const updateSchema = useCallback(
+    (updatedSchema: Schema) => {
+      try {
+        setSchema(updatedSchema);
+        setStringifiedSchema(JSON.stringify(updatedSchema, null, 2));
+      } catch (error) {
+        setInvalidJsonErrorMessage(t('saveError', 'Failed to save schema.'));
+      }
+    },
+    [t],
+  );
 
   useEffect(() => {
     if (billableExceptionSchema) {

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/billables/commodity/commodity-form.workspace.tsx

@@ -52,7 +52,7 @@ const CommodityForm: React.FC<CommodityFormProps> = ({
     if (initialValues) {
       trigger();
     }
-  }, [initialValues]);
+  }, [initialValues, trigger]);
 
   const onSubmit = async (formValues: BillableFormSchema) => {
     const payload = formatBillableServicePayloadForSubmission(formValues, initialValues?.['uuid']);

package/src/billable-services/billables/services/service-form.workspace.tsx

@@ -66,7 +66,7 @@ const AddServiceForm: React.FC<AddServiceFormProps> = ({
       setConceptToLookup(initialValues.concept?.concept?.display);
       trigger();
     }
-  }, [initialValues]);
+  }, [initialValues, trigger]);
 
   const {
     fields: servicePriceFields,

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 };
+};