@openmrs/esm-billing-app 1.0.2-pre.90 → 1.0.2-pre.905

package/src/billable-services/create-edit/add-billable-service.test.tsx

@@ -1,154 +0,0 @@
-import React from 'react';
-import userEvent from '@testing-library/user-event';
-import { render, screen } from '@testing-library/react';
-import { type FetchResponse, navigate } from '@openmrs/esm-framework';
-import {
-  useBillableServices,
-  usePaymentModes,
-  useServiceTypes,
-  createBillableSerice,
-} from '../billable-service.resource';
-import AddBillableService from './add-billable-service.component';
-
-const mockUseBillableServices = useBillableServices as jest.MockedFunction<typeof useBillableServices>;
-const mockUsePaymentModes = usePaymentModes as jest.MockedFunction<typeof usePaymentModes>;
-const mockUseServiceTypes = useServiceTypes as jest.MockedFunction<typeof useServiceTypes>;
-const mockCreateBillableSerice = createBillableSerice as jest.MockedFunction<typeof createBillableSerice>;
-const mockNavigate = navigate as jest.MockedFunction<typeof navigate>;
-
-jest.mock('../billable-service.resource', () => ({
-  useBillableServices: jest.fn(),
-  usePaymentModes: jest.fn(),
-  useServiceTypes: jest.fn(),
-  createBillableSerice: jest.fn(),
-}));
-
-const mockPaymentModes = [
-  { uuid: '63eff7a4-6f82-43c4-a333-dbcc58fe9f74', name: 'Cash', description: 'Cash Payment', retired: false },
-  {
-    uuid: 'beac329b-f1dc-4a33-9e7c-d95821a137a6',
-    name: 'Insurance',
-    description: 'Insurance method of payment',
-    retired: false,
-  },
-  {
-    uuid: '28989582-e8c3-46b0-96d0-c249cb06d5c6',
-    name: 'MPESA',
-    description: 'Mobile money method of payment',
-    retired: false,
-  },
-];
-
-const mockServiceTypes = [
-  { uuid: 'c9604249-db0a-4d03-b074-fc6bc2fa13e6', display: 'Lab service' },
-  { uuid: 'b75e466f-a6f5-4d5e-849a-84424d3c85cd', display: 'Pharmacy service' },
-  { uuid: 'ce914b2d-44f6-4b6c-933f-c57a3938e35b', display: 'Peer educator service' },
-  { uuid: 'c23d3224-2218-4007-8f22-e1f3d5a8e58a', display: 'Nutrition service' },
-  { uuid: '65487ff4-63b3-452a-8985-6a1f4a0cc08d', display: 'TB service' },
-  { uuid: '9db142d5-5cc4-4c05-9f83-06ed294caa67', display: 'Family planning service' },
-  { uuid: 'a487a743-62ce-4f93-a66b-c5154ee8987d', display: 'Adherence counselling  service' },
-];
-
-xdescribe('AddBillableService', () => {
-  beforeEach(() => {
-    jest.resetAllMocks();
-  });
-
-  test('should render billable services form and generate correct payload', async () => {
-    const user = userEvent.setup();
-    const mockOnClose = jest.fn();
-    mockUseBillableServices.mockReturnValue({
-      billableServices: [],
-      isLoading: false,
-      error: null,
-      mutate: jest.fn(),
-      isValidating: false,
-    });
-    mockUsePaymentModes.mockReturnValue({ paymentModes: mockPaymentModes, error: null, isLoading: false });
-    mockUseServiceTypes.mockReturnValue({ serviceTypes: mockServiceTypes, error: false, isLoading: false });
-
-    render(<AddBillableService onClose={mockOnClose} />);
-
-    const formTitle = screen.getByRole('heading', { name: /Add Billable Services/i });
-    expect(formTitle).toBeInTheDocument();
-
-    const serviceNameTextInp = screen.getByRole('textbox', { name: /Service Name/i });
-    expect(serviceNameTextInp).toBeInTheDocument();
-
-    const serviceShortNameTextInp = screen.getByRole('textbox', { name: /Short Name/i });
-    expect(serviceShortNameTextInp).toBeInTheDocument();
-
-    await user.type(serviceNameTextInp, 'Test Service Name');
-    await user.type(serviceShortNameTextInp, 'Test Short Name');
-
-    expect(serviceNameTextInp).toHaveValue('Test Service Name');
-    expect(serviceShortNameTextInp).toHaveValue('Test Short Name');
-
-    const serviceTypeComboBox = screen.getByRole('combobox', { name: /Service Type/i });
-    expect(serviceTypeComboBox).toBeInTheDocument();
-    await user.click(serviceTypeComboBox);
-    const serviceTypeOptions = screen.getByRole('option', { name: /Lab service/i });
-    expect(serviceTypeOptions).toBeInTheDocument();
-    await user.click(serviceTypeOptions);
-
-    const addPaymentMethodBtn = screen.getByRole('button', { name: /Add payment option/i });
-    expect(addPaymentMethodBtn).toBeInTheDocument();
-
-    await user.click(addPaymentMethodBtn);
-
-    const paymentMethodComboBox = screen.getByRole('combobox', { name: /Payment Mode/i });
-    expect(paymentMethodComboBox).toBeInTheDocument();
-    await user.click(paymentMethodComboBox);
-    const paymentMethodOptions = screen.getByRole('option', { name: /Cash/i });
-    expect(paymentMethodOptions).toBeInTheDocument();
-    await user.click(paymentMethodOptions);
-
-    const priceTextInp = screen.getByRole('textbox', { name: /Price/i });
-    expect(priceTextInp).toBeInTheDocument();
-    await user.type(priceTextInp, '1000');
-
-    mockCreateBillableSerice.mockReturnValue(Promise.resolve({} as FetchResponse<any>));
-    const saveBtn = screen.getByRole('button', { name: /Save/i });
-    expect(saveBtn).toBeInTheDocument();
-    await user.click(saveBtn);
-
-    expect(mockCreateBillableSerice).toHaveBeenCalledTimes(1);
-    expect(mockCreateBillableSerice).toHaveBeenCalledWith({
-      name: 'Test Service Name',
-      shortName: 'Test Short Name',
-      serviceType: undefined,
-      servicePrices: [
-        {
-          paymentMode: '63eff7a4-6f82-43c4-a333-dbcc58fe9f74',
-          price: '01000',
-          name: 'Cash',
-        },
-      ],
-      serviceStatus: 'ENABLED',
-    });
-    expect(mockNavigate).toHaveBeenCalledTimes(1);
-    expect(mockNavigate).toHaveBeenCalledWith({ to: '/openmrs/spa/billable-services' });
-  });
-
-  test("should navigate back to billable services dashboard when 'Cancel' button is clicked", async () => {
-    const user = userEvent.setup();
-    const mockOnClose = jest.fn();
-    mockUseBillableServices.mockReturnValue({
-      billableServices: [],
-      isLoading: false,
-      error: null,
-      mutate: jest.fn(),
-      isValidating: false,
-    });
-    mockUsePaymentModes.mockReturnValue({ paymentModes: mockPaymentModes, error: null, isLoading: false });
-    mockUseServiceTypes.mockReturnValue({ serviceTypes: mockServiceTypes, error: false, isLoading: false });
-
-    render(<AddBillableService onClose={mockOnClose} />);
-
-    const cancelBtn = screen.getByRole('button', { name: /Cancel/i });
-    expect(cancelBtn).toBeInTheDocument();
-    await user.click(cancelBtn);
-
-    expect(mockOnClose).toHaveBeenCalledTimes(1);
-  });
-});

