@openmrs/esm-billing-app 1.0.2-pre.613 → 1.0.2-pre.619

package/src/invoice/printable-invoice/printable-footer.test.tsx

@@ -3,28 +3,19 @@ import { screen, render } from '@testing-library/react';
 import { useDefaultFacility } from '../../billing.resource';
 import PrintableFooter from './printable-footer.component';
 
-const mockUseDefaultFacility = useDefaultFacility as jest.MockedFunction<typeof useDefaultFacility>;
+const mockUseDefaultFacility = jest.mocked<typeof useDefaultFacility>(useDefaultFacility);
 
 jest.mock('../../billing.resource', () => ({
   useDefaultFacility: jest.fn(),
 }));
 
 describe('PrintableFooter', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
   test('should render PrintableFooter component', () => {
-    mockUseDefaultFacility.mockReturnValue({ data: { display: 'MTRH', uuid: 'mtrh-uuid' }, isLoading: false });
+    mockUseDefaultFacility.mockReturnValue({
+      data: { display: 'MTRH', uuid: 'mtrh-uuid', links: [] },
+    });
     render(<PrintableFooter />);
     const footer = screen.getByText('MTRH');
     expect(footer).toBeInTheDocument();
   });
-
-  test('should show placeholder text when facility isLoading', () => {
-    mockUseDefaultFacility.mockReturnValue({ data: { display: 'MTRH', uuid: 'mtrh-uuid' }, isLoading: true });
-    render(<PrintableFooter />);
-    const footer = screen.getByText('--');
-    expect(footer).toBeInTheDocument();
-  });
 });

package/src/invoice/printable-invoice/printable-invoice-header.component.tsx

@@ -3,6 +3,7 @@ import { type PatientDetails } from '../../types';
 import { useConfig } from '@openmrs/esm-framework';
 import { useTranslation } from 'react-i18next';
 import { useDefaultFacility } from '../../billing.resource';
