@openmrs/esm-billing-app 1.1.1 → 1.1.2-pre.1

package/src/metrics-cards/metrics.resource.ts

@@ -1,5 +1,4 @@
-import { calculateTotalAmount, convertToCurrency } from '../helpers';
-import { type MappedBill } from '../types';
+import { BillStatus, type MappedBill } from '../types';
 
 /**
  * A custom hook for calculating bill metrics.
@@ -31,9 +30,9 @@ const calculateBillTotals = (bills: Array<MappedBill>) => {
   let cumulativeTotal = 0;
 
   bills.forEach((bill) => {
-    if (bill?.status === 'PAID') {
+    if (bill?.status === BillStatus.PAID) {
       paidTotal += bill?.totalAmount;
-    } else if (bill?.status === 'PENDING') {
+    } else if (bill?.status === BillStatus.PENDING) {
       pendingTotal += bill?.totalAmount;
     }
     cumulativeTotal += bill?.totalAmount; // Add to cumulative total regardless of status

package/src/modal/finalize-bill-confirmation.modal.test.tsx

@@ -0,0 +1,209 @@
+import React from 'react';
+import userEvent from '@testing-library/user-event';
+import { render, screen, waitFor } from '@testing-library/react';
+import { showSnackbar } from '@openmrs/esm-framework';
+import { finalizeBill } from '../billing.resource';
+import FinalizeBillModal from './finalize-bill-confirmation.modal';
+import type { MappedBill } from '../types';
+import { BillStatus } from '../types';
+
+const mockFinalizeBill = jest.mocked(finalizeBill);
+const mockShowSnackbar = jest.mocked(showSnackbar);
+
+jest.mock('../billing.resource', () => ({
+  finalizeBill: jest.fn(),
+}));
+
+const mockBill: MappedBill = {
+  uuid: 'bill-uuid',
+  id: 1,
+  patientUuid: 'patient-uuid',
+  patientName: 'John Doe',
+  cashPointUuid: 'cash-point-uuid',
+  cashPointName: 'Main Cashier',
+  cashPointLocation: 'Main Hospital',
+  cashier: { uuid: 'cashier-uuid', display: 'Jane Cashier', links: [] },
+  receiptNumber: 'RCPT-001',
+  status: BillStatus.PENDING,
+  identifier: '12345678',
+  dateCreated: '2024-01-01',
+  lineItems: [
+    {
+      uuid: 'item-1',
+      item: 'X-Ray',
+      quantity: 1,
+      price: 500,
+      paymentStatus: BillStatus.PENDING,
+      billableService: 'X-Ray Service',
+    },
+  ],
+  billingService: 'X-Ray Service',
+  payments: [],
+  totalAmount: 500,
+  tenderedAmount: 0,
+};
+
+describe('FinalizeBillModal', () => {
+  const mockCloseModal = jest.fn();
+  const mockMutate = jest.fn();
+
+  it('renders the confirmation modal with correct content', () => {
+    render(<FinalizeBillModal closeModal={mockCloseModal} bill={mockBill} onMutate={mockMutate} />);
+
+    expect(screen.getByText(/finalize bill/i)).toBeInTheDocument();
+    expect(
+      screen.getByText(/are you sure you want to finalize this bill\? once finalized, no further modifications/i),
+    ).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: /cancel/i })).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: /finalize/i })).toBeInTheDocument();
+  });
+
+  it('calls closeModal when cancel is clicked', async () => {
+    const user = userEvent.setup();
+    render(<FinalizeBillModal closeModal={mockCloseModal} bill={mockBill} onMutate={mockMutate} />);
+
+    await user.click(screen.getByRole('button', { name: /cancel/i }));
+
+    expect(mockCloseModal).toHaveBeenCalled();
+  });
+
+  it('calls finalizeBill with bill uuid and shows success snackbar', async () => {
+    const user = userEvent.setup();
+    mockFinalizeBill.mockResolvedValueOnce({} as any);
+
+    render(<FinalizeBillModal closeModal={mockCloseModal} bill={mockBill} onMutate={mockMutate} />);
+
+    await user.click(screen.getByRole('button', { name: /finalize/i }));
+
+    await waitFor(() => {
+      expect(mockFinalizeBill).toHaveBeenCalledWith('bill-uuid');
+      expect(mockMutate).toHaveBeenCalled();
+      expect(mockShowSnackbar).toHaveBeenCalledWith({
+        kind: 'success',
+        title: 'Bill finalized',
+        subtitle: 'Bill has been finalized successfully',
+      });
+      expect(mockCloseModal).toHaveBeenCalled();
+    });
+  });
+
+  it('calls onMutate before closeModal on success', async () => {
+    const user = userEvent.setup();
+    const callOrder: string[] = [];
+    mockFinalizeBill.mockResolvedValueOnce({} as any);
+    mockMutate.mockImplementation(() => callOrder.push('onMutate'));
+    mockCloseModal.mockImplementation(() => callOrder.push('closeModal'));
+
+    render(<FinalizeBillModal closeModal={mockCloseModal} bill={mockBill} onMutate={mockMutate} />);
+    await user.click(screen.getByRole('button', { name: /finalize/i }));
+
+    await waitFor(() => expect(mockCloseModal).toHaveBeenCalled());
+    expect(callOrder).toEqual(['onMutate', 'closeModal']);
+  });
+
+  it('shows error snackbar when finalize fails', async () => {
+    const user = userEvent.setup();
+    mockFinalizeBill.mockRejectedValueOnce({ message: 'Network error' });
+
+    render(<FinalizeBillModal closeModal={mockCloseModal} bill={mockBill} onMutate={mockMutate} />);
+
+    await user.click(screen.getByRole('button', { name: /finalize/i }));
+
+    await waitFor(() => {
+      expect(mockShowSnackbar).toHaveBeenCalledWith({
+        kind: 'error',
+        title: 'Failed to finalize bill',
+        subtitle: 'Network error',
+      });
+    });
+    expect(mockCloseModal).not.toHaveBeenCalled();
+  });
+
+  it('shows error from responseBody when available', async () => {
+    const user = userEvent.setup();
+    mockFinalizeBill.mockRejectedValueOnce({
+      responseBody: { error: { message: 'Bill cannot be finalized' } },
+    });
+
+    render(<FinalizeBillModal closeModal={mockCloseModal} bill={mockBill} onMutate={mockMutate} />);
+
+    await user.click(screen.getByRole('button', { name: /finalize/i }));
+
+    await waitFor(() => {
+      expect(mockShowSnackbar).toHaveBeenCalledWith(expect.objectContaining({ subtitle: 'Bill cannot be finalized' }));
+    });
+  });
+
+  it('shows fallback error message when error has no message', async () => {
+    const user = userEvent.setup();
+    mockFinalizeBill.mockRejectedValueOnce({});
+
+    render(<FinalizeBillModal closeModal={mockCloseModal} bill={mockBill} onMutate={mockMutate} />);
+
+    await user.click(screen.getByRole('button', { name: /finalize/i }));
+
+    await waitFor(() => {
+      expect(mockShowSnackbar).toHaveBeenCalledWith(
+        expect.objectContaining({ subtitle: 'Unable to finalize bill. Please try again.' }),
+      );
+    });
+  });
+
+  it('disables buttons and shows loading state while finalizing', async () => {
+    const user = userEvent.setup();
+    mockFinalizeBill.mockImplementation(() => new Promise((resolve) => setTimeout(resolve, 100)));
+
+    render(<FinalizeBillModal closeModal={mockCloseModal} bill={mockBill} onMutate={mockMutate} />);
+
+    const finalizeButton = screen.getByRole('button', { name: /finalize/i });
+    await user.click(finalizeButton);
+
+    expect(finalizeButton).toBeDisabled();
+    expect(screen.getByRole('button', { name: /cancel/i })).toBeDisabled();
+    expect(screen.getByText(/finalizing/i)).toBeInTheDocument();
+
+    await waitFor(() => expect(mockCloseModal).toHaveBeenCalled());
+  });
+
+  it('re-enables finalize button after failed finalization', async () => {
+    const user = userEvent.setup();
+    mockFinalizeBill.mockRejectedValueOnce({ message: 'error' });
+
+    render(<FinalizeBillModal closeModal={mockCloseModal} bill={mockBill} onMutate={mockMutate} />);
+
+    const finalizeButton = screen.getByRole('button', { name: /finalize/i });
+    await user.click(finalizeButton);
+
+    await waitFor(() => expect(mockShowSnackbar).toHaveBeenCalledWith(expect.objectContaining({ kind: 'error' })));
+
+    expect(finalizeButton).toBeEnabled();
+  });
+
+  it('does not call onMutate when finalization fails', async () => {
+    const user = userEvent.setup();
+    mockFinalizeBill.mockRejectedValueOnce({ message: 'error' });
+
+    render(<FinalizeBillModal closeModal={mockCloseModal} bill={mockBill} onMutate={mockMutate} />);
+
+    await user.click(screen.getByRole('button', { name: /finalize/i }));
+
+    await waitFor(() => expect(mockShowSnackbar).toHaveBeenCalledWith(expect.objectContaining({ kind: 'error' })));
+
+    expect(mockMutate).not.toHaveBeenCalled();
+  });
+
+  it('works correctly when onMutate is not provided', async () => {
+    const user = userEvent.setup();
+    mockFinalizeBill.mockResolvedValueOnce({} as any);
+
+    render(<FinalizeBillModal closeModal={mockCloseModal} bill={mockBill} />);
+
+    await user.click(screen.getByRole('button', { name: /finalize/i }));
+
+    await waitFor(() => {
+      expect(mockFinalizeBill).toHaveBeenCalled();
+      expect(mockShowSnackbar).toHaveBeenCalledWith(expect.objectContaining({ kind: 'success' }));
+      expect(mockCloseModal).toHaveBeenCalled();
+    });
+  });
+});

package/src/modal/finalize-bill-confirmation.modal.tsx

@@ -0,0 +1,86 @@
+import React, { useState } from 'react';
+import { Button, InlineLoading, ModalBody, ModalFooter, ModalHeader } from '@carbon/react';
+import { useTranslation } from 'react-i18next';
+import { getCoreTranslation, showSnackbar } from '@openmrs/esm-framework';
+import { finalizeBill } from '../billing.resource';
+import { type MappedBill } from '../types';
+import styles from './delete-line-item-confirmation.scss';
+
+interface FinalizeBillModalParams {
+  closeModal: () => void;
+  bill: MappedBill;
+  onMutate?: () => void;
+}
+
+const FinalizeBillModal: React.FC<FinalizeBillModalParams> = ({ closeModal, bill, onMutate }) => {
+  const { t } = useTranslation();
+  const [isFinalizing, setIsFinalizing] = useState(false);
+
+  const handleFinalize = async () => {
+    if (!bill?.uuid) {
+      return;
+    }
+
+    setIsFinalizing(true);
+
+    try {
+      await finalizeBill(bill.uuid);
+
+      showSnackbar({
+        title: t('billFinalized', 'Bill finalized'),
+        subtitle: t('billFinalizedSuccess', 'Bill has been finalized successfully'),
+        kind: 'success',
+      });
+
+      onMutate?.();
+      closeModal();
+    } catch (err: any) {
+      const message =
+        err?.responseBody?.error?.message ||
+        err?.message ||
+        t('finalizeFailedTryAgain', 'Unable to finalize bill. Please try again.');
+
+      // eslint-disable-next-line no-console
+      console.error('[FinalizeBillModal] Bill finalization failed', err);
+
+      showSnackbar({
+        title: t('billFinalizeFailed', 'Failed to finalize bill'),
+        subtitle: message,
+        kind: 'error',
+      });
+    } finally {
+      setIsFinalizing(false);
+    }
+  };
+
+  return (
+    <>
+      <ModalHeader closeModal={closeModal} title={t('finalizeBill', 'Finalize bill')} />
+
+      <ModalBody className={styles.modalBody}>
+        <p>
+          {t(
+            'finalizeBillConfirmation',
+            'Are you sure you want to finalize this bill? Once finalized, no further modifications to the bill will be allowed.',
+          )}
+        </p>
+      </ModalBody>
+
+      <ModalFooter>
+        <Button kind="secondary" onClick={closeModal} disabled={isFinalizing}>
+          {getCoreTranslation('cancel')}
+        </Button>
+
+        <Button kind="primary" onClick={handleFinalize} disabled={isFinalizing}>
+          {isFinalizing ? (
+            <InlineLoading className={styles.spinner} description={t('finalizing', 'Finalizing') + '...'} />
+          ) : (
+            t('finalize', 'Finalize')
+          )}
+        </Button>
+      </ModalFooter>
+    </>
+  );
+};
+
+export default FinalizeBillModal;

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

@@ -15,6 +15,7 @@ import {
 import { getCoreTranslation, useConfig } from '@openmrs/esm-framework';
 import { useBills } from '../billing.resource';
 import { convertToCurrency } from '../helpers';
+import { BillStatus } from '../types';
 import styles from './require-payment.scss';
 
 type RequirePaymentModalProps = {
@@ -26,7 +27,7 @@ const RequirePaymentModal: React.FC<RequirePaymentModalProps> = ({ closeModal, p
   const { t } = useTranslation();
   const { defaultCurrency } = useConfig();
   const { bills, isLoading } = useBills(patientUuid);
-  const lineItems = bills.filter((bill) => bill?.status !== 'PAID').flatMap((bill) => bill?.lineItems);
+  const lineItems = bills.filter((bill) => bill?.status !== BillStatus.PAID).flatMap((bill) => bill?.lineItems);
 
   return (
     <>

package/src/routes.json

@@ -112,6 +112,10 @@
     {
       "name": "delete-line-item-confirmation-modal",
       "component": "deleteLineItemConfirmationModal"
+    },
+    {
+      "name": "finalize-bill-confirmation-modal",
+      "component": "finalizeBillConfirmationModal"
     }
   ],
   "workspaces2": [

package/src/types/index.ts

@@ -1,5 +1,14 @@
 import { type OpenmrsResource } from '@openmrs/esm-framework';
 
+export const BillStatus = {
+  PENDING: 'PENDING',
+  POSTED: 'POSTED',
+  PAID: 'PAID',
+  ADJUSTED: 'ADJUSTED',
+} as const;
+
+export type BillStatus = (typeof BillStatus)[keyof typeof BillStatus];
+
 export interface MappedBill {
   uuid: string;
   id: number;
@@ -10,7 +19,7 @@ export interface MappedBill {
   cashPointLocation: string;
   cashier: Provider;
   receiptNumber: string;
-  status: string;
+  status: BillStatus;
   identifier: string;
   dateCreated: string;
   lineItems: Array<LineItem>;

package/tools/setup-tests.ts

@@ -12,12 +12,13 @@ window.spaBase = '/spa';
 window.getOpenmrsSpaBase = () => '/openmrs/spa/';
 window.HTMLElement.prototype.scrollIntoView = jest.fn();
 
-// Mock ResizeObserver for Carbon components that use it (e.g., TextArea)
-global.ResizeObserver = jest.fn().mockImplementation(() => ({
-  observe: jest.fn(),
-  unobserve: jest.fn(),
-  disconnect: jest.fn(),
-}));
+class ResizeObserver {
+  observe() {}
+  unobserve() {}
+  disconnect() {}
+}
+window.ResizeObserver = ResizeObserver;
+global.ResizeObserver = ResizeObserver;
 
 // Suppress single-spa warnings in tests (these are expected when using framework mocks)
 const originalWarn = console.warn;

package/translations/am.json

@@ -3,6 +3,7 @@
   "addBillableService": "Add billable service",
   "addBillItems": "Add bill items",
   "addCashPoint": "Add cash point",
+  "addItemsToBill": "Add items to bill",
   "addNewBillableService": "Add new billable service",
   "addNewCashPoint": "Add new cash point",
   "addNewPaymentMode": "Add new payment mode",
@@ -38,6 +39,9 @@
   "billDate": "Bill date",
   "billedItems": "Billed items",
   "billErrorService": "Billing service error",
+  "billFinalized": "Bill finalized",
+  "billFinalizedSuccess": "Bill has been finalized successfully",
+  "billFinalizeFailed": "Failed to finalize bill",
   "billing": "Billing",
   "billingHistory": "Billing history",
   "billingSettings": "Billing settings",
@@ -72,6 +76,7 @@
   "childUnder5": "Child under 5",
   "clearSearch": "Clear",
   "confirmDeleteMessage": "Are you sure you want to delete this payment mode? Proceed cautiously.",
+  "createBill": "Create bill",
   "cumulativeBills": "Cumulative bills",
   "currentPrice": "Current price",
   "date": "Date",
@@ -100,16 +105,24 @@
   "errorDeletingPaymentMode": "An error occurred while deleting the payment mode.",
   "errorFetchingCashPoints": "An error occurred while fetching cash points.",
   "errorFetchingLocations": "An error occurred while fetching locations.",
+  "errorLoadingBill": "Error loading bill",
   "errorLoadingBillableServices": "Error loading billable services",
   "errorLoadingBillServices": "Error loading bill services",
+  "errorLoadingLastVisit": "An error occurred while loading the last visit",
   "errorLoadingPaymentModes": "Error loading payment modes",
   "errorPrintingInvoice": "Error printing invoice",
   "errorProcessingPayment": "Error processing payment",
   "errorSavingCashPoint": "An error occurred while saving the cash point.",
   "errorSavingPaymentMode": "An error occurred while saving the payment mode.",
+  "existingItems": "Existing items",
   "filterBillsByPatient": "Filter bills by patient name or identifier",
   "filterBy": "Filter by:",
   "filterTable": "Filter table",
+  "finalize": "Finalize",
+  "finalizeBill": "Finalize bill",
+  "finalizeBillConfirmation": "Are you sure you want to finalize this bill? Once finalized, no further modifications to the bill will be allowed.",
+  "finalizeFailedTryAgain": "Unable to finalize bill. Please try again.",
+  "finalizing": "Finalizing",
   "gender": "Gender",
   "grandTotal": "Grand total",
   "home": "Home",
@@ -125,7 +138,13 @@
   "invoiceStatus": "Invoice status",
   "invoiceSummary": "Invoice summary",
   "item": "Item",
+  "itemsAddedToBill": "Items added to bill",
+  "itemsAddedToBillSuccessfully": "Items have been added to the bill successfully",
   "itemsToBeBilled": "Items to be billed",
+  "lastVisitError": "Last visit error",
+  "lastVisitInfo": "Last Visit Information",
+  "lastVisitMsg_one": "The last visit was a {{type}} {{count}} day ago at {{location}}",
+  "lastVisitMsg_other": "The last visit was a {{type}} {{count}} days ago at {{location}}",
   "lineItemDeleted": "Line item deleted",
   "lineItemDeleteFailed": "Failed to delete line item",
   "lineItemDeleteSuccess": "Bill line item deleted successfully",
@@ -144,6 +163,7 @@
   "locationRequired": "Location is required",
   "manageBillableServices": "Manage billable services",
   "name": "Name",
+  "newItems": "New items",
   "nextPage": "Next page",
   "no": "No",
   "noBillsToDisplay": "There are no bills to display.",
@@ -152,6 +172,7 @@
   "noMatchingItemsToDisplay": "No matching items to display",
   "noMatchingServicesToDisplay": "No matching services to display",
   "nonPaying": "Non paying",
+  "nonPayingInfo": "Any services rendered to non-paying patients will not be billed",
   "noResultsFor": "No results for {{searchTerm}}",
   "number": "Number",
   "ok": "OK",
@@ -184,11 +205,14 @@
   "paymentProcessedSuccessfully": "Payment processed successfully",
   "payments": "Payments",
   "pendingBills": "Pending bills",
+  "pendingConfirmationBills": "Pending confirmation",
+  "pendingPaymentBills": "Pending payment",
   "policyNumber": "Policy number",
   "postWaiver": "Post waiver",
   "previousPage": "Previous page",
   "price": "Price",
   "priceIsRequired": "Price is required",
+  "priceMustBeNonNegative": "Price must be 0 or greater",
   "priceMustBeNumber": "Price must be a valid number",
   "priceMustBePositive": "Price must be greater than 0",
   "prices": "Prices",
@@ -222,15 +246,18 @@
   "serviceName": "Service name",
   "serviceNameExceedsLimit": "Service name cannot exceed {{MAX_NAME_LENGTH}} characters",
   "serviceNameRequired": "Service name is required",
+  "serviceResolutionError": "Could not resolve service \"{{service}}\"",
   "servicesList": "Services list",
   "serviceStatus": "Service status",
   "serviceType": "Service type",
   "serviceTypeRequired": "Service type is required",
   "shortName": "Short name",
   "shortNameExceedsLimit": "Short name cannot exceed {{MAX_NAME_LENGTH}} characters",
+  "showInformation": "Show information",
   "status": "Service status",
   "student": "Student",
   "submitting": "Submitting",
+  "subtotal": "Subtotal",
   "success": "Success",
   "total": "Total",
   "totalAmount": "Total amount",
@@ -238,6 +265,7 @@
   "totalTendered": "Total tendered",
   "unitPrice": "Unit price",
   "unitPriceHelperText": "This is the unit price for this item",
+  "unknownBillError": "An unexpected error occurred",
   "uuid": "UUID",
   "uuidRequired": "UUID is required",
   "validationError": "Validation error",

package/translations/ar.json

@@ -3,6 +3,7 @@
   "addBillableService": "إضافة خدمة قابلة للفوترة",
   "addBillItems": "Add bill items",
   "addCashPoint": "Add cash point",
+  "addItemsToBill": "Add items to bill",
   "addNewBillableService": "إضافة خدمة جديدة قابلة للفوترة",
   "addNewCashPoint": "Add new cash point",
   "addNewPaymentMode": "Add new payment mode",
@@ -38,6 +39,9 @@
   "billDate": "تاريخ الفاتورة",
   "billedItems": "العناصر المفوترة",
   "billErrorService": "خطأ في خدمة الفوترة",
+  "billFinalized": "Bill finalized",
+  "billFinalizedSuccess": "Bill has been finalized successfully",
+  "billFinalizeFailed": "Failed to finalize bill",
   "billing": "الفواتير",
   "billingHistory": "تاريخ الفواتير",
   "billingSettings": "إعدادات الفواتير",
@@ -72,6 +76,7 @@
   "childUnder5": "طفل أقل من  5 سنوات",
   "clearSearch": "مسح",
   "confirmDeleteMessage": "هل أنت متأكد من حذف طريقة الدفع هذه؟ يرجى المتابعة بحذر.",
+  "createBill": "Create bill",
   "cumulativeBills": "الفواتير التراكمية",
   "currentPrice": "السعر الحالي",
   "date": "التاريخ",
@@ -100,16 +105,24 @@
   "errorDeletingPaymentMode": "حدث خطأ أثناء حذف طريقة الدفع",
   "errorFetchingCashPoints": "حدث خطأ أثناء جلب نقاط التحصيل للمال",
   "errorFetchingLocations": "حدث خطأ أثناء جلب المواقع",
+  "errorLoadingBill": "Error loading bill",
   "errorLoadingBillableServices": "خطأ أثناء تحميل الخدمات القابلة للفوترة",
   "errorLoadingBillServices": "خطأ أثناء تحميل خدمات الفاتورة",
+  "errorLoadingLastVisit": "An error occurred while loading the last visit",
   "errorLoadingPaymentModes": "خطأ أثناء تحميل طرق الدفع",
   "errorPrintingInvoice": "خطأ أثناء طباعة الفاتورة",
   "errorProcessingPayment": "خطأ أثناء معالجة الدفع",
   "errorSavingCashPoint": "حدث خطأ أثناء حفظ نقطة التحصيل",
   "errorSavingPaymentMode": "حدث خطأ أثناء حفظ طريقة الدفع",
+  "existingItems": "Existing items",
   "filterBillsByPatient": "فلترة الفواتير حسب اسم المريض أو المعرّف",
   "filterBy": "فلترة حسب",
   "filterTable": "جدول الفلترة",
+  "finalize": "Finalize",
+  "finalizeBill": "Finalize bill",
+  "finalizeBillConfirmation": "Are you sure you want to finalize this bill? Once finalized, no further modifications to the bill will be allowed.",
+  "finalizeFailedTryAgain": "Unable to finalize bill. Please try again.",
+  "finalizing": "Finalizing",
   "gender": "الجنس",
   "grandTotal": "الإجمالي الكلي",
   "home": "الصفحة الرئيسية",
@@ -125,7 +138,13 @@
   "invoiceStatus": "حالة الفاتورة",
   "invoiceSummary": "ملخص الفاتورة",
   "item": "عنصر",
+  "itemsAddedToBill": "Items added to bill",
+  "itemsAddedToBillSuccessfully": "Items have been added to the bill successfully",
   "itemsToBeBilled": "العناصر المطلوب فوترتها",
+  "lastVisitError": "Last visit error",
+  "lastVisitInfo": "Last Visit Information",
+  "lastVisitMsg_one": "The last visit was a {{type}} {{count}} day ago at {{location}}",
+  "lastVisitMsg_other": "The last visit was a {{type}} {{count}} days ago at {{location}}",
   "lineItemDeleted": "تم حذف العنصر",
   "lineItemDeleteFailed": "فشل في حذف العنصر",
   "lineItemDeleteSuccess": "تم حذف عنصر الفاتورة بنجاح",
@@ -144,6 +163,7 @@
   "locationRequired": "الموقع مطلوب",
   "manageBillableServices": "إدارة الخدمات القابلة للفوترة",
   "name": "الاسم",
+  "newItems": "New items",
   "nextPage": "الصفحة التالية",
   "no": "لا",
   "noBillsToDisplay": "لا توجد فواتير للعرض",
@@ -152,6 +172,7 @@
   "noMatchingItemsToDisplay": "لا توجد عناصر للعرض",
   "noMatchingServicesToDisplay": "لا توجد عناصر مطابقة للعرض",
   "nonPaying": "غير دافع",
+  "nonPayingInfo": "Any services rendered to non-paying patients will not be billed",
   "noResultsFor": "لا توجد نتائج لـ {{searchTerm}}",
   "number": "رقم",
   "ok": "موافق",
@@ -184,11 +205,14 @@
   "paymentProcessedSuccessfully": "تمت معالجة الدفع بنجاح",
   "payments": "المدفوعات",
   "pendingBills": "الفواتير المعلقة",
+  "pendingConfirmationBills": "Pending confirmation",
+  "pendingPaymentBills": "Pending payment",
   "policyNumber": "رقم الوثيقة",
   "postWaiver": "تأكيد الإعفاء",
   "previousPage": "الصفحة السابقة",
   "price": "السعر",
   "priceIsRequired": "السعر مطلوب",
+  "priceMustBeNonNegative": "Price must be 0 or greater",
   "priceMustBeNumber": "يجب أن يكون السعر رقمًا صالحًا",
   "priceMustBePositive": "يجب أن يكون السعر أكبر من 0",
   "prices": "الأسعار",
@@ -222,15 +246,18 @@
   "serviceName": "اسم الخدمة",
   "serviceNameExceedsLimit": "لا يمكن أن يتجاوز اسم الخدمة {{MAX_NAME_LENGTH}} حرفًا",
   "serviceNameRequired": "اسم الخدمة مطلوب",
+  "serviceResolutionError": "Could not resolve service \"{{service}}\"",
   "servicesList": "قائمة الخدمات",
   "serviceStatus": "حالة الخدمة",
   "serviceType": "نوع الخدمة",
   "serviceTypeRequired": "نوع الخدمة مطلوب",
   "shortName": "أسم مختصر",
   "shortNameExceedsLimit": "لا يمكن أن يتجاوز الاسم المختصر {{MAX_NAME_LENGTH}} حرفًا",
+  "showInformation": "Show information",
   "status": "حالة الخدمة",
   "student": "طالب",
   "submitting": "جارٍ الإرسال",
+  "subtotal": "Subtotal",
   "success": "نجاح",
   "total": "الإجمالي",
   "totalAmount": "إجمالي المبلغ",
@@ -238,6 +265,7 @@
   "totalTendered": "إجمالي المُسدَّد",
   "unitPrice": "سعر الوحدة",
   "unitPriceHelperText": "هذا هو سعر الوحدة لهذا البند",
+  "unknownBillError": "An unexpected error occurred",
   "uuid": "المعرّف الفريد UUID",
   "uuidRequired": "المعرّف الفريد UUID مطلوب",
   "validationError": "خطأ في التحقق",