package/src/billable-services/dashboard/service-metrics.component.tsx

@@ -1,41 +0,0 @@
-import React, { useMemo } from 'react';
-import { InlineLoading } from '@carbon/react';
-import { useTranslation } from 'react-i18next';
-import { ErrorState } from '@openmrs/esm-patient-common-lib';
-import { useBillableServices } from '../billable-service.resource';
-import Card from '../../metrics-cards/card.component';
-import styles from '../../metrics-cards/metrics-cards.scss';
-import { ExtensionSlot } from '@openmrs/esm-framework';
-
-export default function ServiceMetrics() {
-  const { t } = useTranslation();
-  const { isLoading, error } = useBillableServices();
-
-  const cards = useMemo(
-    () => [
-      { title: 'Cash Revenue', count: '--' },
-      { title: 'Insurance Revenue', count: '--' },
-      { title: 'Pending Claims', count: '--' },
-    ],
-    [],
-  );
-
-  if (isLoading) {
-    return (
-      <section className={styles.container}>
-        <InlineLoading status="active" iconDescription="Loading" description="Loading service metrics..." />
-      </section>
-    );
-  }
-
-  if (error) {
-    return <ErrorState headerTitle={t('serviceMetrics', 'Service Metrics')} error={error} />;
-  }
-  return (
-    <section className={styles.container}>
-      {cards.map((card) => (
-        <Card key={card.title} title={card.title} count={card.count} />
-      ))}
-    </section>
-  );
-}

