@openmrs/esm-billing-app 1.0.2-pre.74 → 1.0.2-pre.749

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',
@@ -25,11 +23,19 @@ const testProps = {
   },
 };
 
+const defaultFacility = { display: 'MTRH', uuid: 'mtrh-uuid', links: [] };
+
 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} />);
+    render(<PrintableInvoiceHeader {...testProps} defaultFacility={defaultFacility} />);
     const header = screen.getByText('Invoice');
     expect(header).toBeInTheDocument();
 
@@ -41,17 +47,13 @@ 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} />);
+    render(<PrintableInvoiceHeader {...testProps} defaultFacility={defaultFacility} />);
     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} />);
+    render(<PrintableInvoiceHeader {...testProps} defaultFacility={defaultFacility} />);
     const logo = screen.getByRole('img');
     expect(logo).toBeInTheDocument();
   });

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

@@ -8,9 +8,8 @@ import {
   TableBody,
   TableHeader,
   TableCell,
-  DataTableSkeleton,
 } from '@carbon/react';
-import { age, isDesktop, useLayoutType } from '@openmrs/esm-framework';
+import { age, isDesktop, type SessionLocation, useLayoutType } from '@openmrs/esm-framework';
 import { getGender } from '../../helpers';
 import { type MappedBill } from '../../types';
 import { useTranslation } from 'react-i18next';
@@ -21,25 +20,26 @@ import styles from './printable-invoice.scss';
 type PrintableInvoiceProps = {
   bill: MappedBill;
   patient: fhir.Patient;
-  isLoading: boolean;
+  componentRef: React.RefObject<HTMLDivElement>;
+  defaultFacility: SessionLocation;
 };
 
