@kenyaemr/esm-billing-app 5.4.1-pre.2029 → 5.4.1-pre.2036

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","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"},{"name":"bill-deposit-workspace","component":"billDepositWorkspace","title":"Bill Deposit 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.2029"}
+{"$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"},{"name":"bill-deposit-workspace","component":"billDepositWorkspace","title":"Bill Deposit 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.2036"}

package/package.json

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

package/src/billable-services/bill-manager/modals/delete-billable-service.modal.tsx

@@ -0,0 +1,79 @@
+import React from 'react';
+import { ModalBody, ModalFooter, Button, InlineLoading, ModalHeader } from '@carbon/react';
+import { useTranslation } from 'react-i18next';
+import { type ChargeAble } from '../../billables/charge-summary.resource';
+import { deleteBillableService } from '../../billable-service.resource';
+import { showSnackbar, restBaseUrl } from '@openmrs/esm-framework';
+import { mutate } from 'swr';
+
+type DeleteBillableServiceModalProps = {
+  closeModal: () => void;
+  chargeableItem: ChargeAble;
+};
+
+const DeleteBillableServiceModal: React.FC<DeleteBillableServiceModalProps> = ({ closeModal, chargeableItem }) => {
+  const [isDeleting, setIsDeleting] = React.useState(false);
+  const { t } = useTranslation();
+
+  const handleMutation = () => {
+    const url = `${restBaseUrl}/cashier/billableService?v=custom:(uuid,name,shortName,serviceStatus,serviceType:(uuid,display),servicePrices:(uuid,name,paymentMode,price),concept:(uuid,display))`;
+    mutate((key) => typeof key === 'string' && key.startsWith(url), undefined, { revalidate: true });
+  };
+
+  const handleDelete = () => {
+    setIsDeleting(true);
+    const chargeableItemUuid = chargeableItem?.uuid;
+    if (chargeableItemUuid) {
+      deleteBillableService(chargeableItemUuid)
+        .then(() => {
+          showSnackbar({
+            title: t('deleteChargeableItemSuccess', 'Chargeable item deleted successfully'),
+            subtitle: t('deleteChargeableItemSuccessMessage', 'The chargeable item has been deleted successfully.'),
+            kind: 'success',
+            isLowContrast: true,
+            timeoutInMs: 5000,
+          });
+          handleMutation();
+          closeModal();
+        })
+        .catch((error) => {
+          showSnackbar({
+            title: t('deleteChargeableItemError', 'Error deleting chargeable item'),
+            subtitle: t('deleteChargeableItemErrorMessage', 'An error occurred while deleting the chargeable item.'),
+            isLowContrast: true,
+            timeoutInMs: 5000,
+            kind: 'error',
+          });
+        })
+        .finally(() => {
+          setIsDeleting(false);
+        });
+    }
+  };
+  return (
+    <>
+      <ModalHeader closeModal={closeModal} title={t('deleteChargeableItems', 'Delete Chargeable Item')} />
+      <ModalBody>
+        <p>
+          {t('deleteChargeableItemMessage', 'Are you sure you want to delete the chargeable item {{name}}?', {
+            name: chargeableItem?.name,
+          })}
+        </p>
+      </ModalBody>
+      <ModalFooter>
+        <Button kind="secondary" onClick={closeModal}>
+          {t('cancel', 'Cancel')}
+        </Button>
+        <Button kind="danger" onClick={handleDelete} disabled={isDeleting}>
+          {isDeleting ? (
+            <InlineLoading description={t('deleting', 'Deleting') + '...'} />
+          ) : (
+            <span>{t('delete', 'Delete')}</span>
+          )}
+        </Button>
+      </ModalFooter>
+    </>
+  );
+};
+
+export default DeleteBillableServiceModal;

package/src/billable-services/bill-manager/modals/delete-billable-service.test.tsx

