@kenyaemr/esm-billing-app 5.4.2-pre.2351 → 5.4.2-pre.2356

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":"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-group-nav-slot"},{"component":"billDepositDashboardLink","name":"bill-deposit-dashboard-link","slot":"billing-dashboard-group-nav-slot"},{"component":"paymentHistoryLink","name":"payment-history-link","slot":"billing-dashboard-group-nav-slot"},{"component":"paymentPointsLink","name":"payment-points-link","slot":"billing-dashboard-group-nav-slot"},{"component":"paymentModesLink","name":"payment-modes-link","slot":"billing-dashboard-group-nav-slot"},{"component":"billManagerLink","name":"bill-manager-link","slot":"billing-dashboard-group-nav-slot"},{"component":"chargeableItemsLink","name":"chargeable-items-link","slot":"billing-dashboard-group-nav-slot"},{"component":"billableExemptionsLink","name":"billable-exemptions-link","slot":"billing-dashboard-group-nav-slot"},{"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"},{"name":"add-deposit-workspace","component":"addDepositWorkspace","title":"Add Deposit","type":"other-form"},{"name":"deposit-transaction-workspace","component":"depositTransactionWorkspace","title":"Deposit Transaction","type":"other-form"},{"name":"payment-workspace","component":"paymentWorkspace","title":"Payment 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":"manage-claim-request-modal","component":"manageClaimRequestModal"},{"name":"clock-in-modal","component":"clockIn"},{"name":"create-bill-item-modal","component":"createBillItemModal"},{"name":"delete-deposit-modal","component":"deleteDepositModal"},{"name":"reverse-transaction-modal","component":"reverseTransactionModal"},{"name":"print-preview-modal","component":"printPreviewModal"},{"name":"bill-action-modal","component":"billActionModal"}],"version":"5.4.2-pre.2351"}
+{"$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":"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-group-nav-slot"},{"component":"billDepositDashboardLink","name":"bill-deposit-dashboard-link","slot":"billing-dashboard-group-nav-slot"},{"component":"paymentHistoryLink","name":"payment-history-link","slot":"billing-dashboard-group-nav-slot"},{"component":"paymentPointsLink","name":"payment-points-link","slot":"billing-dashboard-group-nav-slot"},{"component":"paymentModesLink","name":"payment-modes-link","slot":"billing-dashboard-group-nav-slot"},{"component":"billManagerLink","name":"bill-manager-link","slot":"billing-dashboard-group-nav-slot"},{"component":"chargeableItemsLink","name":"chargeable-items-link","slot":"billing-dashboard-group-nav-slot"},{"component":"billableExemptionsLink","name":"billable-exemptions-link","slot":"billing-dashboard-group-nav-slot"},{"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"},{"name":"add-deposit-workspace","component":"addDepositWorkspace","title":"Add Deposit","type":"other-form"},{"name":"deposit-transaction-workspace","component":"depositTransactionWorkspace","title":"Deposit Transaction","type":"other-form"},{"name":"payment-workspace","component":"paymentWorkspace","title":"Payment 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":"manage-claim-request-modal","component":"manageClaimRequestModal"},{"name":"clock-in-modal","component":"clockIn"},{"name":"create-bill-item-modal","component":"createBillItemModal"},{"name":"delete-deposit-modal","component":"deleteDepositModal"},{"name":"reverse-transaction-modal","component":"reverseTransactionModal"},{"name":"print-preview-modal","component":"printPreviewModal"},{"name":"bill-action-modal","component":"billActionModal"}],"version":"5.4.2-pre.2356"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-billing-app",
-  "version": "5.4.2-pre.2351",
+  "version": "5.4.2-pre.2356",
   "description": "Billing app for KenyaEMR",
   "browser": "dist/kenyaemr-esm-billing-app.js",
   "main": "src/index.ts",