-const PrintableInvoice: React.FC<PrintableInvoiceProps> = ({ bill, patient, isLoading }) => {
+const PrintableInvoice: React.FC<PrintableInvoiceProps> = ({ bill, patient, componentRef, defaultFacility }) => {
   const { t } = useTranslation();
   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 =
     bill?.lineItems?.map((item) => {
       return {
         id: `${item.uuid}`,
-        billItem: item.item,
+        billItem: item.billableService ?? item.item,
         quantity: item.quantity,
         price: item.price,
         total: item.price * item.quantity,
@@ -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,28 +65,14 @@ 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) {
-    return (
-      <div className={styles.loaderContainer}>
-        <DataTableSkeleton
-          columnCount={headerData?.length ?? 0}
-          showHeader={false}
-          showToolbar={false}
-          size={responsiveSize}
-          zebra
-        />
-      </div>
-    );
-  }
-
   return (
-    <div className={styles.container}>
-      <PrintableInvoiceHeader patientDetails={patientDetails} />
+    <div className={styles.container} ref={componentRef}>
+      <PrintableInvoiceHeader patientDetails={patientDetails} defaultFacility={defaultFacility} />
       <div className={styles.printableInvoiceContainer}>
         <div className={styles.detailsContainer}>
           {Object.entries(invoiceDetails).map(([key, val]) => (
@@ -99,7 +85,7 @@ const PrintableInvoice: React.FC<PrintableInvoiceProps> = ({ bill, patient, isLo
 
         <div className={styles.itemsContainer}>
           <div className={styles.tableContainer}>
-            <DataTable isSortable rows={rowData} headers={headerData} size={responsiveSize} useZebraStyles={false}>
+            <DataTable rows={rowData} headers={headerData} size={responsiveSize} useZebraStyles={false}>
               {({ rows, headers, getRowProps, getTableProps }) => (
                 <TableContainer>
                   <Table {...getTableProps()} aria-label="Invoice line items">

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 RequirePaymentModal from './require-payment-modal.component';
+import { type MappedBill } from '../types';
+import { configSchema, type BillingConfig } from '../config-schema';
+import RequirePaymentModal from './require-payment.modal';
 
-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/src/modal/{require-payment-modal.component.tsx → require-payment.modal.tsx}

@@ -12,7 +12,7 @@ import {
   StructuredListRow,
   StructuredListWrapper,
 } from '@carbon/react';
-import { useConfig } from '@openmrs/esm-framework';
+import { getCoreTranslation, useConfig } from '@openmrs/esm-framework';
 import { useBills } from '../billing.resource';
 import { convertToCurrency } from '../helpers';
 import styles from './require-payment.scss';
@@ -29,22 +29,23 @@ const RequirePaymentModal: React.FC<RequirePaymentModalProps> = ({ closeModal, p
   const lineItems = bills.filter((bill) => bill?.status !== 'PAID').flatMap((bill) => bill?.lineItems);
 
   return (
-    <div>
+    <>
       <ModalHeader closeModal={closeModal} title={t('patientBillingAlert', 'Patient Billing Alert')} />
       <ModalBody>
         <p className={styles.bodyShort02}>
           {t(
             'billPaymentRequiredMessage',
-            'The current patient has pending bill. Advice patient to settle bill before receiving services',
+            'The current patient has a pending bill. Advise the patient to settle the bill before receiving services',
           )}
         </p>
         {isLoading && (
           <InlineLoading
             status="active"
             iconDescription="Loading"
-            description={t('inlineLoading', 'Loading bill items...')}
+            description={t('loadingBillItems', 'Loading bill items') + '...'}
           />
         )}
+
         <StructuredListWrapper isCondensed>
           <StructuredListHead>
             <StructuredListRow head>
@@ -55,30 +56,28 @@ const RequirePaymentModal: React.FC<RequirePaymentModalProps> = ({ closeModal, p
             </StructuredListRow>
           </StructuredListHead>
           <StructuredListBody>
-            {lineItems.map((lineItem) => {
-              return (
-                <StructuredListRow>
-                  <StructuredListCell>{lineItem.billableService || lineItem.item}</StructuredListCell>
-                  <StructuredListCell>{lineItem.quantity}</StructuredListCell>
-                  <StructuredListCell>{convertToCurrency(lineItem.price, defaultCurrency)}</StructuredListCell>
-                  <StructuredListCell>
-                    {convertToCurrency(lineItem.quantity * lineItem.price, defaultCurrency)}
-                  </StructuredListCell>
-                </StructuredListRow>
-              );
-            })}
+            {lineItems.map((lineItem) => (
+              <StructuredListRow key={lineItem.uuid}>
+                <StructuredListCell>{lineItem.billableService || lineItem.item}</StructuredListCell>
+                <StructuredListCell>{lineItem.quantity}</StructuredListCell>
+                <StructuredListCell>{convertToCurrency(lineItem.price, defaultCurrency)}</StructuredListCell>
+                <StructuredListCell>
+                  {convertToCurrency(lineItem.quantity * lineItem.price, defaultCurrency)}
+                </StructuredListCell>
+              </StructuredListRow>
+            ))}
           </StructuredListBody>
         </StructuredListWrapper>
       </ModalBody>
       <ModalFooter>
         <Button kind="secondary" onClick={closeModal}>
-          {t('cancel', 'Cancel')}
+          {getCoreTranslation('cancel')}
         </Button>
         <Button kind="primary" onClick={closeModal}>
           {t('ok', 'OK')}
         </Button>
       </ModalFooter>
-    </div>
+    </>
   );
 };
 

package/src/routes.json

@@ -81,12 +81,32 @@
     },
     {
       "name": "edit-bill-line-item-dialog",
-      "component": "editBillLineItemDialog",
+      "component": "editBillLineItemModal",
       "online": true,
       "offline": true
     }
   ],
   "modals": [
+    {
+      "name": "add-cash-point-modal",
+      "component": "addCashPointModal"
+    },
+    {
+      "name": "add-payment-mode-modal",
+      "component": "addPaymentModeModal"
+    },
+    {
+      "name": "delete-payment-mode-modal",
+      "component": "deletePaymentModeModal"
+    },
+    {
+      "name": "edit-bill-item-modal",
+      "component": "editBillLineItemModal"
+    },
+    {
+      "name": "edit-billable-service-modal",
+      "component": "editBillableServiceModal"
+    },
     {
       "name": "require-billing-modal",
       "component": "requirePaymentModal"
@@ -107,4 +127,4 @@
       "description": "This feature introduces navigation links on the patient chart and home page to allow accessing the billing module features"
     }
   ]
-}
+}

package/src/types/index.ts

@@ -52,19 +52,19 @@ interface Provider {
 }
 
 export interface LineItem {
-  uuid: string;
-  display: string;
-  voided: boolean;
-  voidReason: string | null;
-  item: string;
-  billableService: string;
+  uuid?: string;
+  item?: string;
+  paymentStatus: string;
+  billableService?: string;
   quantity: number;
   price: number;
-  priceName: string;
-  priceUuid: string;
-  lineItemOrder: number;
-  resourceVersion: string;
-  paymentStatus: string;
+  priceName?: string;
+  priceUuid?: string;
+  lineItemOrder?: number;
+  resourceVersion?: string;
+  display?: string;
+  voided?: boolean;
+  voidReason?: string | null;
 }
 
 interface PatientLink {
@@ -168,7 +168,7 @@ export type ServiceConcept = {
   display: string;
 };
 
-export type BillabeItem = {
+export type BillableItem = {
   uuid: string;
   id?: number;
   name?: string;
@@ -177,6 +177,7 @@ export type BillabeItem = {
 };
 
 export type ServicePrice = {
+  name: string;
   price: string;
   uuid: string;
 };

package/translations/am.json

@@ -1,19 +1,25 @@
 {
-  "actions": "Actions",
+  "action": "Action",
   "addBill": "Add bill item(s)",
   "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",
+  "billableServices__lower": "billable services",
+  "billAmount": "Bill amount",
+  "billCode": "Bill code",
   "billedItems": "Billed Items",
   "billedTo": "Billed to",
   "billErrorService": "Bill service error",
@@ -29,36 +35,38 @@
   "billName": " {{billName}} ",
   "billPayment": "Bill payment",
   "billPaymentError": "Bill payment error",
-  "billPaymentRequiredMessage": "The current patient has pending bill. Advice patient to settle bill before receiving services",
+  "billPaymentRequiredMessage": "The current patient has a pending bill. Advise the patient to settle the bill before receiving services",
+  "billProcessingError": "Bill processing error",
+  "billProcessingSuccess": "Bill processing has been successful",
   "billServicesManagement": "Bill services management",
   "billsList": "Bill list",
   "billTotal": "Bill total",
   "billWaiver": "Bill waiver",
   "billWaiverError": "Bill waiver failed {{error}}",
   "billWaiverSuccess": "Bill waiver successful",
-  "cancel": "Cancel",
   "cashPointConfig": "Cash Point Config",
   "cashPointHistory": "Cash Point History",
   "cashPointLocation": "Cash Point Location",
   "cashPointName": "Cash Point Name",
   "cashPointNamePlaceholder": "e.g., Pharmacy Cash Point",
+  "cashPointNameRequired": "Cash Point Name is required",
   "cashPointSaved": "Cash point was successfully saved.",
   "cashPointUuid": "Cash Point UUID",
   "cashPointUuidPlaceholder": "Enter UUID",
   "checkFilters": "Check the filters above",
-  "clearSearchInput": "Clear search input",
-  "clientBalance": "Client Balance",
   "confirmDeleteMessage": "Are you sure you want to delete this payment mode? Proceed cautiously.",
   "createdSuccessfully": "Billable service created successfully",
   "currentPrice": "Current price",
-  "delete": "Delete",
+  "date": "Date",
+  "dateAndTime": "Date And Time",
+  "dateOfPayment": "Date of payment",
   "deletePaymentMode": "Delete Payment Mode",
+  "deleting": "Deleting",
   "description": "Description",
   "descriptionPlaceholder": "e.g., Used for all cash transactions",
   "discard": "Discard",
   "discount": "Discount",
-  "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",
+  "discountAmount": "Discount Amount",
   "editBillableService": "Edit billable service",
   "editBillableServices": "Edit Billable Services",
   "editBillLineItem": "Edit bill line item?",
@@ -73,6 +81,7 @@
   "errorFetchingPaymentModes": "An error occurred while fetching payment modes.",
   "errorLoadingBillServices": "Error loading bill services",
   "errorLoadingPaymentModes": "Payment modes error",
+  "errorPrintingInvoice": "Error printing invoice",
   "errorSavingCashPoint": "An error occurred while saving the cash point.",
   "errorSavingPaymentMode": "An error occurred while saving the payment mode.",
   "filterBy": "Filter by",
@@ -80,19 +89,27 @@
   "grandTotal": "Grand total",
   "home": "Home",
   "identifier": "Identifier",
-  "inlineLoading": "Loading bill items...",
   "insuranceScheme": "Insurance scheme",
+  "invalidUuidFormat": "Invalid UUID format",
   "invalidWaiverAmount": "Invalid waiver amount",
+  "inventoryItem": "Inventory item",
   "invoice": "Invoice",
+  "invoiceDate": "Invoice date",
   "invoiceError": "Invoice error",
+  "invoiceNumber": "Invoice #",
+  "invoiceStatus": "Invoice Status",
   "item": "Item",
   "itemsToBeBilled": "Items to be billed",
   "launchBillForm": "Launch bill form",
   "lineItems": "Line items",
   "loading": "Loading data...",
+  "loadingBillInfo": "Loading bill information...",
   "loadingBillingServices": "Loading billing services...",
+  "loadingBillItems": "Loading bill items",
+  "loadingData": "Loading data",
   "loadingDescription": "Loading",
   "location": "Select Location",
+  "locationRequired": "Location is required",
   "manageBillableServices": "Manage billable services",
   "name": "Name",
   "nextPage": "Next page",
@@ -101,8 +118,7 @@
   "noMatchingItemsToDisplay": "No matching items to display",
   "noMatchingServicesToDisplay": "No matching services to display",
   "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",
@@ -116,6 +132,7 @@
   "paymentModeHistory": "Payment Mode History",
   "paymentModeName": "Payment Mode Name",
   "paymentModeNamePlaceholder": "e.g., Cash, Credit Card",
+  "paymentModeNameRequired": "Payment Mode Name is required",
   "paymentModeSaved": "Payment mode was successfully saved.",
   "paymentModesConfig": "Payment Modes Config",
   "payments": "Payments",
@@ -130,41 +147,41 @@
   "printReceipt": "Print receipt",
   "processPayment": "Process Payment",
   "quantity": "Quantity",
-  "quantityGreaterThanZero": "Quantity must be greater than zero",
   "quantityRequired": "Quantity is required",
   "referenceNumber": "Reference number",
-  "save": "Save",
   "saveAndClose": "Save and close",
+  "saveBill": "Save Bill",
   "saving": "Saving",
   "searchConcepts": "Search associated concept",
   "searching": "Searching",
   "searchItems": "Search items and services",
   "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",
   "sellingPrice": "Selling Price",
-  "service": "Service",
   "serviceMetrics": "Service Metrics",
   "serviceName": "Service Name",
   "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}}.",
   "status": "Service Status",
-  "stockItem": "Stock Item",
   "submitting": "Submitting...",
   "success": "Success",
   "total": "Total",
   "totalAmount": "Total Amount",
   "totalTendered": "Total Tendered",
   "unitPrice": "Unit price",
+  "unitPriceHelperText": "This is the unit price for this item.",
   "updatedSuccessfully": "Billable service updated successfully",
   "uuid": "UUID",
+  "uuidRequired": "UUID is required",
   "visitTime": "Visit time",
   "waiverForm": "Waiver form"
 }