@kenyaemr/esm-billing-app 5.4.1-pre.2075 → 5.4.1-pre.2077

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

@@ -1,24 +1,20 @@
 import React, { useCallback } from 'react';
 import { Edit } from '@carbon/react/icons';
-import { showModal, launchWorkspace } from '@openmrs/esm-framework';
+import { launchWorkspace } from '@openmrs/esm-framework';
 import { BaseOrderButton } from './base-order-button.component';
 import { useMedicationOrderAction, useOrderByUuid } from '../hooks/useMedicationOrderAction';
-import { launchPrescriptionEditWorkspace, useModalHandler } from '../hooks/useModalHandler';
+import { launchPrescriptionEditWorkspace } from '../hooks/useModalHandler';
 import { useTranslation } from 'react-i18next';
 export interface MedicationOrderButtonProps {
   medicationRequestBundle?: {
     request: fhir.MedicationRequest;
   };
-  modalName?: string;
-  additionalProps?: Record<string, unknown>;
   actionText?: string;
   closeable?: boolean;
 }
 
 export const MedicationOrderButton: React.FC<MedicationOrderButtonProps> = ({
   medicationRequestBundle,
-  modalName,
-  additionalProps,
   actionText,
   closeable = true,
 }) => {
@@ -35,14 +31,13 @@ export const MedicationOrderButton: React.FC<MedicationOrderButtonProps> = ({
   const { data: order, isLoading: isOrderLoading } = useOrderByUuid(medicationRequestBundle?.request?.id);
   const isLoading = isMedicationOrderLoading && isOrderLoading;
 
-  const { handleModalClose } = useModalHandler(additionalProps?.mutateUrl as string);
   const buttonText = actionText ?? defaultButtonText;
   const launchModal = useCallback(() => {
     if (shouldShowBillModal) {
-      const dispose = showModal('create-bill-item-modal', {
-        patientUuid,
+      launchWorkspace('create-bill-workspace', {
+        order,
+        patientUuid: order?.patient?.uuid,
         medicationRequestBundle,
-        closeModal: () => dispose(),
       });
       return;
     }
@@ -50,7 +45,7 @@ export const MedicationOrderButton: React.FC<MedicationOrderButtonProps> = ({
     if (dispenseFormProps) {
       launchWorkspace('dispense-workspace', dispenseFormProps);
     }
-  }, [shouldShowBillModal, medicationRequestBundle, dispenseFormProps, patientUuid]);
+  }, [shouldShowBillModal, medicationRequestBundle, dispenseFormProps, patientUuid, order]);
 
   if (!closeable) {
     return null;

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

@@ -13,12 +13,10 @@ const ORDER_TYPE = {
 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;
+    const { medicationRequestBundle, actionText, closeable } = props;
     return (
       <MedicationOrderButton
         medicationRequestBundle={medicationRequestBundle}
-        modalName={modalName}
-        additionalProps={additionalProps}
         actionText={actionText}
         closeable={closeable}
       />
@@ -26,15 +24,8 @@ const OrderActionButton: React.FC<Record<string, any>> = (props) => {
   }
 
   if (props.order?.orderType?.name === ORDER_TYPE.LAB) {
-    const { order, modalName, additionalProps, actionText } = props;
-    return (
-      <GenericOrderButton
-        order={order}
-        modalName={modalName}
-        additionalProps={additionalProps}
-        actionText={actionText}
-      />
-    );
+    const { order, actionText } = props;
+    return <GenericOrderButton order={order} actionText={actionText} />;
   }
 
   if (conceptClass === ORDER_TYPE.PROCEDURE) {

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

@@ -22,8 +22,11 @@ export function useMedicationOrderAction(medicationRequestBundle?: MedicationReq
 
   const billableItem =
     billableServices?.filter((service) => {
-      const stockItem = service?.stockItem.split(':')[0];
-      return stockItem === stockItemUuid;
+      if (service?.stockItem !== null && service?.stockItem !== undefined) {
+        const serviceStockItemUuid = service?.stockItem?.uuid;
+        return serviceStockItemUuid === stockItemUuid;
+      }
+      return false;
     }) || [];
   const billableItemServiceStatus = billableItem.some((item) => item.serviceStatus === 'DISABLED');
 

package/src/index.ts

@@ -1,9 +1,30 @@
-import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle, registerFeatureFlag } from '@openmrs/esm-framework';
+import { defineConfigSchema, getSyncLifecycle, registerFeatureFlag } from '@openmrs/esm-framework';
 import { createDashboardGroup, createDashboardLink } from '@openmrs/esm-patient-common-lib';
+
+import { configSchema } from './config-schema';
+import { benefitsPackageDashboardMeta, dashboardMeta } from './dashboard.meta';
+const moduleName = '@kenyaemr/esm-billing-app';
+const options = {
+  featureName: 'billing',
+  moduleName,
+};
+
+// Dashboard and Navigation Components
+import { createLeftPanelLink } from './left-panel-link.component';
+import rootComponent from './root.component';
+
+// Billing Core Components
+import BillingForm from './billing-form/billing-form.component';
+import BillingCheckInForm from './billing-form/billing-checkin-form.component';
+import BillHistory from './bill-history/bill-history.component';
+import BillDepositWorkspace from './billing-form/bill-deposit/bill-deposit.workspace';
+
+// Benefits Package Components
 import BenefitsPackage from './benefits-package/benefits-package.component';
 import Benefits from './benefits-package/benefits/benefits.component';
 import BenefitPreAuthForm from './benefits-package/forms/benefit-pre-auth-form.workspace';
-import BillHistory from './bill-history/bill-history.component';
+
+// Bill Manager Components
 import CancelLineItem from './billable-services/bill-manager/bill-actions/cancel-line-item.component';
 import DeleteBillActionButton from './billable-services/bill-manager/bill-actions/delete-bill-action-button.component';
 import EditLineItem from './billable-services/bill-manager/bill-actions/edit-line-item.component';
@@ -12,48 +33,45 @@ 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/delete-billable-service.modal';
-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';
+import CreateBillWorkspace from './billable-services/bill-manager/workspaces/create-bill/create-bill.workspace';
+
+// Billable Services Components
 import CommodityForm from './billable-services/billables/commodity/commodity-form.workspace';
 import AddServiceForm from './billable-services/billables/services/service-form.workspace';
+import { BulkImportBillableServices } from './billable-services/bulk-import-billable-service.modal';
+
+// Order Components
 import DrugOrder from './billable-services/billiable-item/drug-order/drug-order.component';
 import ImagingOrder from './billable-services/billiable-item/test-order/imaging-order.component';
 import LabOrder from './billable-services/billiable-item/test-order/lab-order.component';
 import PriceInfoOrder from './billable-services/billiable-item/test-order/price-info-order.componet';
 import ProcedureOrder from './billable-services/billiable-item/test-order/procedure-order.component';
-import { BulkImportBillableServices } from './billable-services/bulk-import-billable-service.modal';
-import BillingCheckInForm from './billing-form/billing-checkin-form.component';
-import BillingForm from './billing-form/billing-form.component';
+import OrderActionButton from './billable-services/billiable-item/order-actions/components/order-action-button.component';
+
+// Claims Management Components
 import ClaimsManagementOverview from './claims/claims-management/main/claims-overview-main.component';
 import { RetryClaimRequest } from './claims/claims-management/table/retry-claim-request.modal';
-import { configSchema } from './config-schema';
-import { benefitsPackageDashboardMeta, dashboardMeta } from './dashboard.meta';
+
+// Payment Components
 import InitiatePaymentDialog from './invoice/payments/initiate-payment/initiate-payment.component';
 import VisitAttributeTags from './invoice/payments/visit-tags/visit-attribute.component';
 import ReceiptPrintPreviewModal from './invoice/print-bill-receipt/receipt-print-preview.modal';
-import { createLeftPanelLink } from './left-panel-link.component';
 import DeletePaymentModeModal from './payment-modes/delete-payment-mode.modal';
 import PaymentModeWorkspace from './payment-modes/payment-mode.workspace';
+import RequirePaymentModal from './prompt-payment/prompt-payment-modal.component';
+
+// Payment Points Components
 import { CreatePaymentPoint } from './payment-points/create-payment-point.component';
 import { ClockIn } from './payment-points/payment-point/clock-in.modal';
 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';
-import BillDepositWorkspace from './billing-form/bill-deposit/bill-deposit.workspace';
-
-const moduleName = '@kenyaemr/esm-billing-app';
-
-const options = {
-  featureName: 'billing',
-  moduleName,
-};
 
+// Translation
 export const importTranslation = require.context('../translations', false, /.json$/, 'lazy');
 
+// Dashboard Links
 export const billingSummaryDashboardLink = getSyncLifecycle(
   createDashboardLink({ ...dashboardMeta, icon: '', moduleName }),
   options,
@@ -68,6 +86,7 @@ export const billingDashboardLink = getSyncLifecycle(
   options,
 );
 
+// Navigation Links
 export const billingOverviewLink = getSyncLifecycle(
   createLeftPanelLink({
     name: '',
@@ -123,6 +142,8 @@ export const chargeableItemsLink = getSyncLifecycle(
   }),
   options,
 );
+
+// Claims Management Links
 export const claimsManagementSideNavGroup = getSyncLifecycle(
   createDashboardGroup({
     title: 'Claims Management',
@@ -131,6 +152,7 @@ export const claimsManagementSideNavGroup = getSyncLifecycle(
   }),
   options,
 );
+
 export const claimsManagementOverviewDashboardLink = getSyncLifecycle(
   createLeftPanelLink({
     name: 'claims-overview',
@@ -138,6 +160,7 @@ export const claimsManagementOverviewDashboardLink = getSyncLifecycle(
   }),
   options,
 );
+
 export const preAuthRequestsDashboardLink = getSyncLifecycle(
   createLeftPanelLink({
     name: 'preauth-requests',
@@ -145,7 +168,6 @@ export const preAuthRequestsDashboardLink = getSyncLifecycle(
   }),
   options,
 );
-export const claimsOverview = getSyncLifecycle(ClaimsManagementOverview, options);
 
 export const benefitsPackageDashboardLink = getSyncLifecycle(
   createDashboardLink({
@@ -156,19 +178,28 @@ export const benefitsPackageDashboardLink = getSyncLifecycle(
   options,
 );
 
+// Core Components
 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 createBillWorkspace = getSyncLifecycle(CreateBillWorkspace, options);
-
 export const billingForm = getSyncLifecycle(BillingForm, options);
-export const requirePaymentModal = getSyncLifecycle(RequirePaymentModal, options);
-export const visitAttributeTags = getSyncLifecycle(VisitAttributeTags, options);
-export const initiatePaymentDialog = getSyncLifecycle(InitiatePaymentDialog, options);
 export const billDepositWorkspace = getSyncLifecycle(BillDepositWorkspace, options);
 
+// Bill Manager Components
+export const deleteBillableServiceModal = getSyncLifecycle(DeleteBillableServiceModal, options);
+export const createBillWorkspace = getSyncLifecycle(CreateBillWorkspace, options);
+export const deleteBillModal = getSyncLifecycle(DeleteBillModal, options);
+export const waiveBillForm = getSyncLifecycle(WaiveBillForm, options);
+export const editBillForm = getSyncLifecycle(EditBillForm, options);
+export const refundBillModal = getSyncLifecycle(RefundBillModal, options);
+export const cancelBillWorkspace = getSyncLifecycle(CancelBillWorkspace, options);
+export const waiveBillActionButton = getSyncLifecycle(WaiveBillActionButton, options);
+export const deleteBillActionButton = getSyncLifecycle(DeleteBillActionButton, options);
+export const refundLineItem = getSyncLifecycle(RefundLineItem, options);
+export const cancelLineItem = getSyncLifecycle(CancelLineItem, options);
+export const editLineItem = getSyncLifecycle(EditLineItem, options);
+
+// Order Components
 export const labOrder = getSyncLifecycle(LabOrder, options);
 export const priceInfoOrder = getSyncLifecycle(PriceInfoOrder, options);
 export const procedureOrder = getSyncLifecycle(ProcedureOrder, options);
@@ -176,34 +207,34 @@ export const imagingOrder = getSyncLifecycle(ImagingOrder, options);
 export const drugOrder = getSyncLifecycle(DrugOrder, options);
 export const orderActionButton = getSyncLifecycle(OrderActionButton, options);
 
-// bill manager modals
-export const deleteBillModal = getSyncLifecycle(DeleteBillModal, options);
-
-// bill manager extensions
-export const waiveBillForm = getSyncLifecycle(WaiveBillForm, options);
-export const editBillForm = getSyncLifecycle(EditBillForm, options);
-export const refundBillModal = getSyncLifecycle(RefundBillModal, options);
-export const cancelBillWorkspace = getSyncLifecycle(CancelBillWorkspace, options);
-// Benefits
+// Benefits Components
 export const benefitsPackage = getSyncLifecycle(BenefitsPackage, options);
 export const benefits = getSyncLifecycle(Benefits, options);
 export const benefitsPreAuthForm = getSyncLifecycle(BenefitPreAuthForm, options);
 
-export const createPaymentPoint = getSyncLifecycle(CreatePaymentPoint, options);
-
-export const addServiceForm = getSyncLifecycle(AddServiceForm, options);
-export const addCommodityForm = getSyncLifecycle(CommodityForm, options);
+// Payment Components
+export const requirePaymentModal = getSyncLifecycle(RequirePaymentModal, options);
+export const visitAttributeTags = getSyncLifecycle(VisitAttributeTags, options);
+export const initiatePaymentDialog = getSyncLifecycle(InitiatePaymentDialog, options);
+export const paymentModeWorkspace = getSyncLifecycle(PaymentModeWorkspace, options);
+export const deletePaymentModeModal = getSyncLifecycle(DeletePaymentModeModal, options);
+export const paidBillReceiptPrintPreviewModal = getSyncLifecycle(ReceiptPrintPreviewModal, options);
 
+// Payment Points Components
+export const createPaymentPoint = getSyncLifecycle(CreatePaymentPoint, options);
 export const clockIn = getSyncLifecycle(ClockIn, options);
 export const clockOut = getSyncLifecycle(ClockOut, options);
 
-export const paymentModeWorkspace = getSyncLifecycle(PaymentModeWorkspace, options);
-export const deletePaymentModeModal = getSyncLifecycle(DeletePaymentModeModal, options);
+// Service Management Components
+export const addServiceForm = getSyncLifecycle(AddServiceForm, options);
+export const addCommodityForm = getSyncLifecycle(CommodityForm, options);
+export const bulkImportBillableServicesModal = getSyncLifecycle(BulkImportBillableServices, options);
 
+// Claims Management Components
+export const claimsOverview = getSyncLifecycle(ClaimsManagementOverview, options);
 export const retryClaimRequestModal = getSyncLifecycle(RetryClaimRequest, options);
 
-export const paidBillReceiptPrintPreviewModal = getSyncLifecycle(ReceiptPrintPreviewModal, options);
-
+// App Startup
 export function startupApp() {
   defineConfigSchema(moduleName, configSchema);
   registerFeatureFlag(
@@ -212,10 +243,3 @@ export function startupApp() {
     'HIE feature flag, this enables and disables the HIE feature',
   );
 }
-
-export const bulkImportBillableServicesModal = getSyncLifecycle(BulkImportBillableServices, options);
-export const waiveBillActionButton = getSyncLifecycle(WaiveBillActionButton, options);
-export const deleteBillActionButton = getSyncLifecycle(DeleteBillActionButton, options);
-export const refundLineItem = getSyncLifecycle(RefundLineItem, options);
-export const cancelLineItem = getSyncLifecycle(CancelLineItem, options);
-export const editLineItem = getSyncLifecycle(EditLineItem, options);