@@ -42,7 +42,7 @@
   },
   "peerDependencies": {
     "@carbon/react": "1.x",
-    "@openmrs/esm-framework": "6.x",
+    "@openmrs/esm-framework": "7.x",
     "react": "^18.1.0",
     "react-i18next": "11.x",
     "react-router-dom": "6.x",

package/src/index.ts

@@ -83,7 +83,7 @@ export const importTranslation = require.context('../translations', false, /.jso
 
 // Dashboard Links
 export const billingSummaryDashboardLink = getSyncLifecycle(
-  createDashboardLink({ ...dashboardMeta, icon: '', moduleName }),
+  createDashboardLink({ ...dashboardMeta, icon: 'omrs-icon-money', moduleName }),
   options,
 );
 

package/src/invoice/invoice-actions.component.tsx

@@ -0,0 +1,257 @@
+import { Button, Popover, PopoverContent } from '@carbon/react';
+import { Close, Printer, Wallet, FolderOpen, BaggageClaim } from '@carbon/react/icons';
+import {
+  launchWorkspace,
+  restBaseUrl,
+  showModal,
+  UserHasAccess,
+  useFeatureFlag,
+  useVisit,
+  useVisitContextStore,
+  defaultVisitCustomRepresentation,
+  navigate,
+  showSnackbar,
+  showToast,
+  updateVisit,
+} from '@openmrs/esm-framework';
+import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useParams } from 'react-router-dom';
+import { mutate } from 'swr';
+import { convertToCurrency } from '../helpers';
+import { MappedBill, LineItem } from '../types';
+import { spaBasePath } from '../constants';
+import { useCheckShareGnum } from './invoice.resource';
+import styles from './invoice.scss';
+import startCase from 'lodash-es/startCase';
+
+interface InvoiceActionsProps {
+  readonly bill: MappedBill;
+  readonly selectedLineItems?: LineItem[];
+  readonly activeVisit?: any;
+}
+
+export function InvoiceActions({ bill, selectedLineItems = [], activeVisit }: InvoiceActionsProps) {
+  const { t } = useTranslation();
+  const [isOpen, setIsOpen] = useState(false);
+  const { billUuid, patientUuid } = useParams();
+  const { checkSHARegNum } = useCheckShareGnum();
+  const { patientUuid: visitStorePatientUuid, manuallySetVisitUuid } = useVisitContextStore();
+  const isProcessClaimsFormEnabled = useFeatureFlag('healthInformationExchange');
+
+  const isInsurancePayment = (payments) => {
+    return payments?.some((payment) => payment.instanceType.name === 'Insurance');
+  };
+
+  const isShaFacilityStatusValid =
+    checkSHARegNum?.registrationNumber && checkSHARegNum.registrationNumber.trim() !== '';
+
+  const launchBillCloseOrReopenModal = (action: 'close' | 'reopen') => {
+    const dispose = showModal('bill-action-modal', {
+      closeModal: () => dispose(),
+      bill: bill,
+      action,
+    });
+  };
+
+  const shouldCloseBill = bill.balance === 0 && !bill.closed;
+
+  const handlePrint = (documentType: string, documentTitle: string) => {
+    const dispose = showModal('print-preview-modal', {
+      onClose: () => dispose(),
+      title: documentTitle,
+      documentUrl: `/openmrs${restBaseUrl}/cashier/print?documentType=${documentType}&billId=${bill?.id}`,
+    });
+  };
+
+  const handleBillPayment = () => {
+    const dispose = showModal('initiate-payment-modal', {
+      closeModal: () => dispose(),
+      bill: bill,
+      selectedLineItems,
+    });
+  };
+
+  const mutateClaimForm = async () => {
+    const activeVisitUrlSuffix = `?patient=${patientUuid}&v=${defaultVisitCustomRepresentation}&includeInactive=false`;
+    const retrospectiveVisitUuid = patientUuid && visitStorePatientUuid == patientUuid ? manuallySetVisitUuid : null;
+    const retrospectiveVisitUrlSuffix = `/${retrospectiveVisitUuid}?v=${defaultVisitCustomRepresentation}`;
+    const activeVisitUrl = `${restBaseUrl}/visit${activeVisitUrlSuffix}`;
+    const retroVisitUrl = `${restBaseUrl}/visit${retrospectiveVisitUrlSuffix}`;
+    await mutate((key) => typeof key === 'string' && (key.startsWith(activeVisitUrl) || key.startsWith(retroVisitUrl)));
+  };
+
+  const handleEndVisit = async () => {
+    if (activeVisit) {
+      const endVisitPayload = {
+        stopDatetime: new Date(),
+      };
+
+      const abortController = new AbortController();
+      try {
+        await updateVisit(activeVisit.uuid, endVisitPayload, abortController);
+        await mutateClaimForm();
+        showSnackbar({
+          isLowContrast: true,
+          kind: 'success',
+          subtitle: t('visitEndSuccessssfully', 'visit ended successfully'),
+          title: t('visitEnded', 'Visit ended'),
+        });
+      } catch (error) {
+        showSnackbar({
+          title: t('errorEndingVisit', 'Error ending visit'),
+          kind: 'error',
+          isLowContrast: false,
+          subtitle: error?.message,
+        });
+      }
+    }
+  };
+
+  const handleViewClaims = async () => {
+    if (!isShaFacilityStatusValid) {
+      showToast({
+        critical: true,
+        kind: 'warning',
+        title: t('shaFacilityLicenseNumberRequired', 'Facility license number Required'),
+        description: t(
+          'shaFacilityLicenseNumbernRequiredDescription',
+          'Facility license number is required to process claims. Please update facility license number details.',
+        ),
+      });
+      return;
+    }
+
+    if (activeVisit) {
+      await handleEndVisit();
+      navigate({ to: `${spaBasePath}/billing/patient/${patientUuid}/${billUuid}/claims` });
+    } else {
+      navigate({ to: `${spaBasePath}/billing/patient/${patientUuid}/${billUuid}/claims` });
+    }
+  };
+
+  return (
+    <div className="invoiceSummaryActions">
+      <Popover isTabTip align="bottom-right" onKeyDown={() => {}} onRequestClose={() => setIsOpen(false)} open={isOpen}>
+        <button
+          className={styles.printButton}
+          aria-expanded
+          aria-label="Settings"
+          onClick={() => setIsOpen(!isOpen)}
+          type="button">
+          <span className={styles.printButtonContent}>
+            <span className={styles.printButtonText}>{t('print', 'Print')}</span>
+            <Printer />
+          </span>
+        </button>
+        <PopoverContent>
+          <div className={styles.popoverContent}>
+            <Button
+              kind="ghost"
+              size="sm"
+              onClick={() =>
+                handlePrint(
+                  'invoice',
+                  `${t('invoice', 'Invoice')} ${bill?.receiptNumber} - ${startCase(bill?.patientName)}`,
+                )
+              }
+              renderIcon={Printer}>
+              {t('printInvoice', 'Print Invoice')}
+            </Button>
+            <Button
+              kind="ghost"
+              size="sm"
+              onClick={() => {
+                const dispose = showModal('print-preview-modal', {
+                  onClose: () => dispose(),
+                  title: `${t('receipt', 'Receipt')} ${bill?.receiptNumber} - ${startCase(bill?.patientName)}`,
+                  documentUrl: `/openmrs${restBaseUrl}/cashier/receipt?billId=${bill.id}`,
+                });
+              }}
+              renderIcon={Printer}>
+              {t('printReceipt', 'Print Receipt')}
+            </Button>
+            <Button
+              kind="ghost"
+              size="sm"
+              onClick={() =>
+                handlePrint(
+                  'billstatement',
+                  `${t('billStatement', 'Bill Statement')} ${bill?.receiptNumber} - ${startCase(bill?.patientName)}`,
+                )
+              }
+              renderIcon={Printer}>
+              {t('printBillStatement', 'Print Bill Statement')}
+            </Button>
+          </div>
+        </PopoverContent>
+      </Popover>
+      {shouldCloseBill && (
+        <UserHasAccess privilege="Close Cashier Bills">
+          <Button
+            kind="danger--ghost"
+            size="sm"
+            renderIcon={Close}
+            iconDescription="Add"
+            tooltipPosition="right"
+            onClick={() => launchBillCloseOrReopenModal('close')}>
+            {t('closeBill', 'Close Bill')}
+          </Button>
+        </UserHasAccess>
+      )}
+      {bill?.closed && (
+        <UserHasAccess privilege="Reopen Cashier Bills">
+          <Button
+            kind="ghost"
+            size="sm"
+            renderIcon={FolderOpen}
+            iconDescription="Add"
+            tooltipPosition="right"
+            onClick={() => launchBillCloseOrReopenModal('reopen')}>
+            {t('reopen', 'Reopen')}
+          </Button>
+        </UserHasAccess>
+      )}
+      <Button
+        kind="ghost"
+        size="sm"
+        renderIcon={Wallet}
+        iconDescription="Add"
+        tooltipPosition="right"
+        onClick={() =>
+          launchWorkspace('payment-workspace', {
+            bill,
+            workspaceTitle: t('additionalPayment', 'Additional Payment (Balance {{billBalance}})', {
+              billBalance: convertToCurrency(bill.balance),
+            }),
+          })
+        }>
+        {t('additionalPayment', 'Additional Payment')}
+      </Button>
+      {bill?.balance !== 0 && (
+        <Button
+          onClick={handleBillPayment}
+          disabled={bill?.balance === 0}
+          size="sm"
+          renderIcon={Wallet}
+          iconDescription="Add"
+          tooltipPosition="left">
+          {t('mpesaPayment', 'MPESA Payment')}
+        </Button>
+      )}
+
+      {isProcessClaimsFormEnabled && isInsurancePayment(bill?.payments) && (
+        <Button
+          onClick={handleViewClaims}
+          disabled={bill?.status !== 'PAID'}
+          kind="danger"
+          size="sm"
+          renderIcon={BaggageClaim}
+          iconDescription="Add"
+          tooltipPosition="bottom">
+          {activeVisit ? t('endVisitAndClaim', 'End visit and Process claims') : t('claim', 'Process claims')}
+        </Button>
+      )}
+    </div>
+  );
+}

package/src/invoice/invoice.component.tsx

@@ -1,29 +1,10 @@
-import { Button, InlineLoading, Popover, PopoverContent } from '@carbon/react';
-import { BaggageClaim, Close, Printer, Wallet, FolderOpen } from '@carbon/react/icons';
-import {
-  defaultVisitCustomRepresentation,
-  ExtensionSlot,
-  formatDatetime,
-  launchWorkspace,
-  navigate,
-  parseDate,
-  restBaseUrl,
-  showModal,
-  showSnackbar,
-  showToast,
-  updateVisit,
-  useFeatureFlag,
-  usePatient,
-  UserHasAccess,
-  useVisit,
-  useVisitContextStore,
-} from '@openmrs/esm-framework';
+import { InlineLoading } from '@carbon/react';
+import { ExtensionSlot, formatDatetime, parseDate, usePatient, useVisit } from '@openmrs/esm-framework';
 import { ErrorState } from '@openmrs/esm-patient-common-lib';
 import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useParams } from 'react-router-dom';
 import { useBill } from '../billing.resource';