@@ -0,0 +1,101 @@
+import React from 'react';
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import DeleteBillableServiceModal from './delete-billable-service.modal';
+import { deleteBillableService } from '../../billable-service.resource';
+import { showSnackbar } from '@openmrs/esm-framework';
+import type { ChargeAble } from '../../billables/charge-summary.resource';
+
+jest.mock('../../billable-service.resource', () => ({
+  deleteBillableService: jest.fn(),
+}));
+jest.mock('@openmrs/esm-framework', () => ({
+  showSnackbar: jest.fn(),
+  restBaseUrl: 'http://fake-api',
+}));
+jest.mock('swr', () => ({
+  mutate: jest.fn(),
+}));
+jest.mock('react-i18next', () => ({
+  useTranslation: () => ({
+    t: (key: string, defaultText: string) => defaultText,
+  }),
+}));
+
+describe('<DeleteBillableServiceModal />', () => {
+  const fullItem: ChargeAble = {
+    uuid: '123',
+    name: 'Test Service',
+    shortName: 'TS',
+    serviceStatus: 'ENABLED',
+    stockItem: 'stock',
+    serviceType: { uuid: 'st-1', display: 'Service Type' },
+    servicePrices: [{ uuid: 'sp-1', name: 'Standard Price', price: 100 }],
+    concept: { uuid: 'c-1', display: 'Concept Display' },
+  };
+  const closeModal = jest.fn();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders header, message, and both buttons', () => {
+    render(<DeleteBillableServiceModal closeModal={closeModal} chargeableItem={fullItem} />);
+
+    expect(screen.getByText('Delete Chargeable Item')).toBeInTheDocument();
+    expect(screen.getByText(`Are you sure you want to delete the chargeable item {{name}}?`)).toBeInTheDocument();
+
+    expect(screen.getByRole('button', { name: 'Cancel' })).toBeEnabled();
+    expect(screen.getByRole('button', { name: /Delete/ })).toBeEnabled();
+  });
+
+  it('invokes closeModal when cancel is clicked', async () => {
+    render(<DeleteBillableServiceModal closeModal={closeModal} chargeableItem={fullItem} />);
+    await userEvent.click(screen.getByRole('button', { name: 'Cancel' }));
+    expect(closeModal).toHaveBeenCalledTimes(1);
+  });
+
+  it('performs delete flow and shows success snackbar', async () => {
+    (deleteBillableService as jest.Mock).mockResolvedValue(undefined);
+
+    render(<DeleteBillableServiceModal closeModal={closeModal} chargeableItem={fullItem} />);
+
+    const deleteBtn = screen.getByRole('button', { name: /Delete/ });
+    await userEvent.click(deleteBtn);
+
+    await waitFor(() => {
+      expect(deleteBillableService).toHaveBeenCalledWith(fullItem.uuid);
+      expect(showSnackbar).toHaveBeenCalledWith(
+        expect.objectContaining({
+          title: 'Chargeable item deleted successfully',
+          kind: 'success',
+        }),
+      );
+
+      expect(closeModal).toHaveBeenCalled();
+    });
+
+    // button re-enabled
+    expect(screen.getByRole('button', { name: /Delete/ })).toBeEnabled();
+  });
+
+  it('shows error snackbar on delete failure', async () => {
+    (deleteBillableService as jest.Mock).mockRejectedValue(new Error('failure'));
+
+    render(<DeleteBillableServiceModal closeModal={closeModal} chargeableItem={fullItem} />);
+
+    await userEvent.click(screen.getByRole('button', { name: /Delete/ }));
+
+    await waitFor(() => {
+      expect(showSnackbar).toHaveBeenCalledWith(
+        expect.objectContaining({
+          title: 'Error deleting chargeable item',
+          kind: 'error',
+        }),
+      );
+      expect(closeModal).not.toHaveBeenCalled();
+    });
+
+    expect(screen.getByRole('button', { name: /Delete/ })).toBeEnabled();
+  });
+});

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

@@ -40,11 +40,21 @@ export const createBillableService = (payload: any, uuid?: string) => {
     },
   });
 };
-export const deleteBillableService = (payload: any) => {
-  const url = `/ws/rest/v1/cashier/api/deletebillable-service`;
+/**
+ * Deletes a billable service by its unique identifier (UUID).
+ *
+ * @param uuid - The unique identifier of the billable service to be deleted.
+ * @returns A promise that resolves with the response of the DELETE request.
+ *
+ * @remarks
+ * This function sends a DELETE request to the OpenMRS REST API endpoint
+ * for billable services. Ensure that the `uuid` provided corresponds to
+ * an existing billable service.
+ */
+export const deleteBillableService = (uuid: string) => {
+  const url = `/ws/rest/v1/cashier/api/billable-service/${uuid}`;
   return openmrsFetch(url, {
-    method: 'POST',
-    body: payload,
+    method: 'DELETE',
     headers: {
       'Content-Type': 'application/json',
     },

package/src/billable-services/billables/charge-summary-table.component.tsx

@@ -25,7 +25,7 @@ import React, { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { convertToCurrency } from '../../helpers';
 import styles from './charge-summary-table.scss';
-import { useChargeSummaries } from './charge-summary.resource';
+import { type ChargeAble, useChargeSummaries } from './charge-summary.resource';
 import { downloadExcelTemplateFile, searchTableData } from './form-helper';
 
 const defaultPageSize = 10;
@@ -82,8 +82,12 @@ const ChargeSummaryTable: React.FC = () => {
     };
   });
 
-  // TODO: Implement handleDelete
-  const handleDelete = (service) => {};
+  const handleDelete = (chargeableItem: ChargeAble) => {
+    const dispose = showModal('delete-billableservice-modal', {
+      closeModal: () => dispose(),
+      chargeableItem,
+    });
+  };
 
   const handleEdit = (service) => {
     Boolean(service?.serviceType?.display)
@@ -188,6 +192,12 @@ const ChargeSummaryTable: React.FC = () => {
                           itemText={t('editChargeItem', 'Edit charge item')}
                           onClick={() => handleEdit(results[index])}
                         />
+                        <OverflowMenuItem
+                          hasDivider
+                          isDelete
+                          itemText={t('deleteChargeItem', 'Delete charge item')}
+                          onClick={() => handleDelete(results[index])}
+                        />
                       </OverflowMenu>
                     </TableCell>
                   </TableRow>

package/src/index.ts

@@ -11,7 +11,7 @@ import RefundLineItem from './billable-services/bill-manager/bill-actions/refund
 import WaiveBillActionButton from './billable-services/bill-manager/bill-actions/waive-bill-action-button.component';
 import { DeleteBillModal } from './billable-services/bill-manager/modals/delete-bill.modal';
 import { RefundBillModal } from './billable-services/bill-manager/modals/refund-bill.modal';
-import { DeleteBillableServiceModal } from './billable-services/bill-manager/modals/serviceItemCard.component';
+import 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';