package/src/billable-services/payyment-modes/payment-modes-config.component.tsx

@@ -1,280 +0,0 @@
-import React, { useState, useEffect, useCallback } from 'react';
-import {
-  Button,
-  DataTable,
-  TableContainer,
-  Table,
-  TableHead,
-  TableRow,
-  TableHeader,
-  TableBody,
-  TableCell,
-  Modal,
-  TextInput,
-  OverflowMenu,
-  OverflowMenuItem,
-} from '@carbon/react';
-import { Add } from '@carbon/react/icons';
-import { useTranslation } from 'react-i18next';
-import { useForm, Controller } from 'react-hook-form';
-import { z } from 'zod';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { showSnackbar, openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
-import { CardHeader } from '@openmrs/esm-patient-common-lib';
-import styles from './payment-modes-config.scss';
-
-// Validation schema
-const paymentModeSchema = z.object({
-  name: z.string().min(1, 'Payment Mode Name is required'),
-  description: z.string().optional(),
-});
-
-type PaymentModeFormValues = z.infer<typeof paymentModeSchema>;
-
-const PaymentModesConfig: React.FC = () => {
-  const { t } = useTranslation();
-  const [paymentModes, setPaymentModes] = useState([]);
-  const [isModalOpen, setIsModalOpen] = useState(false);
-  const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
-  const [selectedPaymentMode, setSelectedPaymentMode] = useState(null);
-
-  const {
-    control,
-    handleSubmit,
-    reset,
-    formState: { errors, isSubmitting },
-  } = useForm<PaymentModeFormValues>({
-    resolver: zodResolver(paymentModeSchema),
-    defaultValues: {
-      name: '',
-      description: '',
-    },
-  });
-
-  const fetchPaymentModes = useCallback(async () => {
-    try {
-      const response = await openmrsFetch(`${restBaseUrl}/billing/paymentMode?v=full`);
-      setPaymentModes(response.data.results || []);
-    } catch (err) {
-      showSnackbar({
-        title: t('error', 'Error'),
-        subtitle: t('errorFetchingPaymentModes', 'An error occurred while fetching payment modes.'),
-        kind: 'error',
-        isLowContrast: false,
-      });
-    }
-  }, [t]);
-
-  useEffect(() => {
-    fetchPaymentModes();
-  }, [fetchPaymentModes]);
-
-  const onSubmit = async (data: PaymentModeFormValues) => {
-    // Check for duplicate payment mode name
-    const isDuplicate = paymentModes.some((mode) => mode.name.toLowerCase() === data.name.toLowerCase());
-
-    if (isDuplicate) {
-      showSnackbar({
-        title: t('error', 'Error'),
-        subtitle: t(
-          'duplicatePaymentModeError',
-          'A payment mode with the same name already exists. Please create another payment mode',
-        ),
-        kind: 'error',
-        isLowContrast: false,
-      });
-      return;
-    }
-
-    try {
-      const response = await openmrsFetch(`${restBaseUrl}/billing/paymentMode`, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          name: data.name,
-          description: data.description,
-        }),
-      });
-
-      if (response.ok) {
-        showSnackbar({
-          title: t('success', 'Success'),
-          subtitle: t('paymentModeSaved', 'Payment mode was successfully saved.'),
-          kind: 'success',
-        });
-
-        setIsModalOpen(false);
-        reset({ name: '', description: '' });
-        fetchPaymentModes();
-      } else {
-        const errorData = response.data || {};
-        showSnackbar({
-          title: t('error', 'Error'),
-          subtitle:
-            errorData.message || t('errorSavingPaymentMode', 'An error occurred while saving the payment mode.'),
-          kind: 'error',
-          isLowContrast: false,
-        });
-      }
-    } catch (err) {
-      showSnackbar({
-        title: t('error', 'Error'),
-        subtitle: t('errorSavingPaymentMode', 'An error occurred while saving the payment mode.'),
-        kind: 'error',
-        isLowContrast: false,
-      });
-    }
-  };
-
-  const handleDelete = async () => {
-    if (!selectedPaymentMode) return;
-
-    try {
-      await openmrsFetch(`${restBaseUrl}/billing/paymentMode/${selectedPaymentMode.uuid}`, {
-        method: 'DELETE',
-      });
-
-      showSnackbar({
-        title: t('success', 'Success'),
-        subtitle: t('paymentModeDeleted', 'Payment mode was successfully deleted.'),
-        kind: 'success',
-      });
-
-      setIsDeleteModalOpen(false);
-      setSelectedPaymentMode(null);
-      fetchPaymentModes();
-    } catch (err) {
-      showSnackbar({
-        title: t('error', 'Error'),
-        subtitle: t('errorDeletingPaymentMode', 'An error occurred while deleting the payment mode.'),
-        kind: 'error',
-        isLowContrast: false,
-      });
-    }
-  };
-
-  const rowData = paymentModes.map((mode) => ({
-    id: mode.uuid,
-    name: mode.name,
-    description: mode.description || '--',
-  }));
-
-  const headerData = [
-    { key: 'name', header: t('name', 'Name') },
-    { key: 'description', header: t('description', 'Description') },
-    { key: 'actions', header: t('actions', 'Actions') },
-  ];
-
-  return (
-    <div className={styles.container}>
-      <div className={styles.card}>
-        <CardHeader title={t('paymentModeHistory', 'Payment Mode History')}>
-          <Button renderIcon={Add} onClick={() => setIsModalOpen(true)} kind="ghost">
-            {t('addPaymentMode', 'Add New Payment Mode')}
-          </Button>
-        </CardHeader>
-        <div className={styles.historyContainer}>
-          <DataTable rows={rowData} headers={headerData} isSortable size="lg">
-            {({ rows, headers, getTableProps, getHeaderProps, getRowProps }) => (
-              <TableContainer>
-                <Table className={styles.table} {...getTableProps()}>
-                  <TableHead>
-                    <TableRow>
-                      {headers.map((header) => (
-                        <TableHeader key={header.key} {...getHeaderProps({ header })}>
-                          {header.header}
-                        </TableHeader>
-                      ))}
-                    </TableRow>
-                  </TableHead>
-                  <TableBody>
-                    {rows.map((row) => (
-                      <TableRow key={row.id} {...getRowProps({ row })}>
-                        {row.cells.map((cell) =>
-                          cell.info.header !== 'actions' ? (
-                            <TableCell key={cell.id}>{cell.value}</TableCell>
-                          ) : (
-                            <TableCell key={cell.id}>
-                              <OverflowMenu>
-                                <OverflowMenuItem
-                                  itemText={t('delete', 'Delete')}
-                                  onClick={() => {
-                                    const selected = paymentModes.find((p) => p.uuid === row.id);
-                                    setSelectedPaymentMode(selected);
-                                    setIsDeleteModalOpen(true);
-                                  }}
-                                />
-                              </OverflowMenu>
-                            </TableCell>
-                          ),
-                        )}
-                      </TableRow>
-                    ))}
-                  </TableBody>
-                </Table>
-              </TableContainer>
-            )}
-          </DataTable>
-        </div>
-      </div>
-
-      {/* Modal for Adding New Payment Mode */}
-      <Modal
-        open={isModalOpen}
-        modalHeading={t('addPaymentMode', 'Add Payment Mode')}
-        onRequestClose={() => setIsModalOpen(false)}
-        onRequestSubmit={handleSubmit(onSubmit)}
-        primaryButtonText={t('save', 'Save')}
-        secondaryButtonText={t('cancel', 'Cancel')}
-        isPrimaryButtonDisabled={isSubmitting}>
-        <form>
-          <Controller
-            name="name"
-            control={control}
-            render={({ field }) => (
-              <TextInput
-                id="payment-mode-name"
-                labelText={t('paymentModeName', 'Payment Mode Name')}
-                placeholder={t('paymentModeNamePlaceholder', 'e.g., Cash, Credit Card')}
-                invalid={!!errors.name}
-                invalidText={errors.name?.message}
-                {...field}
-              />
-            )}
-          />
-          <Controller
-            name="description"
-            control={control}
-            render={({ field }) => (
-              <TextInput
-                id="payment-mode-description"
-                labelText={t('description', 'Description')}
-                placeholder={t('descriptionPlaceholder', 'e.g., Used for all cash transactions')}
-                invalid={!!errors.description}
-                invalidText={errors.description?.message}
-                {...field}
-              />
-            )}
-          />
-        </form>
-      </Modal>
-
-      {/* Modal for Deleting Payment Mode */}
-      <Modal
-        open={isDeleteModalOpen}
-        modalHeading={t('deletePaymentMode', 'Delete Payment Mode')}
-        onRequestClose={() => setIsDeleteModalOpen(false)}
-        onRequestSubmit={handleDelete}
-        primaryButtonText={t('delete', 'Delete')}
-        secondaryButtonText={t('cancel', 'Cancel')}
-        primaryButtonDanger
-        danger>
-        <p>{t('confirmDeleteMessage', 'Are you sure you want to delete this payment mode? Proceed cautiously.')}</p>
-      </Modal>
-    </div>
-  );
-};
-
-export default PaymentModesConfig;