+import type { BillingConfig } from '../../config-schema';
 import styles from './printable-invoice-header.scss';
 
 interface PrintableInvoiceHeaderProps {
@@ -11,7 +12,7 @@ interface PrintableInvoiceHeaderProps {
 
 const PrintableInvoiceHeader: React.FC<PrintableInvoiceHeaderProps> = ({ patientDetails }) => {
   const { t } = useTranslation();
-  const { logo } = useConfig();
+  const { logo, country } = useConfig<BillingConfig>();
   const { data } = useDefaultFacility();
 
   return (
@@ -20,8 +21,8 @@ const PrintableInvoiceHeader: React.FC<PrintableInvoiceHeaderProps> = ({ patient
         <p className={styles.heading}>{t('invoice', 'Invoice')}</p>
         {logo?.src ? (
           <img className={styles.img} src={logo.src} alt={logo.alt} />
-        ) : logo?.name ? (
-          logo.name
+        ) : logo?.alt ? (
+          logo.alt
         ) : (
           // OpenMRS Logo
           <svg
@@ -53,7 +54,7 @@ const PrintableInvoiceHeader: React.FC<PrintableInvoiceHeaderProps> = ({ patient
 
         <div className={styles.facilityDetails}>
           <p className={styles.facilityName}>{data?.display}</p>
-          <p className={styles.itemLabel}>Kenya</p>
+          <p className={styles.itemLabel}>{country}</p>
         </div>
       </div>
     </div>

package/src/invoice/printable-invoice/printable-invoice-header.test.tsx

@@ -1,19 +1,17 @@
 import React from 'react';
 import { screen, render } from '@testing-library/react';
 import { useConfig } from '@openmrs/esm-framework';
+import { type BillingConfig } from '../../config-schema';
 import { useDefaultFacility } from '../../billing.resource';
 import PrintableInvoiceHeader from './printable-invoice-header.component';
 
-const mockUseDefaultFacility = useDefaultFacility as jest.MockedFunction<typeof useDefaultFacility>;
-const mockUseConfig = useConfig as jest.MockedFunction<typeof useConfig>;
+const mockUseDefaultFacility = jest.mocked(useDefaultFacility);
+const mockUseConfig = jest.mocked(useConfig<BillingConfig>);
 
 jest.mock('../../billing.resource', () => ({
   useDefaultFacility: jest.fn(),
 }));
 
-jest.mock('@openmrs/esm-framework', () => ({
-  useConfig: jest.fn(),
-}));
 const testProps = {
   patientDetails: {
     name: 'John Doe',
@@ -26,9 +24,15 @@ const testProps = {
 };
 
 describe('PrintableInvoiceHeader', () => {
+  beforeEach(() => {
+    mockUseConfig.mockReturnValue({
+      logo: { src: 'logo.png', alt: 'logo' },
+      country: 'Kenya',
+    } as unknown as BillingConfig);
+    mockUseDefaultFacility.mockReturnValue({ data: { display: 'MTRH', uuid: 'mtrh-uuid', links: [] } });
+  });
+
   test('should render PrintableInvoiceHeader component', () => {
-    mockUseConfig.mockReturnValue({ logo: { src: 'logo.png', alt: 'logo' } });
-    mockUseDefaultFacility.mockReturnValue({ data: { display: 'MTRH', uuid: 'mtrh-uuid' }, isLoading: false });
     render(<PrintableInvoiceHeader {...testProps} />);
     const header = screen.getByText('Invoice');
     expect(header).toBeInTheDocument();
@@ -41,16 +45,12 @@ describe('PrintableInvoiceHeader', () => {
   });
 
   test('should display the logo when logo is provided', () => {
-    mockUseConfig.mockReturnValue({ logo: { src: 'logo.png', alt: 'logo' } });
-    mockUseDefaultFacility.mockReturnValue({ data: { display: 'MTRH', uuid: 'mtrh-uuid' }, isLoading: false });
     render(<PrintableInvoiceHeader {...testProps} />);
     const logo = screen.getByAltText('logo');
     expect(logo).toBeInTheDocument();
   });
 
   test('should display the default logo when logo is not provided', () => {
-    mockUseConfig.mockReturnValue({ logo: {} });
-    mockUseDefaultFacility.mockReturnValue({ data: { display: 'MTRH', uuid: 'mtrh-uuid' }, isLoading: false });
     render(<PrintableInvoiceHeader {...testProps} />);
     const logo = screen.getByRole('img');
     expect(logo).toBeInTheDocument();

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

@@ -29,10 +29,10 @@ const PrintableInvoice: React.FC<PrintableInvoiceProps> = ({ bill, patient, isLo
   const layout = useLayoutType();
   const responsiveSize = isDesktop(layout) ? 'sm' : 'lg';
   const headerData = [
-    { header: 'Inventory item', key: 'billItem' },
-    { header: 'Quantity', key: 'quantity' },
-    { header: 'Unit price', key: 'price' },
-    { header: 'Total', key: 'total' },
+    { header: t('inventoryItem', 'Inventory item'), key: 'billItem' },
+    { header: t('quantity', 'Quantity'), key: 'quantity' },
+    { header: t('unitPrice', 'Unit price'), key: 'price' },
+    { header: t('total', 'Total'), key: 'total' },
   ];
 
   const rowData =
@@ -47,10 +47,10 @@ const PrintableInvoice: React.FC<PrintableInvoiceProps> = ({ bill, patient, isLo
     }) ?? [];
 
   const invoiceTotal = {
-    'Total Amount': bill?.totalAmount,
-    'Amount Tendered': bill?.tenderedAmount,
-    'Discount Amount': 0,
-    'Amount due': bill?.totalAmount - bill?.tenderedAmount,
+    [t('totalAmount', 'Total Amount')]: bill?.totalAmount,
+    [t('amountTendered', 'Amount Tendered')]: bill?.tenderedAmount,
+    [t('discountAmount', 'Discount Amount')]: 0,
+    [t('amountDue', 'Amount due')]: bill?.totalAmount - bill?.tenderedAmount,
   };
 
   const patientDetails = useMemo(() => {
@@ -65,9 +65,9 @@ const PrintableInvoice: React.FC<PrintableInvoiceProps> = ({ bill, patient, isLo
   }, [patient, t]);
 
   const invoiceDetails = {
-    'Invoice #': bill?.receiptNumber,
-    'Invoice date': bill.dateCreated,
-    Status: bill?.status,
+    [t('invoiceNumber', 'Invoice #')]: bill?.receiptNumber,
+    [t('invoiceDate', 'Invoice date')]: bill.dateCreated,
+    [t('status', 'Status')]: bill?.status,
   };
 
   if (isLoading) {

package/src/metrics-cards/metrics-cards.test.tsx

@@ -3,10 +3,11 @@ import { render, screen } from '@testing-library/react';
 import { useConfig } from '@openmrs/esm-framework';
 import { billsSummary } from '../../__mocks__/bills.mock';
 import { useBills } from '../billing.resource';
+import { type MappedBill } from '../types';
 import MetricsCards from './metrics-cards.component';
 
-const mockUseBills = useBills as jest.Mock;
-const mockUseConfig = useConfig as jest.Mock;
+const mockUseBills = jest.mocked(useBills);
+const mockUseConfig = jest.mocked(useConfig);
 
 jest.mock('../billing.resource', () => ({
   useBills: jest.fn(),
@@ -14,13 +15,19 @@ jest.mock('../billing.resource', () => ({
 
 describe('MetricsCards', () => {
   test('renders loading state', () => {
-    mockUseBills.mockReturnValue({ isLoading: true, bills: [], error: null });
+    mockUseBills.mockReturnValue({ isLoading: true, bills: [], error: null, isValidating: false, mutate: jest.fn() });
     renderMetricsCards();
     expect(screen.getByText(/Loading bill metrics.../i)).toBeInTheDocument();
   });
 
   test('renders error state', () => {
-    mockUseBills.mockReturnValue({ isLoading: false, bills: [], error: new Error('Internal server error') });
+    mockUseBills.mockReturnValue({
+      isLoading: false,
+      bills: [],
+      error: new Error('Internal server error'),
+      isValidating: false,
+      mutate: jest.fn(),
+    });
     renderMetricsCards();
     expect(
       screen.getByText(
@@ -30,7 +37,13 @@ describe('MetricsCards', () => {
   });
 
   test('renders metrics cards', () => {
-    mockUseBills.mockReturnValue({ isLoading: false, bills: billsSummary, error: null });
+    mockUseBills.mockReturnValue({
+      isLoading: false,
+      bills: billsSummary as unknown as MappedBill[],
+      error: null,
+      isValidating: false,
+      mutate: jest.fn(),
+    });
     mockUseConfig.mockImplementation(() => ({ defaultCurrency: 'USD' }));
     renderMetricsCards();
     expect(screen.getByRole('heading', { name: /cumulative bills/i })).toBeInTheDocument();

package/src/modal/require-payment-modal.test.tsx

@@ -1,16 +1,14 @@
 import React from 'react';
-import { render, screen, fireEvent } from '@testing-library/react';
-import '@testing-library/jest-dom';
+import userEvent from '@testing-library/user-event';
+import { render, screen } from '@testing-library/react';
+import { getDefaultsFromConfigSchema, useConfig } from '@openmrs/esm-framework';
 import { useBills } from '../billing.resource';
+import { type MappedBill } from '../types';
+import { configSchema, type BillingConfig } from '../config-schema';
 import RequirePaymentModal from './require-payment-modal.component';
 
-jest.mock('react-i18next', () => ({
-  useTranslation: () => ({ t: (key: string) => key }),
-}));
-
-jest.mock('@openmrs/esm-framework', () => ({
-  useConfig: () => ({ defaultCurrency: 'USD' }),
-}));
+const mockUseConfig = jest.mocked(useConfig<BillingConfig>);
+const mockUseBills = jest.mocked<typeof useBills>(useBills);
 
 jest.mock('../billing.resource', () => ({
   useBills: jest.fn(),
@@ -25,19 +23,19 @@ describe('RequirePaymentModal', () => {
   const patientUuid = '12345';
 
   beforeEach(() => {
-    jest.clearAllMocks();
+    mockUseConfig.mockReturnValue({ ...getDefaultsFromConfigSchema(configSchema), defaultCurrency: 'USD' });
   });
 
   it('renders correctly', () => {
-    (useBills as jest.Mock).mockReturnValue({ bills: [], isLoading: false, error: null });
+    mockUseBills.mockReturnValue({ bills: [], isLoading: false, error: null, isValidating: false, mutate: jest.fn() });
     render(<RequirePaymentModal closeModal={closeModal} patientUuid={patientUuid} />);
-    expect(screen.getByText('patientBillingAlert')).toBeInTheDocument();
+    expect(screen.getByText('Patient Billing Alert')).toBeInTheDocument();
   });
 
   it('displays loading state', () => {
-    (useBills as jest.Mock).mockReturnValue({ bills: [], isLoading: true, error: null });
+    mockUseBills.mockReturnValue({ bills: [], isLoading: true, error: null, isValidating: false, mutate: jest.fn() });
     render(<RequirePaymentModal closeModal={closeModal} patientUuid={patientUuid} />);
-    expect(screen.getByText('inlineLoading')).toBeInTheDocument();
+    expect(screen.getByText('Loading bill items...')).toBeInTheDocument();
   });
 
   it('displays line items', () => {
@@ -50,17 +48,24 @@ describe('RequirePaymentModal', () => {
         ],
       },
     ];
-    (useBills as jest.Mock).mockReturnValue({ bills, isLoading: false, error: null });
+    mockUseBills.mockReturnValue({
+      bills: bills as unknown as MappedBill[],
+      isLoading: false,
+      error: null,
+      isValidating: false,
+      mutate: jest.fn(),
+    });
     render(<RequirePaymentModal closeModal={closeModal} patientUuid={patientUuid} />);
     expect(screen.getByText('Service 1')).toBeInTheDocument();
     expect(screen.getByText('Item 1')).toBeInTheDocument();
   });
 
-  it('handles closeModal', () => {
-    (useBills as jest.Mock).mockReturnValue({ bills: [], isLoading: false, error: null });
+  it('handles closeModal', async () => {
+    const user = userEvent.setup();
+    mockUseBills.mockReturnValue({ bills: [], isLoading: false, error: null, isValidating: false, mutate: jest.fn() });
     render(<RequirePaymentModal closeModal={closeModal} patientUuid={patientUuid} />);
-    fireEvent.click(screen.getByText('cancel'));
-    fireEvent.click(screen.getByText('ok'));
+    await user.click(screen.getByText('Cancel'));
+    await user.click(screen.getByText('OK'));
     expect(closeModal).toHaveBeenCalledTimes(2);
   });
 });

package/translations/en.json

@@ -4,16 +4,21 @@
   "addBillableServices": "Add Billable Services",
   "addCashPoint": "Add Cash Point",
   "addNewBillableService": "Add new billable service",
+  "addNewCashPoint": "Add New Cash Point",
+  "addNewPaymentMode": "Add New Payment Mode",
   "addNewService": "Add new service",
   "addPaymentMode": "Add Payment Mode",
   "addPaymentOptions": "Add payment option",
   "amount": "Amount",
   "amountDue": "Amount Due",
+  "amountTendered": "Amount Tendered",
   "amountToWaiveAriaLabel": "Enter amount to waive",
   "amountToWaiveHelper": "Specify the amount to be deducted from the bill",
   "amountToWaiveLabel": "Amount to Waive",
   "billableService": "Billable service",
   "billableServices": "Billable Services",
+  "billAmount": "Bill amount",
+  "billCode": "Bill code",
   "billedItems": "Billed Items",
   "billedTo": "Billed to",
   "billErrorService": "Bill service error",
@@ -30,6 +35,8 @@
   "billPayment": "Bill payment",
   "billPaymentError": "Bill payment error",
   "billPaymentRequiredMessage": "The current patient has pending bill. Advice patient to settle bill before receiving services",
+  "billProcessingError": "Bill processing error",
+  "billProcessingSuccess": "Bill processing has been successful",
   "billServicesManagement": "Bill services management",
   "billsList": "Bill list",
   "billTotal": "Bill total",
@@ -51,12 +58,15 @@
   "confirmDeleteMessage": "Are you sure you want to delete this payment mode? Proceed cautiously.",
   "createdSuccessfully": "Billable service created successfully",
   "currentPrice": "Current price",
+  "date": "Date",
+  "dateOfPayment": "Date of payment",
   "delete": "Delete",
   "deletePaymentMode": "Delete Payment Mode",
   "description": "Description",
   "descriptionPlaceholder": "e.g., Used for all cash transactions",
   "discard": "Discard",
   "discount": "Discount",
+  "discountAmount": "Discount Amount",
   "duplicateCashPointError": "A cash point with the same name or UUID already exists. Please use a unique name and UUID.",
   "duplicatePaymentModeError": "A payment mode with the same name already exists. Please create another payment mode",
   "editBillableService": "Edit billable service",
@@ -83,8 +93,11 @@
   "inlineLoading": "Loading bill items...",
   "insuranceScheme": "Insurance scheme",
   "invalidWaiverAmount": "Invalid waiver amount",
+  "inventoryItem": "Inventory item",
   "invoice": "Invoice",
+  "invoiceDate": "Invoice date",
   "invoiceError": "Invoice error",
+  "invoiceNumber": "Invoice #",
   "item": "Item",
   "itemsToBeBilled": "Items to be billed",
   "launchBillForm": "Launch bill form",
@@ -103,6 +116,7 @@
   "noResultsFor": "No results for",
   "noResultsFound": "No results found",
   "noServicesToDisplay": "There are no services to display",
+  "number": "No",
   "ok": "OK",
   "patientBillingAlert": "Patient Billing Alert",
   "patientBills": "Patient bill",
@@ -127,6 +141,7 @@
   "priceIsRequired": "Price is required",
   "prices": "Prices",
   "printBill": "Print bill",
+  "printError": "Error printing invoice",
   "printReceipt": "Print receipt",
   "processPayment": "Process Payment",
   "quantity": "Quantity",
@@ -135,6 +150,7 @@
   "referenceNumber": "Reference number",
   "save": "Save",
   "saveAndClose": "Save and close",
+  "saveBill": "Save Bill",
   "saving": "Saving",
   "searchConcepts": "Search associated concept",
   "searching": "Searching",
@@ -142,6 +158,7 @@
   "searchThisTable": "Search this table",
   "selectBillableService": "Select a billable service...",
   "selectCategory": "Select category",
+  "selectLocation": "Select Location",
   "selectPatientCategory": "Select patient category",
   "selectPaymentMethod": "Select payment method",
   "sellingAmount": "Enter selling price",
@@ -152,6 +169,7 @@
   "serviceNameExceedsLimit": "Service Name exceeds the character limit of {{MAX_NAME_LENGTH}}.",
   "serviceShortName": "Short Name",
   "servicesList": "Services list",
+  "serviceStatus": "Service Status",
   "serviceType": "Service Type",
   "shortName": "Short Name",
   "shortNameExceedsLimit": "Short Name exceeds the character limit of {{MAX_NAME_LENGTH}}.",