@kenyaemr/esm-billing-app 5.4.1-pre.1957 → 5.4.1-pre.1966

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":"order-action-button","component":"orderActionButton","slot":"prescription-action-button-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.1957"}
+{"$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":"order-action-button","component":"orderActionButton","slots":["prescription-action-button-slot","imaging-orders-action","procedure-orders-action","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":"create-bill-workspace","component":"createBillWorkspace","title":"Create Bill Workspace","type":"other-form"},{"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.1966"}

package/package.json

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

package/src/billable-services/bill-manager/workspaces/create-bill/create-bill.style.scss

@@ -0,0 +1,40 @@
+@use '@carbon/colors';
+@use '@carbon/layout';
+@use '@carbon/type';
+
+.form {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  height: 100%;
+}
+
+.formContainer {
+  display: flex;
+  flex-direction: column;
+  margin: layout.$spacing-05;
+  row-gap: layout.$spacing-03;
+}
+
+.formField {
+  margin-bottom: layout.$spacing-05;
+  @include type.type-style('label-02');
+  color: colors.$gray-70;
+}
+
+.button {
+  height: layout.$spacing-10;
+  display: flex;
+  align-content: flex-start;
+  align-items: baseline;
+  min-width: 50%;
+}
+
+.tablet {
+  padding: layout.$spacing-06 layout.$spacing-05;
+  background-color: colors.$white-0;
+}
+
+.desktop {
+  padding: 0;
+}

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

@@ -0,0 +1,158 @@
+import React, { useEffect } from 'react';
+import { Dropdown, Button, ButtonSet, Form, InlineLoading, InlineNotification } from '@carbon/react';
+import { type Order } from '@openmrs/esm-patient-common-lib';
+import { useBillableItem } from '../../../billiable-item/useBillableItem';
+import styles from './create-bill.style.scss';
+import { Controller, useForm } from 'react-hook-form';
+import {
+  type DefaultWorkspaceProps,
+  ResponsiveWrapper,
+  restBaseUrl,
+  useConfig,
+  useLayoutType,
+} from '@openmrs/esm-framework';
+import { useTranslation } from 'react-i18next';
+import classNames from 'classnames';
+import { convertToCurrency } from '../../../../helpers';
+import { BillingConfig } from '../../../../config-schema';
+import { z } from 'zod';
+import { processBillItems } from '../../../../billing.resource';
+import { mutate } from 'swr';
+
+type CreateBillWorkspaceProps = DefaultWorkspaceProps & {
+  patientUuid: string;
+  order: Order;
+};
+
+const createBillFormSchema = z.object({
+  id: z.string().min(1),
+  text: z.string().min(1),
+  unitPrice: z.string().min(1),
+});
+
+type CreateBillFormSchema = z.infer<typeof createBillFormSchema>;
+
+const CreateBillWorkspace: React.FC<CreateBillWorkspaceProps> = ({
+  patientUuid,
+  order,
+  closeWorkspace,
+  closeWorkspaceWithSavedChanges,
+  promptBeforeClosing,
+}) => {
+  const { t } = useTranslation();
+  const defaultPaymentStatus = 'PENDING';
+  const isTablet = useLayoutType() === 'tablet';
+  const { cashPointUuid, cashierUuid } = useConfig<BillingConfig>();
+  const { billableItem, isLoading } = useBillableItem(order.concept.uuid);
+
+  const comboBoxItems =
+    billableItem?.servicePrices?.map((item) => ({
+      id: item.uuid,
+      text: `${item.paymentMode.name} - ${convertToCurrency(item.price)}`,
+      unitPrice: item.price,
+    })) ?? [];
+
+  const createBillForm = useForm<CreateBillFormSchema>({
+    defaultValues: {
+      id: '',
+      text: '',
+      unitPrice: '0',
+    },
+  });
+
+  const {
+    handleSubmit,
+    formState: { isValid, isDirty, isSubmitting, errors },
+  } = createBillForm;
+
+  const handleCreateBill = async (formData: CreateBillFormSchema) => {
+    const unitPrice = parseFloat(formData.unitPrice);
+    const createBillPayload = {
+      cashPoint: cashPointUuid,
+      cashier: cashierUuid,
+      patient: patientUuid,
+      status: 'PENDING',
+      lineItems: [
+        {
+          billableService: billableItem?.uuid,
+          lineItemOrder: 0,
+          quantity: 1,
+          price: unitPrice,
+          paymentStatus: defaultPaymentStatus,
+          priceUuid: '',
+          priceName: formData.text,
+          order: order.uuid,
+        },
+      ],
+      payments: [],
+    };
+    await processBillItems(createBillPayload);
+    mutate((key) => typeof key === 'string' && key.startsWith(`${restBaseUrl}/cashier/bill`), undefined, {
+      revalidate: true,
+    });
+    closeWorkspaceWithSavedChanges();
+  };
+
+  useEffect(() => {
+    if (isDirty) {
+      promptBeforeClosing(() => true);
+    }
+  }, [isDirty, promptBeforeClosing]);
+
+  return (
+    <Form className={styles.form} onSubmit={handleSubmit(handleCreateBill)}>
+      <div className={styles.formContainer}>
+        <ResponsiveWrapper>
+          <InlineNotification
+            aria-label="closes notification"
+            kind="info"
+            lowContrast
+            statusIconDescription="notification"
+            subtitle={t('createBillForOrder', 'Create bill for order {{order}} by selecting the correct unit price', {
+              order: order.concept.display,
+            })}
+            title={t('orderBillCreation', 'Order Bill Creation {{orderNumber}}', { orderNumber: order.orderNumber })}
+          />
+        </ResponsiveWrapper>
+        <ResponsiveWrapper>
+          <Controller
+            control={createBillForm.control}
+            name="unitPrice"
+            render={({ field }) => (
+              <Dropdown
+                {...field}
+                onChange={({ selectedItem }) => {
+                  field.onChange(selectedItem?.unitPrice?.toString() || '');
+                  createBillForm.setValue('id', selectedItem?.id || '');
+                  createBillForm.setValue('text', selectedItem?.text || '');
+                }}
+                id="unit-price"
+                itemToString={(item) => item?.text || ''}
+                items={comboBoxItems}
+                label={t('selectUnitPrice', 'Select Unit Price')}
+                titleText={t('unitPrice', 'Unit Price')}
+                type="default"
+                invalid={!!errors.unitPrice}
+                invalidText={errors.unitPrice?.message}
+              />
+            )}
+          />
+        </ResponsiveWrapper>
+      </div>
+      <ButtonSet className={classNames({ [styles.tablet]: isTablet, [styles.desktop]: !isTablet })}>
+        <Button className={styles.button} kind="secondary" onClick={closeWorkspace}>
+          {t('cancel', 'Cancel')}
+        </Button>
+        <Button className={styles.button} disabled={!isValid || !isDirty || isSubmitting} kind="primary" type="submit">
+          {isSubmitting ? (
+            <InlineLoading className={styles.spinner} description={t('creatingBill', 'Creating bill...')} />
+          ) : (
+            <span>{t('saveAndClose', 'Save & close')}</span>
+          )}
+        </Button>
+      </ButtonSet>
+    </Form>
+  );
+};
+
+export default CreateBillWorkspace;

package/src/billable-services/billiable-item/order-actions/components/{lab-order-button.component.tsx → generic-button.component.tsx}

@@ -1,39 +1,52 @@
 import React, { useCallback } from 'react';
-import { showModal } from '@openmrs/esm-framework';
+import { launchWorkspace, showModal } from '@openmrs/esm-framework';
 import { Order } from '@openmrs/esm-patient-common-lib';
 import { BaseOrderButton } from './base-order-button.component';
 import { useLabOrderAction } from '../hooks/useLabOrderAction';
 import { useModalHandler } from '../hooks/useModalHandler';
 import styles from '../styles/order-action.scss';
 
-export interface LabOrderButtonProps {
+export interface GenericOrderButtonProps {
   order?: Order;
   modalName?: string;
   additionalProps?: Record<string, unknown>;
   actionText?: string;
 }
 
-export const LabOrderButton: React.FC<LabOrderButtonProps> = ({
+export const GenericOrderButton: React.FC<GenericOrderButtonProps> = ({
   order,
-  modalName = 'pickup-lab-request-modal',
+  modalName,
   additionalProps,
   actionText,
 }) => {
-  const { isLoading, isDisabled, buttonText: defaultButtonText, isInProgress } = useLabOrderAction(order);
+  const {
+    isLoading,
+    isDisabled,
+    buttonText: defaultButtonText,
+    isInProgress,
+    shouldShowBillModal,
+  } = useLabOrderAction(order);
 
   const { handleModalClose } = useModalHandler(additionalProps?.mutateUrl as string);
-  const buttonText = actionText ?? defaultButtonText;
+  const buttonText = defaultButtonText ?? actionText;
 
   const launchModal = useCallback(() => {
-    const dispose = showModal(modalName, {
-      closeModal: () => {
-        handleModalClose();
-        dispose();
-      },
-      order,
-      ...(additionalProps && { additionalProps }),
-    });
-  }, [modalName, order, additionalProps, handleModalClose]);
+    if (shouldShowBillModal) {
+      launchWorkspace('create-bill-workspace', {
+        order,
+        patientUuid: order?.patient?.uuid,
+      });
+    } else {
+      const dispose = showModal(modalName, {
+        closeModal: () => {
+          handleModalClose();
+          dispose();
+        },
+        order,
+        ...(additionalProps && { additionalProps }),
+      });
+    }
+  }, [modalName, order, additionalProps, handleModalClose, shouldShowBillModal]);
 
   if (isInProgress) {
     return null;

package/src/billable-services/billiable-item/order-actions/components/medication-order-button.component.tsx

@@ -37,14 +37,10 @@ export const MedicationOrderButton: React.FC<MedicationOrderButtonProps> = ({
 
   const { handleModalClose } = useModalHandler(additionalProps?.mutateUrl as string);
   const buttonText = actionText ?? defaultButtonText;
-
   const launchModal = useCallback(() => {
     if (shouldShowBillModal) {
-      const disposeBill = showModal(modalName ?? 'create-bill-item-modal', {
-        closeModal: () => {
-          handleModalClose();
-          disposeBill();
-        },
+      launchWorkspace('create-bill-workspace', {
+        patientUuid,
         medicationRequestBundle,
       });
       return;

package/src/billable-services/billiable-item/order-actions/components/order-action-button.component.tsx

@@ -1,8 +1,17 @@
 import React from 'react';
-import { LabOrderButton } from './lab-order-button.component';
+import { GenericOrderButton } from './generic-button.component';
 import { MedicationOrderButton } from './medication-order-button.component';
+const ORDER_TYPE = {
+  MEDICATION: 'Medication',
+  LAB: 'Test Order',
+  // For Procedure and Imaging Order types we use concept classes to differentiate them,
+  // we can use the concept class to determine which button to show
+  PROCEDURE: '8d490bf4-c2cc-11de-8d13-0010c6dffd0f',
+  IMAGING: '8caa332c-efe4-4025-8b18-3398328e1323',
+};
 
 const OrderActionButton: React.FC<Record<string, any>> = (props) => {
+  const conceptClass = props?.order?.concept?.conceptClass?.uuid;
   if (Object.hasOwn(props, 'medicationRequestBundle')) {
     const { medicationRequestBundle, modalName, additionalProps, actionText, closeable } = props;
     return (
@@ -16,10 +25,40 @@ const OrderActionButton: React.FC<Record<string, any>> = (props) => {
     );
   }
 
-  if (props.orderType === 'lab') {
+  if (props.order?.orderType?.name === ORDER_TYPE.LAB) {
+    const { order, modalName, additionalProps, actionText } = props;
+    return (
+      <GenericOrderButton
+        order={order}
+        modalName={modalName}
+        additionalProps={additionalProps}
+        actionText={actionText}
+      />
+    );
+  }
+
+  if (conceptClass === ORDER_TYPE.PROCEDURE) {
+    const { order, modalName, additionalProps, actionText } = props;
+
+    return (
+      <GenericOrderButton
+        order={order}
+        modalName={modalName}
+        additionalProps={additionalProps}
+        actionText={actionText}
+      />
+    );
+  }
+
+  if (conceptClass === ORDER_TYPE.IMAGING) {
     const { order, modalName, additionalProps, actionText } = props;
     return (
-      <LabOrderButton order={order} modalName={modalName} additionalProps={additionalProps} actionText={actionText} />
+      <GenericOrderButton
+        order={order}
+        modalName={modalName}
+        additionalProps={additionalProps}
+        actionText={actionText}
+      />
     );
   }
 

package/src/billable-services/billiable-item/order-actions/hooks/useLabOrderAction.ts

@@ -10,18 +10,31 @@ export function useLabOrderAction(order?: Order) {
   const { t } = useTranslation();
   const orderUuid = order?.uuid;
   const patientUuid = order?.patient?.uuid;
+  const conceptClass = order?.concept?.conceptClass?.['display'];
 
-  const { isLoading, hasPendingPayment } = useBillStatus(orderUuid, patientUuid);
-
+  const { isLoading, hasPendingPayment, itemHasBill } = useBillStatus(orderUuid, patientUuid);
+  const shouldShowBillModal = itemHasBill.length < 1;
   const isInProgress = order?.fulfillerStatus === FulfillerStatus.IN_PROGRESS;
-  const buttonText = hasPendingPayment ? t('unsettledBill', 'Unsettled bill') : t('pickLabRequest', 'Pick Lab Request');
+
+  const getButtonText = () => {
+    if (hasPendingPayment) {
+      return t('unsettledBill', 'Unsettled bill');
+    }
+
+    if (shouldShowBillModal) {
+      return t('bill', 'Bill');
+    }
+
+    return t('pickLabRequest', 'Pick {{orderType}} Request', { orderType: conceptClass ?? 'Lab' });
+  };
 
   return {
     isLoading,
     isDisabled: hasPendingPayment,
-    buttonText,
+    buttonText: getButtonText(),
     isInProgress,
     orderUuid,
     patientUuid,
+    shouldShowBillModal,
   };
 }

package/src/index.ts

@@ -42,6 +42,7 @@ import { ClockOut } from './payment-points/payment-point/clock-out.modal';
 import RequirePaymentModal from './prompt-payment/prompt-payment-modal.component';
 import rootComponent from './root.component';
 import OrderActionButton from './billable-services/billiable-item/order-actions/components/order-action-button.component';
+import CreateBillWorkspace from './billable-services/bill-manager/workspaces/create-bill/create-bill.workspace';
 
 const moduleName = '@kenyaemr/esm-billing-app';
 
@@ -158,6 +159,7 @@ 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 createBillWorkspace = getSyncLifecycle(CreateBillWorkspace, options);
 
 export const billingForm = getSyncLifecycle(BillingForm, options);
 export const requirePaymentModal = getSyncLifecycle(RequirePaymentModal, options);

package/src/routes.json

@@ -137,7 +137,12 @@
     {
       "name": "order-action-button",
       "component": "orderActionButton",
-      "slot": "prescription-action-button-slot",
+      "slots": [
+        "prescription-action-button-slot",
+        "imaging-orders-action",
+        "procedure-orders-action",
+        "tests-ordered-actions-slot"
+      ],
       "order": 0
     },
     {
@@ -230,6 +235,12 @@
     }
   ],
   "workspaces": [
+    {
+      "name": "create-bill-workspace",
+      "component": "createBillWorkspace",
+      "title": "Create Bill Workspace",
+      "type": "other-form"
+    },
     {
       "name": "waive-bill-form",
       "component": "waiveBillForm",