package/src/invoice/payments/payments.component.test.tsx

@@ -1,121 +0,0 @@
-import React from 'react';
-import userEvent from '@testing-library/user-event';
-import { render, screen } from '@testing-library/react';
-import { useVisit, useConfig, navigate } from '@openmrs/esm-framework';
-import { useBillableServices } from '../../billable-services/billable-service.resource';
-import { type MappedBill, type LineItem } from '../../types';
-import Payments from './payments.component';
-
-// Add this mock for currency formatting
-const mockFormatToParts = jest.fn().mockReturnValue([{ type: 'integer', value: '1000' }]);
-const mockFormat = jest.fn().mockReturnValue('$1000.00');
-global.Intl.NumberFormat = jest.fn().mockImplementation(() => ({
-  formatToParts: mockFormatToParts,
-  format: mockFormat,
-})) as any;
-global.Intl.NumberFormat.supportedLocalesOf = jest.fn().mockReturnValue(['en-US']);
-
-jest.mock('../../billing.resource', () => ({
-  processBillPayment: jest.fn(),
-}));
-
-jest.mock('../../billable-services/billable-service.resource', () => ({
-  useBillableServices: jest.fn(),
-}));
-
-describe('Payments', () => {
-  const mockBill: MappedBill = {
-    uuid: 'bill-uuid',
-    id: 1,
-    patientUuid: 'patient-uuid',
-    patientName: 'John Doe',
-    cashPointUuid: 'cash-point-uuid',
-    cashPointName: 'Main Cash Point',
-    cashPointLocation: 'Main Hospital',
-    cashier: {
-      uuid: 'provider-1',
-      display: 'Jane Doe',
-      links: [
-        {
-          rel: 'self',
-          uri: 'http://example.com/provider/1',
-          resourceAlias: 'Jane Doe',
-        },
-      ],
-    },
-    payments: [
-      {
-        uuid: 'payment-1',
-        dateCreated: new Date('2023-09-01T12:00:00Z').getTime(),
-        amountTendered: 100,
-        amount: 80,
-        instanceType: {
-          uuid: 'instance-1',
-          name: 'Credit Card',
-          description: 'Credit Card payment',
-          retired: false,
-        },
-        attributes: [],
-        voided: false,
-        resourceVersion: '1.0',
-      },
-      {
-        uuid: 'payment-2',
-        dateCreated: new Date('2023-09-05T14:00:00Z').getTime(),
-        amountTendered: 200,
-        amount: 180,
-        instanceType: {
-          uuid: 'instance-2',
-          name: 'Cash',
-          description: 'Cash payment',
-          retired: false,
-        },
-        attributes: [],
-        voided: false,
-        resourceVersion: '1.0',
-      },
-    ],
-    receiptNumber: '12345',
-    status: 'PAID',
-    identifier: 'invoice-123',
-    dateCreated: '2023-09-01T12:00:00Z',
-    lineItems: [],
-    billingService: 'Billing Service',
-  };
-
-  const mockMutate = jest.fn();
-  const mockSelectedLineItems: LineItem[] = [];
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-    (useVisit as jest.Mock).mockReturnValue({ currentVisit: null });
-    (useConfig as jest.Mock).mockReturnValue({ defaultCurrency: 'USD' });
-    (useBillableServices as jest.Mock).mockReturnValue({ billableServices: [], isLoading: false });
-  });
-
-  it('renders payment form and history', () => {
-    render(<Payments bill={mockBill} mutate={mockMutate} selectedLineItems={mockSelectedLineItems} />);
-    expect(screen.getByText('Payments')).toBeInTheDocument();
-    expect(screen.getByText('Total Amount:')).toBeInTheDocument();
-    expect(screen.getByText('Total Tendered:')).toBeInTheDocument();
-  });
-
-  it('calculates and displays correct amounts', () => {
-    render(<Payments bill={mockBill} mutate={mockMutate} selectedLineItems={mockSelectedLineItems} />);
-    const amountElements = screen.getAllByText('$1000.00');
-    expect(amountElements[amountElements.length - 3]).toBeInTheDocument();
-    expect(amountElements[amountElements.length - 2]).toBeInTheDocument();
-    expect(amountElements[amountElements.length - 1]).toBeInTheDocument();
-  });
-
-  it('disables Process Payment button when form is invalid', () => {
-    render(<Payments bill={mockBill} mutate={mockMutate} selectedLineItems={mockSelectedLineItems} />);
-    expect(screen.getByText('Process Payment')).toBeDisabled();
-  });
-
-  it('navigates to billing dashboard when Discard is clicked', async () => {
-    render(<Payments bill={mockBill} mutate={mockMutate} selectedLineItems={mockSelectedLineItems} />);
-    await userEvent.click(screen.getByText('Discard'));
-    expect(navigate).toHaveBeenCalled();
-  });
-});