@openmrs/esm-billing-app 1.0.2-pre.834 → 1.0.2-pre.838

package/src/bills-table/bills-table.component.tsx

@@ -149,7 +149,7 @@ const BillsTable = () => {
     return (
       <div className={styles.errorContainer}>
         <Layer>
-          <ErrorState error={error} headerTitle={t('billsList', 'Bill list')} />
+          <ErrorState error={error} headerTitle={t('billList', 'Bill list')} />
         </Layer>
       </div>
     );
@@ -168,7 +168,7 @@ const BillsTable = () => {
           label=""
           onChange={handleFilterChange}
           size={responsiveSize}
-          titleText={t('filterBy', 'Filter by') + ':'}
+          titleText={t('filterBy', 'Filter by:')}
           type="inline"
         />
       </div>
@@ -190,7 +190,7 @@ const BillsTable = () => {
             useZebraStyles={rowData?.length > 1 ? true : false}>
             {({ rows, headers, getRowProps, getTableProps }) => (
               <TableContainer>
-                <Table {...getTableProps()} aria-label="bill list">
+                <Table {...getTableProps()} aria-label={t('billList', 'Bill list')}>
                   <TableHead>
                     <TableRow>
                       {headers.map((header) => (

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

@@ -61,7 +61,7 @@ const InvoiceTable: React.FC<InvoiceTableProps> = ({ bill, isLoadingBill }) => {
   }, [debouncedSearchTerm, lineItems]);
 
   const tableHeaders = [
-    { header: t('number', 'No'), key: 'no', width: 7 }, // Width as a percentage
+    { header: t('number', 'Number'), key: 'no', width: 7 }, // Width as a percentage
     { header: t('billItem', 'Bill item'), key: 'billItem', width: 25 },
     { header: t('billCode', 'Bill code'), key: 'billCode', width: 20 },
     { header: t('status', 'Status'), key: 'status', width: 25 },
@@ -147,7 +147,7 @@ const InvoiceTable: React.FC<InvoiceTableProps> = ({ bill, isLoadingBill }) => {
             />
             <Table
               {...getTableProps()}
-              aria-label="Invoice line items"
+              aria-label={t('invoiceLineItems', 'Invoice line items')}
               className={`${styles.invoiceTable} billingTable`}>
               <TableHead>
                 <TableRow>

package/src/invoice/invoice-table.test.tsx

@@ -81,7 +81,7 @@ describe('InvoiceTable', () => {
 
     expect(screen.getByText(/line items/i)).toBeInTheDocument();
     expect(screen.getByText(/items to be billed/i)).toBeInTheDocument();
-    expect(screen.getByRole('columnheader', { name: /no/i })).toBeInTheDocument();
+    expect(screen.getByRole('columnheader', { name: /number/i })).toBeInTheDocument();
     expect(screen.getByRole('columnheader', { name: /bill item/i })).toBeInTheDocument();
     expect(screen.getByRole('columnheader', { name: /bill code/i })).toBeInTheDocument();
     expect(screen.getByRole('columnheader', { name: /status/i })).toBeInTheDocument();

package/src/invoice/invoice.component.tsx

@@ -67,11 +67,11 @@ const Invoice: React.FC = () => {
 
   // Do not remove this comment. Adds the translation keys for the invoice details
   /**
-   * t('totalAmount', 'Total Amount')
-   * t('amountTendered', 'Amount Tendered')
-   * t('invoiceNumber', 'Invoice Number')
-   * t('dateAndTime', 'Date And Time')
-   * t('invoiceStatus', 'Invoice Status')
+   * t('totalAmount', 'Total amount')
+   * t('amountTendered', 'Amount tendered')
+   * t('invoiceNumber', 'Invoice #')
+   * t('dateAndTime', 'Date and time')
+   * t('invoiceStatus', 'Invoice status')
    */
   const invoiceDetails = {
     'Total Amount': convertToCurrency(bill?.totalAmount, defaultCurrency),
@@ -86,9 +86,7 @@ const Invoice: React.FC = () => {
       <div className={styles.invoiceContainer}>
         <InlineLoading
           className={styles.loader}
-          status="active"
-          iconDescription="Loading"
-          description={t('loadingBillInfo', 'Loading bill information...')}
+          description={`${t('loadingBillInfo', 'Loading bill information')}...`}
         />
       </div>
     );
@@ -116,7 +114,7 @@ const Invoice: React.FC = () => {
             disabled={isPrinting || isLoadingPatient || isLoadingBill}
             onClick={handlePrint}
             renderIcon={(props) => <Printer size={24} {...props} />}
-            iconDescription="Print bill"
+            iconDescription={t('printBill', 'Print bill')}
             size="md">
             {t('printBill', 'Print bill')}
           </Button>

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

@@ -114,17 +114,17 @@ const Payments: React.FC<PaymentProps> = ({ bill, mutate }) => {
         <div className={styles.divider} />
         <div className={styles.paymentTotals}>
           <InvoiceBreakDown
-            label={t('totalAmount', 'Total Amount')}
+            label={t('totalAmount', 'Total amount')}
             value={convertToCurrency(bill.totalAmount, defaultCurrency)}
           />
           <InvoiceBreakDown
-            label={t('totalTendered', 'Total Tendered')}
+            label={t('totalTendered', 'Total tendered')}
             value={convertToCurrency(bill.tenderedAmount, defaultCurrency)}
           />
           <InvoiceBreakDown label={t('discount', 'Discount')} value={'--'} />
           <InvoiceBreakDown
             hasBalance={amountDue < 0}
-            label={t('amountDue', 'Amount Due')}
+            label={t('amountDue', 'Amount due')}
             value={convertToCurrency(amountDue < 0 ? -amountDue : amountDue, defaultCurrency)}
           />
           <div className={styles.processPayments}>

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

@@ -134,9 +134,9 @@ describe('Payments', () => {
 
   it('renders payment form and history', () => {
     render(<Payments bill={mockBill} mutate={mockMutate} />);
-    expect(screen.getByText('Payments')).toBeInTheDocument();
-    expect(screen.getByText('Total Amount:')).toBeInTheDocument();
-    expect(screen.getByText('Total Tendered:')).toBeInTheDocument();
+    expect(screen.getByText(/payments/i)).toBeInTheDocument();
+    expect(screen.getByText(/total amount:/i)).toBeInTheDocument();
+    expect(screen.getByText(/total tendered:/i)).toBeInTheDocument();
   });
 
   it('displays formatted currency amounts', () => {
@@ -191,7 +191,7 @@ describe('Payments', () => {
 
     render(<Payments bill={billWithBalance} mutate={mockMutate} />);
 
-    expect(screen.getByText('Amount Due:')).toBeInTheDocument();
+    expect(screen.getByText(/amount due:/i)).toBeInTheDocument();
     // The amount due section should be visible for bills with remaining balance
     const formattedAmounts = screen.getAllByText('$1000.00');
     expect(formattedAmounts.length).toBeGreaterThan(0);
@@ -207,7 +207,7 @@ describe('Payments', () => {
     render(<Payments bill={billWithOverpayment} mutate={mockMutate} />);
 
     // Even with negative amount due (overpayment), the display should show positive value
-    expect(screen.getByText('Amount Due:')).toBeInTheDocument();
+    expect(screen.getByText(/amount due:/i)).toBeInTheDocument();
     const formattedAmounts = screen.getAllByText('$1000.00');
     expect(formattedAmounts.length).toBeGreaterThan(0);
   });

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

@@ -47,9 +47,9 @@ const PrintableInvoice: React.FC<PrintableInvoiceProps> = ({ bill, patient, comp
     }) ?? [];
 
   const invoiceTotal = {
-    [t('totalAmount', 'Total Amount')]: bill?.totalAmount,
-    [t('amountTendered', 'Amount Tendered')]: bill?.tenderedAmount,
-    [t('discountAmount', 'Discount Amount')]: 0,
+    [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,
   };
 
@@ -88,7 +88,7 @@ const PrintableInvoice: React.FC<PrintableInvoiceProps> = ({ bill, patient, comp
             <DataTable rows={rowData} headers={headerData} size={responsiveSize} useZebraStyles={false}>
               {({ rows, headers, getRowProps, getTableProps }) => (
                 <TableContainer>
-                  <Table {...getTableProps()} aria-label="Invoice line items">
+                  <Table {...getTableProps()} aria-label={t('invoiceLineItems', 'Invoice line items')}>
                     <TableHead>
                       <TableRow>
                         {headers.map((header) => (

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

@@ -2,6 +2,7 @@ import React, { useMemo } from 'react';
 import { InlineLoading } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
 import { ErrorState } from '@openmrs/esm-patient-common-lib';
+import { getCoreTranslation } from '@openmrs/esm-framework';
 import { useBills } from '../billing.resource';
 import { useBillMetrics } from './metrics.resource';
 import Card from './card.component';
@@ -24,7 +25,11 @@ export default function MetricsCards() {
   if (isLoading) {
     return (
       <section className={styles.container}>
-        <InlineLoading status="active" iconDescription="Loading" description="Loading bill metrics..." />
+        <InlineLoading
+          status="active"
+          iconDescription={getCoreTranslation('loading')}
+          description={t('loadingBillMetrics', 'Loading bill metrics') + '...'}
+        />
       </section>
     );
   }

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

@@ -41,7 +41,7 @@ const RequirePaymentModal: React.FC<RequirePaymentModalProps> = ({ closeModal, p
         {isLoading && (
           <InlineLoading
             status="active"
-            iconDescription="Loading"
+            iconDescription={getCoreTranslation('loading')}
             description={t('loadingBillItems', 'Loading bill items') + '...'}
           />
         )}

package/translations/en.json

@@ -1,84 +1,82 @@
 {
   "add": "Add",
-  "addBill": "Add bill item(s)",
-  "addBillableServices": "Add Billable Services",
-  "addCashPoint": "Add Cash Point",
+  "addBill": "Add bill items",
+  "addBillableService": "Add billable service",
+  "addCashPoint": "Add cash point",
   "addNewBillableService": "Add new billable service",
-  "addNewCashPoint": "Add New Cash Point",
-  "addNewPaymentMode": "Add New Payment Mode",
+  "addNewCashPoint": "Add new cash point",
+  "addNewPaymentMode": "Add new payment mode",
   "addNewService": "Add new service",
   "addPaymentMethod": "Add payment method",
-  "addPaymentMode": "Add Payment Mode",
+  "addPaymentMode": "Add payment mode",
   "addPaymentOption": "Add payment option",
   "amount": "Amount",
-  "amountDue": "Amount Due",
+  "amountDue": "Amount due",
   "amountMustBePositive": "Amount must be greater than 0",
   "amountRequired": "Amount is required",
-  "amountTendered": "Amount Tendered",
+  "amountTendered": "Amount tendered",
   "amountToWaiveAriaLabel": "Enter amount to waive",
   "amountToWaiveHelper": "Specify the amount to be deducted from the bill",
-  "amountToWaiveLabel": "Amount to Waive",
+  "amountToWaiveLabel": "Amount to waive",
   "associatedConcept": "Associated concept",
   "billableService": "Billable service",
-  "billableServices": "Billable Services",
+  "billableServices": "Billable services",
   "billableServices__lower": "billable services",
   "billAmount": "Bill amount",
   "billCode": "Bill code",
   "billCreatedSuccessfully": "Bill created successfully",
   "billCreationError": "Bill creation error",
-  "billedItems": "Billed Items",
+  "billedItems": "Billed items",
   "billedTo": "Billed to",
-  "billErrorService": "Bill service error",
+  "billErrorService": "Billing service error",
   "billing": "Billing",
   "billingForm": "Billing form",
-  "billingHistory": "Billing History",
-  "billingSettings": "Billing Settings",
+  "billingHistory": "Billing history",
+  "billingSettings": "Billing settings",
   "billItem": "Bill item",
-  "billItems": "Bill Items",
+  "billItems": "Bill items",
   "billLineItemEmpty": "This bill has no line items",
   "billList": "Bill list",
   "billMetrics": "Bill metrics",
-  "billName": " {{billName}} ",
+  "billName": "{{billName}}",
   "billPayment": "Bill payment",
   "billPaymentError": "Bill payment error",
   "billPaymentRequiredMessage": "The current patient has a pending bill. Advise the patient to settle the bill before receiving services",
+  "billProcessedSuccessfully": "Bill processed successfully",
   "billProcessingError": "Bill processing error",
-  "billProcessingSuccess": "Bill processing has been successful",
   "billServicesManagement": "Bill services management",
-  "billsList": "Bill list",
+  "billsTable": "Bills table",
   "billTotal": "Bill total",
   "billWaiver": "Bill waiver",
   "billWaiverError": "Bill waiver failed {{error}}",
   "billWaiverSuccess": "Bill waiver successful",
-  "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",
+  "cashPointConfig": "Cash point configuration",
+  "cashPointHistory": "Cash point history",
+  "cashPointLocation": "Cash point location",
+  "cashPointName": "Cash point name",
+  "cashPointNamePlaceholder": "For example, Pharmacy Cash Point",
+  "cashPointNameRequired": "Cash point name is required",
   "cashPointSaved": "Cash point was successfully saved.",
-  "cashPointUuid": "Cash Point UUID",
+  "cashPointUuid": "Cash point UUID",
   "cashPointUuidPlaceholder": "Enter UUID",
   "checkFilters": "Check the filters above",
   "confirmDeleteMessage": "Are you sure you want to delete this payment mode? Proceed cautiously.",
   "createdSuccessfully": "Billable service created successfully",
   "currentPrice": "Current price",
   "date": "Date",
-  "dateAndTime": "Date And Time",
+  "dateAndTime": "Date and time",
   "dateOfPayment": "Date of payment",
-  "deletePaymentMode": "Delete Payment Mode",
+  "deletePaymentMode": "Delete payment mode",
   "deleting": "Deleting",
   "description": "Description",
-  "descriptionPlaceholder": "e.g., Used for all cash transactions",
+  "descriptionPlaceholder": "For example, Used for all cash transactions",
   "discard": "Discard",
   "discount": "Discount",
-  "discountAmount": "Discount Amount",
+  "discountAmount": "Discount amount",
   "editBillableService": "Edit billable service",
-  "editBillableServices": "Edit Billable Services",
   "editBillLineItem": "Edit bill line item",
   "editThisBillItem": "Edit this bill item",
   "enterAmount": "Enter amount",
-  "enterConcept": "Associated concept",
   "enterReferenceNumber": "Enter reference number",
   "enterSellingPrice": "Enter selling price",
   "enterServiceName": "Enter service name",
@@ -88,13 +86,14 @@
   "errorFetchingCashPoints": "An error occurred while fetching cash points.",
   "errorFetchingLocations": "An error occurred while fetching locations.",
   "errorFetchingPaymentModes": "An error occurred while fetching payment modes.",
+  "errorLoadingBillableServices": "Error loading billable services",
   "errorLoadingBillServices": "Error loading bill services",
   "errorLoadingPaymentModes": "Payment modes error",
   "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.",
-  "filterBy": "Filter by",
+  "filterBy": "Filter by:",
   "filterTable": "Filter table",
   "grandTotal": "Grand total",
   "home": "Home",
@@ -106,8 +105,9 @@
   "invoice": "Invoice",
   "invoiceDate": "Invoice date",
   "invoiceError": "Invoice error",
+  "invoiceLineItems": "Invoice line items",
   "invoiceNumber": "Invoice #",
-  "invoiceStatus": "Invoice Status",
+  "invoiceStatus": "Invoice status",
   "item": "Item",
   "itemsToBeBilled": "Items to be billed",
   "launchBillForm": "Launch bill form",
@@ -116,57 +116,59 @@
   "lineItemUpdateErrorDefault": "Unable to update the bill line item. Please try again.",
   "lineItemUpdateFailed": "Failed to update line item",
   "lineItemUpdateSuccess": "The bill line item has been updated successfully",
-  "loading": "Loading data...",
-  "loadingBillInfo": "Loading bill information...",
-  "loadingBillingServices": "Loading billing services...",
+  "loading": "Loading data",
+  "loadingBillInfo": "Loading bill information",
+  "loadingBillingServices": "Loading billing services",
   "loadingBillItems": "Loading bill items",
-  "loadingData": "Loading data",
+  "loadingBillMetrics": "Loading bill metrics",
   "loadingDescription": "Loading",
-  "location": "Select Location",
+  "loadingServiceMetrics": "Loading service metrics",
+  "location": "Location",
   "locationRequired": "Location is required",
   "manageBillableServices": "Manage billable services",
   "name": "Name",
   "nextPage": "Next page",
-  "noBilltoDisplay": "There are no bills to display for this patient",
+  "noBillToDisplay": "There are no bills to display for this patient",
   "noMatchingBillsToDisplay": "No matching bills to display",
   "noMatchingItemsToDisplay": "No matching items to display",
   "noMatchingServicesToDisplay": "No matching services to display",
-  "noResultsFor": "No results for",
-  "number": "No",
+  "noResultsFor": "No results for {searchTerm}",
+  "number": "Number",
   "ok": "OK",
   "patientBill": "Patient bill",
-  "patientBillingAlert": "Patient Billing Alert",
-  "patientBills": "Patient bill",
+  "patientBillingAlert": "Patient billing alert",
+  "patientBills": "Patient bills",
   "patientBillsDescription": "List of patient bills",
   "patientCategory": "Patient category",
   "paymentAmountCannotExceedAmountDue": "Payment amount cannot exceed amount due",
-  "paymentDetails": "Payment Details",
+  "paymentDetails": "Payment details",
   "paymentMethod": "Payment method",
+  "paymentMethodRequired": "Payment method is required for all items",
   "paymentMethods": "Payment methods",
-  "paymentMode": "Payment Mode",
+  "paymentMode": "Payment mode",
   "paymentModeDeleted": "Payment mode was successfully deleted.",
-  "paymentModeHistory": "Payment Mode History",
-  "paymentModeName": "Payment Mode Name: {{paymentModeName}}",
-  "paymentModeNamePlaceholder": "e.g., Cash, Credit Card",
-  "paymentModeNameRequired": "Payment Mode Name is required",
+  "paymentModeHistory": "Payment mode history",
+  "paymentModeName": "Payment mode name: {{paymentModeName}}",
+  "paymentModeNameLabel": "Payment mode name",
+  "paymentModeNamePlaceholder": "For example, Cash, Credit Card",
+  "paymentModeNameRequired": "Payment mode name is required",
   "paymentModeRequired": "Payment mode is required",
   "paymentModeSaved": "Payment mode was successfully saved.",
-  "paymentModesConfig": "Payment Modes Config",
+  "paymentModesConfig": "Payment modes configuration",
   "paymentOptionRequired": "At least one payment option is required",
   "paymentProcessedSuccessfully": "Payment processed successfully",
   "payments": "Payments",
   "policyNumber": "Policy number",
   "postWaiver": "Post waiver",
   "previousPage": "Previous page",
-  "price": "Unit Price",
+  "price": "Price",
   "priceIsRequired": "Price is required",
-  "priceMustBeGreaterThanZero": "Price must be greater than 0",
   "priceMustBeNumber": "Price must be a valid number",
   "priceMustBePositive": "Price must be greater than 0",
   "prices": "Prices",
   "printBill": "Print bill",
   "printReceipt": "Print receipt",
-  "processPayment": "Process Payment",
+  "processPayment": "Process payment",
   "quantity": "Quantity",
   "quantityCannotExceed100": "Quantity cannot exceed 100",
   "quantityMustBeAtLeastOne": "Quantity must be at least 1",
@@ -177,44 +179,43 @@
   "remove": "Remove",
   "removePaymentMethod": "Remove payment method",
   "saveAndClose": "Save and close",
-  "saveBill": "Save Bill",
+  "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",
-  "selectedItems": "Selected Items",
-  "selectLocation": "Select Location",
+  "selectedItems": "Selected items",
+  "selectLocation": "Select location",
   "selectPatientCategory": "Select patient category",
   "selectPaymentMethod": "Select payment method",
-  "selectPaymentMethodRequired": "Please select a payment method for all items",
   "selectPaymentMode": "Select payment mode",
   "selectServiceType": "Select service type",
-  "sellingPrice": "Selling Price",
-  "serviceMetrics": "Service Metrics",
-  "serviceName": "Service Name",
-  "serviceNameExceedsLimit": "Service Name exceeds the character limit of {{MAX_NAME_LENGTH}}.",
+  "sellingPrice": "Selling price",
+  "serviceList": "Service list",
+  "serviceMetrics": "Service metrics",
+  "serviceName": "Service name",
+  "serviceNameExceedsLimit": "Service name exceeds the character limit of {{MAX_NAME_LENGTH}}.",
   "serviceNameRequired": "Service name is required",
-  "serviceShortName": "Short Name",
   "servicesList": "Services list",
-  "serviceStatus": "Service Status",
-  "serviceType": "Service Type",
+  "serviceStatus": "Service status",
+  "serviceType": "Service type",
   "serviceTypeRequired": "Service type is required",
-  "shortName": "Short Name",
-  "shortNameExceedsLimit": "Short Name exceeds the character limit of {{MAX_NAME_LENGTH}}.",
-  "status": "Service Status",
-  "submitting": "Submitting...",
+  "shortName": "Short name",
+  "shortNameExceedsLimit": "Short name exceeds the character limit of {{MAX_NAME_LENGTH}}.",
+  "status": "Service status",
+  "submitting": "Submitting",
   "success": "Success",
   "total": "Total",
-  "totalAmount": "Total Amount",
-  "totalTendered": "Total Tendered",
+  "totalAmount": "Total amount",
+  "totalTendered": "Total tendered",
   "unitPrice": "Unit price",
-  "unitPriceHelperText": "This is the unit price for this item.",
+  "unitPriceHelperText": "This is the unit price for this item",
   "updatedSuccessfully": "Billable service updated successfully",
   "uuid": "UUID",
   "uuidRequired": "UUID is required",
-  "validationError": "Validation Error",
+  "validationError": "Validation error",
   "visitTime": "Visit time",
   "waiverForm": "Waiver form"
 }