-import { spaBasePath } from '../constants';
 import { convertToCurrency } from '../helpers';
 import { usePaymentsReconciler } from '../hooks/use-payments-reconciler';
 import { LineItem, MappedBill } from '../types';
@@ -31,27 +12,16 @@ import InvoiceTable from './invoice-table.component';
 import styles from './invoice.scss';
 import Payments from './payments/payments.component';
 import capitalize from 'lodash-es/capitalize';
-import { mutate } from 'swr';
-import startCase from 'lodash-es/startCase';
-import { useCheckShareGnum } from './invoice.resource';
+import { InvoiceActions } from './invoice-actions.component';
 
 const Invoice: React.FC = () => {
   const { t } = useTranslation();
-  const { checkSHARegNum } = useCheckShareGnum();
   const { billUuid, patientUuid } = useParams();
   const { patient, isLoading: isLoadingPatient, error: patientError } = usePatient(patientUuid);
   const { bill, isLoading: isLoadingBill, error: billingError } = useBill(billUuid);
-  const isInsurancePayment = (payments) => {
-    return payments?.some((payment) => payment.instanceType.name === 'Insurance');
-  };
   usePaymentsReconciler(billUuid);
   const { activeVisit, isLoading: isVisitLoading, error: visitError } = useVisit(patientUuid);
-  const { patientUuid: visitStorePatientUuid, manuallySetVisitUuid } = useVisitContextStore();
   const [selectedLineItems, setSelectedLineItems] = useState([]);
-  const isProcessClaimsFormEnabled = useFeatureFlag('healthInformationExchange');
-
-  const isShaFacilityStatusValid =
-    checkSHARegNum?.registrationNumber && checkSHARegNum.registrationNumber.trim() !== '';
 
   const handleSelectItem = (lineItems: Array<LineItem>) => {
     const paidLineItems = bill?.lineItems?.filter((item) => item.paymentStatus === 'PAID') ?? [];
@@ -59,31 +29,6 @@ const Invoice: React.FC = () => {
     setSelectedLineItems(uniqueLineItems);
   };
 
-  const handlePrint = () => {
-    const dispose = showModal('print-preview-modal', {
-      onClose: () => dispose(),
-      title: `${t('invoice', 'Invoice')} ${bill?.receiptNumber} - ${startCase(bill?.patientName)}`,
-      documentUrl: `/openmrs${restBaseUrl}/cashier/print?documentType=invoice&billId=${bill?.id}`,
-    });
-  };
-
-  const handleBillPayment = () => {
-    const dispose = showModal('initiate-payment-modal', {
-      closeModal: () => dispose(),
-      bill: bill,
-      selectedLineItems,
-    });
-  };
-
-  const mutateClaimForm = async () => {
-    const activeVisitUrlSuffix = `?patient=${patientUuid}&v=${defaultVisitCustomRepresentation}&includeInactive=false`;
-    const retrospectiveVisitUuid = patientUuid && visitStorePatientUuid == patientUuid ? manuallySetVisitUuid : null;
-    const retrospectiveVisitUrlSuffix = `/${retrospectiveVisitUuid}?v=${defaultVisitCustomRepresentation}`;
-    const activeVisitUrl = `${restBaseUrl}/visit${activeVisitUrlSuffix}`;
-    const retroVisitUrl = `${restBaseUrl}/visit${retrospectiveVisitUrlSuffix}`;
-    await mutate((key) => typeof key === 'string' && (key.startsWith(activeVisitUrl) || key.startsWith(retroVisitUrl)));
-  };
-
   useEffect(() => {
     const paidLineItems = bill?.lineItems?.filter((item) => item.paymentStatus === 'PAID') ?? [];
     setSelectedLineItems(paidLineItems);
@@ -114,220 +59,32 @@ const Invoice: React.FC = () => {
     );
   }
 
-  const handleEndVisit = async () => {
-    if (activeVisit) {
-      const endVisitPayload = {
-        stopDatetime: new Date(),
-      };
-
-      const abortController = new AbortController();
-      try {
-        await updateVisit(activeVisit.uuid, endVisitPayload, abortController);
-        await mutateClaimForm();
-        showSnackbar({
-          isLowContrast: true,
-          kind: 'success',
-          subtitle: t('visitEndSuccessssfully', 'visit ended successfully'),
-          title: t('visitEnded', 'Visit ended'),
-        });
-      } catch (error) {
-        showSnackbar({
-          title: t('errorEndingVisit', 'Error ending visit'),
-          kind: 'error',
-          isLowContrast: false,
-          subtitle: error?.message,
-        });
-      }
-    }
-  };
-
-  const handleViewClaims = async () => {
-    if (!isShaFacilityStatusValid) {
-      showToast({
-        critical: true,
-        kind: 'warning',
-        title: t('shaFacilityLicenseNumberRequired', 'Facility license number Required'),
-        description: t(
-          'shaFacilityLicenseNumbernRequiredDescription',
-          'Facility license number is required to process claims. Please update facility license number details.',
-        ),
-      });
-      return;
-    }
-
-    if (activeVisit) {
-      await handleEndVisit();
-      navigate({ to: `${spaBasePath}/billing/patient/${patientUuid}/${billUuid}/claims` });
-    } else {
-      navigate({ to: `${spaBasePath}/billing/patient/${patientUuid}/${billUuid}/claims` });
-    }
-  };
-
   return (
     <div className={styles.invoiceContainer}>
       {patient && patientUuid && <ExtensionSlot name="patient-header-slot" state={{ patient, patientUuid }} />}
-      <InvoiceSummary bill={bill} />
-      <div className={styles.actionArea}>
-        <Button
-          onClick={handleBillPayment}
-          disabled={bill?.balance === 0}
-          size="sm"
-          renderIcon={Wallet}
-          iconDescription="Add"
-          tooltipPosition="left">
-          {t('mpesaPayment', 'MPESA Payment')}
-        </Button>
-
-        {isProcessClaimsFormEnabled && isInsurancePayment(bill?.payments) && (
-          <Button
-            onClick={handleViewClaims}
-            disabled={bill?.status !== 'PAID'}
-            kind="danger"
-            size="sm"
-            renderIcon={BaggageClaim}
-            iconDescription="Add"
-            tooltipPosition="bottom">
-            {activeVisit ? t('endVisitAndClaim', 'End visit and Process claims') : t('claim', 'Process claims')}
-          </Button>
-        )}
-      </div>
-
+      <InvoiceSummary bill={bill} selectedLineItems={selectedLineItems} activeVisit={activeVisit} />
       <InvoiceTable bill={bill} isLoadingBill={isLoadingBill} onSelectItem={handleSelectItem} />
       <Payments bill={bill} selectedLineItems={selectedLineItems} />
     </div>
   );
 };
 
-export function InvoiceSummary({ bill }: { readonly bill: MappedBill }) {
+export function InvoiceSummary({
+  bill,
+  selectedLineItems,
+  activeVisit,
+}: {
+  readonly bill: MappedBill;
+  readonly selectedLineItems?: LineItem[];
+  readonly activeVisit?: any;
+}) {
   const { t } = useTranslation();
-  const launchBillCloseOrReopenModal = (action: 'close' | 'reopen') => {
-    const dispose = showModal('bill-action-modal', {
-      closeModal: () => dispose(),
-      bill: bill,
-      action,
-    });
-  };
-
-  const shouldCloseBill = bill.balance === 0 && !bill.closed;
-  const [isOpen, setIsOpen] = useState(false);
-
-  const handlePrint = (documentType: string, documentTitle: string) => {
-    const dispose = showModal('print-preview-modal', {
-      onClose: () => dispose(),
-      title: documentTitle,
-      documentUrl: `/openmrs${restBaseUrl}/cashier/print?documentType=${documentType}&billId=${bill?.id}`,
-    });
-  };
 
   return (
     <>
       <div className={styles.invoiceSummary}>
         <span className={styles.invoiceSummaryTitle}>{t('invoiceSummary', 'Invoice Summary')}</span>
-        <div className="invoiceSummaryActions">
-          <Popover
-            isTabTip
-            align="bottom-right"
-            onKeyDown={() => {}}
-            onRequestClose={() => setIsOpen(false)}
-            open={isOpen}>
-            <button
-              className={styles.printButton}
-              aria-expanded
-              aria-label="Settings"
-              onClick={() => setIsOpen(!isOpen)}
-              type="button">
-              <span className={styles.printButtonContent}>
-                <span className={styles.printButtonText}>{t('print', 'Print')}</span>
-                <Printer />
-              </span>
-            </button>
-            <PopoverContent>
-              <div className={styles.popoverContent}>
-                <Button
-                  kind="ghost"
-                  size="sm"
-                  onClick={() =>
-                    handlePrint(
-                      'invoice',
-                      `${t('invoice', 'Invoice')} ${bill?.receiptNumber} - ${startCase(bill?.patientName)}`,
-                    )
-                  }
-                  renderIcon={Printer}>
-                  {t('printInvoice', 'Print Invoice')}
-                </Button>
-                <Button
-                  kind="ghost"
-                  size="sm"
-                  onClick={() => {
-                    const dispose = showModal('print-preview-modal', {
-                      onClose: () => dispose(),
-                      title: `${t('receipt', 'Receipt')} ${bill?.receiptNumber} - ${startCase(bill?.patientName)}`,
-                      documentUrl: `/openmrs${restBaseUrl}/cashier/receipt?billId=${bill.id}`,
-                    });
-                  }}
-                  renderIcon={Printer}>
-                  {t('printReceipt', 'Print Receipt')}
-                </Button>
-                <Button
-                  kind="ghost"
-                  size="sm"
-                  onClick={() =>
-                    handlePrint(
-                      'billstatement',
-                      `${t('billStatement', 'Bill Statement')} ${bill?.receiptNumber} - ${startCase(
-                        bill?.patientName,
-                      )}`,
-                    )
-                  }
-                  renderIcon={Printer}>
-                  {t('printBillStatement', 'Print Bill Statement')}
-                </Button>
-              </div>
-            </PopoverContent>
-          </Popover>
-          {shouldCloseBill && (
-            <UserHasAccess privilege="Close Cashier Bills">
-              <Button
-                kind="danger--ghost"
-                size="sm"
-                renderIcon={Close}
-                iconDescription="Add"
-                tooltipPosition="right"
-                onClick={() => launchBillCloseOrReopenModal('close')}>
-                {t('closeBill', 'Close Bill')}
-              </Button>
-            </UserHasAccess>
-          )}
-          {bill?.closed && (
-            <UserHasAccess privilege="Reopen Cashier Bills">
-              <Button
-                kind="ghost"
-                size="sm"
-                renderIcon={FolderOpen}
-                iconDescription="Add"
-                tooltipPosition="right"
-                onClick={() => launchBillCloseOrReopenModal('reopen')}>
-                {t('reopen', 'Reopen')}
-              </Button>
-            </UserHasAccess>
-          )}
-          <Button
-            kind="ghost"
-            size="sm"
-            renderIcon={Wallet}
-            iconDescription="Add"
-            tooltipPosition="right"
-            onClick={() =>
-              launchWorkspace('payment-workspace', {
-                bill,
-                workspaceTitle: t('additionalPayment', 'Additional Payment (Balance {{billBalance}})', {
-                  billBalance: convertToCurrency(bill.balance),
-                }),
-              })
-            }>
-            {t('additionalPayment', 'Additional Payment')}
-          </Button>
-        </div>
+        <InvoiceActions bill={bill} selectedLineItems={selectedLineItems} activeVisit={activeVisit} />
       </div>
       <div className={styles.invoiceSummaryContainer}>
         <div className={styles.invoiceCard}>