@kenyaemr/esm-billing-app 5.4.2-pre.2301 → 5.4.2-pre.2306

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[{"component":"billableServicesHome","route":"billable-services"},{"component":"requirePaymentModal","routeRegex":"^patient/.+/chart","online":true,"offline":false}],"extensions":[{"component":"benefitsPackageDashboardLink","name":"benefits-package-dashboard-link","slot":"patient-chart-dashboard-slot","meta":{"name":"benefits-package","slot":"patient-chart-benefits-dashboard-slot","path":"insurance-benefits","columns":1,"columnSpan":1},"featureFlag":"healthInformationExchange"},{"component":"benefitsPackage","name":"benefits-package","slot":"patient-chart-benefits-dashboard-slot"},{"component":"root","name":"billing-dashboard-root","slot":"billing-dashboard-slot"},{"component":"benefitsEligibilyRequestForm","name":"benefits-eligibility-request-form"},{"component":"benefitsPreAuthForm","name":"benefits-pre-auth-form"},{"name":"billing-patient-summary","component":"billingPatientSummary","slot":"patient-chart-billing-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"billing-summary-dashboard-link","component":"billingSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":11,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-billing-dashboard-slot","path":"Billing","layoutMode":"anchored"}},{"name":"billing-check-in-form","slot":"extra-visit-attribute-slot","component":"billingCheckInForm"},{"name":"require-billing-modal","component":"requirePaymentModal"},{"name":"patient-banner-billing-tags","component":"visitAttributeTags","slot":"patient-banner-tags-slot","order":2},{"name":"initiate-payment-modal","component":"initiatePaymentDialog"},{"name":"delete-billableservice-modal","component":"deleteBillableServiceModal"},{"name":"refund-bill-modal","component":"refundBillModal"},{"name":"delete-bill-modal","component":"deleteBillModal"},{"name":"lab-order-billable-item","component":"labOrder","slot":"top-of-lab-order-form-slot"},{"name":"procedure-order-billable-item","component":"procedureOrder","slot":"top-of-procedure-order-form-slot"},{"name":"imaging-order-billable-item","component":"imagingOrder","slot":"top-of-imaging-order-form-slot"},{"name":"price-info-order","component":"priceInfoOrder"},{"name":"drug-order-billable-item","component":"drugOrder","slot":"medication-info-slot"},{"name":"order-action-button","component":"orderActionButton","slots":["prescription-action-button-slot","imaging-orders-action","procedure-orders-action","tests-ordered-actions-slot"],"order":0},{"component":"billingOverviewLink","name":"billing-overview-link","order":0,"slot":"billing-dashboard-group-nav-slot"},{"component":"billDepositDashboardLink","name":"bill-deposit-dashboard-link","slot":"billing-dashboard-group-nav-slot"},{"component":"paymentHistoryLink","name":"payment-history-link","slot":"billing-dashboard-group-nav-slot"},{"component":"paymentPointsLink","name":"payment-points-link","slot":"billing-dashboard-group-nav-slot"},{"component":"paymentModesLink","name":"payment-modes-link","slot":"billing-dashboard-group-nav-slot"},{"component":"billManagerLink","name":"bill-manager-link","slot":"billing-dashboard-group-nav-slot"},{"component":"chargeableItemsLink","name":"chargeable-items-link","slot":"billing-dashboard-group-nav-slot"},{"component":"billableExemptionsLink","name":"billable-exemptions-link","slot":"billing-dashboard-group-nav-slot"},{"component":"claimsManagementOverviewDashboardLink","name":"claims-management-overview-link","order":0,"slot":"claims-management-dashboard-link-slot"},{"component":"preAuthRequestsDashboardLink","name":"preauthrequest-overview-link","slot":"claims-management-dashboard-link-slot"},{"component":"claimsOverview","name":"claims-overview-dashboard-link","slot":"claims-management-overview-slot"},{"component":"waiveBillActionButton","name":"waive-bill-action-button","slot":"bill-actions-slot"},{"component":"deleteBillActionButton","name":"delete-bill-action-button","slot":"bill-actions-slot"},{"component":"refundLineItem","name":"refund-line-item","slot":"bill-actions-overflow-menu-slot"},{"name":"edit-line-item","component":"editLineItem","slot":"bill-actions-overflow-menu-slot"},{"name":"cancel-line-item","component":"cancelLineItem","slot":"bill-actions-overflow-menu-slot"}],"workspaces":[{"name":"create-bill-workspace","component":"createBillWorkspace","title":"Create Bill Workspace","type":"other-form"},{"name":"waive-bill-form","component":"waiveBillForm","title":"Waive Bill Form","type":"other-form"},{"name":"edit-bill-form","component":"editBillForm","title":"Edit Bill Form","type":"other-form"},{"name":"billable-service-form","component":"addServiceForm","title":"Create Charge Item Form","type":"other-form"},{"name":"commodity-form","component":"addCommodityForm","title":"Create Charge Item Form","type":"other-form"},{"name":"billing-form","component":"billingForm","title":"Billing Form","type":"other-form","width":"extra-wide"},{"name":"payment-mode-workspace","component":"paymentModeWorkspace","title":"Payment Mode Workspace","type":"other-form"},{"name":"cancel-bill-workspace","component":"cancelBillWorkspace","title":"Cancel Bill Workspace","type":"other-form"},{"name":"add-deposit-workspace","component":"addDepositWorkspace","title":"Add Deposit","type":"other-form"},{"name":"deposit-transaction-workspace","component":"depositTransactionWorkspace","title":"Deposit Transaction","type":"other-form"}],"modals":[{"name":"create-payment-point","component":"createPaymentPoint"},{"name":"clock-out-modal","component":"clockOut"},{"name":"bulk-import-billable-services-modal","component":"bulkImportBillableServicesModal"},{"name":"delete-payment-mode-modal","component":"deletePaymentModeModal"},{"name":"manage-claim-request-modal","component":"manageClaimRequestModal"},{"name":"clock-in-modal","component":"clockIn"},{"name":"create-bill-item-modal","component":"createBillItemModal"},{"name":"delete-deposit-modal","component":"deleteDepositModal"},{"name":"reverse-transaction-modal","component":"reverseTransactionModal"},{"name":"print-preview-modal","component":"printPreviewModal"},{"name":"bill-action-modal","component":"billActionModal"}],"version":"5.4.2-pre.2301"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[{"component":"billableServicesHome","route":"billable-services"},{"component":"requirePaymentModal","routeRegex":"^patient/.+/chart","online":true,"offline":false}],"extensions":[{"component":"benefitsPackageDashboardLink","name":"benefits-package-dashboard-link","slot":"patient-chart-dashboard-slot","meta":{"name":"benefits-package","slot":"patient-chart-benefits-dashboard-slot","path":"insurance-benefits","columns":1,"columnSpan":1},"featureFlag":"healthInformationExchange"},{"component":"benefitsPackage","name":"benefits-package","slot":"patient-chart-benefits-dashboard-slot"},{"component":"root","name":"billing-dashboard-root","slot":"billing-dashboard-slot"},{"component":"benefitsEligibilyRequestForm","name":"benefits-eligibility-request-form"},{"component":"benefitsPreAuthForm","name":"benefits-pre-auth-form"},{"name":"billing-patient-summary","component":"billingPatientSummary","slot":"patient-chart-billing-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"billing-summary-dashboard-link","component":"billingSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":11,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-billing-dashboard-slot","path":"Billing","layoutMode":"anchored"}},{"name":"billing-check-in-form","slot":"extra-visit-attribute-slot","component":"billingCheckInForm"},{"name":"require-billing-modal","component":"requirePaymentModal"},{"name":"patient-banner-billing-tags","component":"visitAttributeTags","slot":"patient-banner-tags-slot","order":2},{"name":"initiate-payment-modal","component":"initiatePaymentDialog"},{"name":"delete-billableservice-modal","component":"deleteBillableServiceModal"},{"name":"refund-bill-modal","component":"refundBillModal"},{"name":"delete-bill-modal","component":"deleteBillModal"},{"name":"lab-order-billable-item","component":"labOrder","slot":"top-of-lab-order-form-slot"},{"name":"procedure-order-billable-item","component":"procedureOrder","slot":"top-of-procedure-order-form-slot"},{"name":"imaging-order-billable-item","component":"imagingOrder","slot":"top-of-imaging-order-form-slot"},{"name":"price-info-order","component":"priceInfoOrder"},{"name":"drug-order-billable-item","component":"drugOrder","slot":"medication-info-slot"},{"name":"order-action-button","component":"orderActionButton","slots":["prescription-action-button-slot","imaging-orders-action","procedure-orders-action","tests-ordered-actions-slot"],"order":0},{"component":"billingOverviewLink","name":"billing-overview-link","order":0,"slot":"billing-dashboard-group-nav-slot"},{"component":"billDepositDashboardLink","name":"bill-deposit-dashboard-link","slot":"billing-dashboard-group-nav-slot"},{"component":"paymentHistoryLink","name":"payment-history-link","slot":"billing-dashboard-group-nav-slot"},{"component":"paymentPointsLink","name":"payment-points-link","slot":"billing-dashboard-group-nav-slot"},{"component":"paymentModesLink","name":"payment-modes-link","slot":"billing-dashboard-group-nav-slot"},{"component":"billManagerLink","name":"bill-manager-link","slot":"billing-dashboard-group-nav-slot"},{"component":"chargeableItemsLink","name":"chargeable-items-link","slot":"billing-dashboard-group-nav-slot"},{"component":"billableExemptionsLink","name":"billable-exemptions-link","slot":"billing-dashboard-group-nav-slot"},{"component":"claimsManagementOverviewDashboardLink","name":"claims-management-overview-link","order":0,"slot":"claims-management-dashboard-link-slot"},{"component":"preAuthRequestsDashboardLink","name":"preauthrequest-overview-link","slot":"claims-management-dashboard-link-slot"},{"component":"claimsOverview","name":"claims-overview-dashboard-link","slot":"claims-management-overview-slot"},{"component":"waiveBillActionButton","name":"waive-bill-action-button","slot":"bill-actions-slot"},{"component":"deleteBillActionButton","name":"delete-bill-action-button","slot":"bill-actions-slot"},{"component":"refundLineItem","name":"refund-line-item","slot":"bill-actions-overflow-menu-slot"},{"name":"edit-line-item","component":"editLineItem","slot":"bill-actions-overflow-menu-slot"},{"name":"cancel-line-item","component":"cancelLineItem","slot":"bill-actions-overflow-menu-slot"}],"workspaces":[{"name":"create-bill-workspace","component":"createBillWorkspace","title":"Create Bill Workspace","type":"other-form"},{"name":"waive-bill-form","component":"waiveBillForm","title":"Waive Bill Form","type":"other-form"},{"name":"edit-bill-form","component":"editBillForm","title":"Edit Bill Form","type":"other-form"},{"name":"billable-service-form","component":"addServiceForm","title":"Create Charge Item Form","type":"other-form"},{"name":"commodity-form","component":"addCommodityForm","title":"Create Charge Item Form","type":"other-form"},{"name":"billing-form","component":"billingForm","title":"Billing Form","type":"other-form","width":"extra-wide"},{"name":"payment-mode-workspace","component":"paymentModeWorkspace","title":"Payment Mode Workspace","type":"other-form"},{"name":"cancel-bill-workspace","component":"cancelBillWorkspace","title":"Cancel Bill Workspace","type":"other-form"},{"name":"add-deposit-workspace","component":"addDepositWorkspace","title":"Add Deposit","type":"other-form"},{"name":"deposit-transaction-workspace","component":"depositTransactionWorkspace","title":"Deposit Transaction","type":"other-form"},{"name":"payment-workspace","component":"paymentWorkspace","title":"Payment Workspace","type":"other-form"}],"modals":[{"name":"create-payment-point","component":"createPaymentPoint"},{"name":"clock-out-modal","component":"clockOut"},{"name":"bulk-import-billable-services-modal","component":"bulkImportBillableServicesModal"},{"name":"delete-payment-mode-modal","component":"deletePaymentModeModal"},{"name":"manage-claim-request-modal","component":"manageClaimRequestModal"},{"name":"clock-in-modal","component":"clockIn"},{"name":"create-bill-item-modal","component":"createBillItemModal"},{"name":"delete-deposit-modal","component":"deleteDepositModal"},{"name":"reverse-transaction-modal","component":"reverseTransactionModal"},{"name":"print-preview-modal","component":"printPreviewModal"},{"name":"bill-action-modal","component":"billActionModal"}],"version":"5.4.2-pre.2306"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-billing-app",
-  "version": "5.4.2-pre.2301",
+  "version": "5.4.2-pre.2306",
   "description": "Billing app for KenyaEMR",
   "browser": "dist/kenyaemr-esm-billing-app.js",
   "main": "src/index.ts",

package/src/bill-deposit/utils/bill-deposit.utils.ts

@@ -1,6 +1,7 @@
 import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
 import { type BillDeposit, type CreateDepositPayload } from '../types/bill-deposit.types';
 import { MAX_REFERENCE_NUMBER_COUNTER } from '../constants/bill-deposit.constants';
+import { formatCurrencySimple } from '../../helpers/currency';
 
 /**
  * Generates a unique reference number for bill deposits
@@ -55,13 +56,10 @@ export const deleteDeposit = async (uuid: string) => {
 };
 
 /**
- * Formats a deposit amount with currency symbol
+ * Formats a deposit amount with currency symbol based on locale
  */
 export const formatDepositAmount = (amount: number): string => {
-  return new Intl.NumberFormat('en-US', {
-    style: 'currency',
-    currency: 'KES',
-  }).format(amount);
+  return formatCurrencySimple(amount);
 };
 
 /**

package/src/billable-services/bill-manager/workspaces/edit-bill/edit-bill-form.workspace.tsx

@@ -23,6 +23,7 @@ import {
 
 import { LineItem, MappedBill } from '../../../../types';
 import { processBillPayment } from '../../../../billing.resource';
+import { formatCurrencySimple } from '../../../../helpers/currency';
 import styles from './edit-bill.scss';
 import { createEditBillPayload } from './edit-bill-util';
 import classNames from 'classnames';
@@ -93,10 +94,7 @@ export const EditBillForm: React.FC<EditBillFormProps> = ({
     return <InlineLoading description={t('loading', 'Loading')} />;
   }
 
-  const formattedPrice = Intl.NumberFormat('en-US', {
-    style: 'currency',
-    currency: 'KES',
-  }).format(lineItem.price);
+  const formattedPrice = formatCurrencySimple(lineItem.price);
 
   const subtitleText = `${t('currentPriceAndQuantity', 'Current price and quantity')}: ${t(
     'price',

package/src/billing.resource.ts

@@ -291,3 +291,8 @@ export const billingFormSchema = z.object({
     )
     .min(1),
 });
+
+export const addPaymentToBill = (billUuid: string, payload: Record<string, any>) => {
+  const url = `${restBaseUrl}/cashier/bill/${billUuid}/payment`;
+  return openmrsFetch(url, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: payload });
+};

package/src/claims/dashboard/form/claims-form.component.tsx

@@ -14,7 +14,7 @@ import {
   ComboBox,
 } from '@carbon/react';
 import { zodResolver } from '@hookform/resolvers/zod';
-import { navigate, showSnackbar, useConfig, useSession } from '@openmrs/esm-framework';
+import { formatDatetime, navigate, showSnackbar, useConfig, useSession } from '@openmrs/esm-framework';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { Controller, FormProvider, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
@@ -22,7 +22,6 @@ import { useParams } from 'react-router-dom';
 import { z } from 'zod';
 import SHABenefitPackangesAndInterventions from '../../../benefits-package/forms/packages-and-interventions-form.component';
 import { BillingConfig } from '../../../config-schema';
-import { formatDate } from '../../../helpers/functions';
 import { useSystemSetting } from '../../../hooks/getMflCode';
 import usePatientDiagnosis from '../../../hooks/usePatientDiagnosis';
 import useProvider from '../../../hooks/useProvider';
@@ -155,8 +154,8 @@ const ClaimsForm: React.FC<ClaimsFormProps> = ({ bill, selectedLineItems }) => {
         diagnoses: diagnoses?.map((d) => d.id) ?? [],
         visitType: recentVisit?.visitType?.display || '',
         facility: `${recentVisit?.location?.display || ''} - ${mflCodeValue || ''}`,
-        treatmentStart: recentVisit?.startDatetime ? formatDate(recentVisit.startDatetime) : '',
-        treatmentEnd: recentVisit?.stopDatetime ? formatDate(recentVisit.stopDatetime) : '',
+        treatmentStart: formatDatetime(new Date(recentVisit?.startDatetime || '')),
+        treatmentEnd: formatDatetime(new Date(recentVisit?.stopDatetime || '')),
         packages: packagesAndinterventions?.packages ?? [],
         interventions: packagesAndinterventions?.interventions ?? [],
         provider: providerUuid,

package/src/config-schema.ts

@@ -34,6 +34,7 @@ export interface BillingConfig {
     enable: boolean;
     duration: number;
   };
+  localeCurrencyMapping: Record<string, string>;
 }
 
 export const configSchema: ConfigSchema = {
@@ -207,4 +208,16 @@ export const configSchema: ConfigSchema = {
       duration: 24,
     },
   },
+  localeCurrencyMapping: {
+    _type: Type.Object,
+    _description: 'Mapping of locale codes to currency codes for internationalization',
+    _default: {
+      en: 'KES',
+      sw: 'KES',
+      am: 'ETB',
+      'en-KE': 'KES',
+      'sw-KE': 'KES',
+      'am-ET': 'ETB',
+    },
+  },
 };

package/src/helpers/README.md

@@ -0,0 +1,174 @@
+# Currency Localization
+
+This module provides locale-based currency formatting for the billing application. It automatically detects the user's locale and formats currency amounts accordingly.
+
+## Features
+
+- **Locale-based currency mapping**: Automatically maps locales to appropriate currencies
+- **Configurable currency mapping**: Supports custom currency mappings via configuration
+- **Consistent formatting**: Provides standardized currency formatting across the application
+- **Fallback support**: Gracefully handles unknown locales with sensible defaults
+
+## Supported Locales and Currencies
+
+| Locale | Currency | Description |
+|--------|----------|-------------|
+| `en` | KES | English - Kenyan Shilling |
+| `sw` | KES | Swahili - Kenyan Shilling |
+| `am` | ETB | Amharic - Ethiopian Birr |
+| `en-KE` | KES | English Kenya |
+| `sw-KE` | KES | Swahili Kenya |
+| `am-ET` | ETB | Amharic Ethiopia |
+
+## Usage
+
+### Basic Currency Formatting
+
+```typescript
+import { formatCurrency, formatCurrencySimple } from './helpers/currency';
+
+// Format with negative sign handling
+const amount = formatCurrency(1234.56); // Returns: "KSh 1,234.56"
+
+// Format without negative sign handling
+const simpleAmount = formatCurrencySimple(1234.56); // Returns: "KSh 1,234.56"
+```
+
+### Using the Hook (with config support)
+
+```typescript
+import { useCurrencyFormatting } from './helpers/currency';
+
+const MyComponent = () => {
+  const { format, formatSimple, getCurrency, getLocale } = useCurrencyFormatting();
+  
+  const amount = format(1234.56);
+  const currency = getCurrency(); // Returns current currency code
+  
+  return <div>Amount: {amount}</div>;
+};
+```
+
+### Direct Currency/Locale Access
+
+```typescript
+import { getCurrencyForLocale, getCurrentLocale } from './helpers/currency';
+
+const currency = getCurrencyForLocale(); // Returns: "KES", "ETB", etc.
+const locale = getCurrentLocale(); // Returns: "en", "sw", "am", etc.
+```
+
+## Configuration
+
+You can customize the locale-to-currency mapping by adding a `localeCurrencyMapping` configuration to your billing config:
+
+```json
+{
+  "localeCurrencyMapping": {
+    "en": "USD",
+    "sw": "KES", 
+    "am": "ETB",
+    "fr": "EUR"
+  }
+}
+```
+
+## Functions
+
+### `formatCurrency(amount, options?)`
+Formats a number as currency with negative sign handling.
+
+**Parameters:**
+- `amount` (number): The amount to format
+- `options` (Intl.NumberFormatOptions, optional): Additional formatting options
+
+**Returns:** Formatted currency string
+
+### `formatCurrencySimple(amount, options?)`
+Formats a number as currency without negative sign handling.
+
+**Parameters:**
+- `amount` (number): The amount to format
+- `options` (Intl.NumberFormatOptions, optional): Additional formatting options
+
+**Returns:** Formatted currency string
+
+### `getCurrencyForLocale()`
+Gets the currency code for the current locale.
+
+**Returns:** Currency code string (e.g., "KES", "ETB")
+
+### `getCurrentLocale()`
+Gets the current locale from localStorage.
+
+**Returns:** Locale string (e.g., "en", "sw", "am")
+
+### `useCurrencyFormatting()`
+React hook that provides currency formatting with config support.
+
+**Returns:** Object with formatting functions and utilities
+
+## Migration from Hardcoded Currency
+
+If you have existing code using hardcoded currency formatting, replace it with the new utilities:
+
+**Before:**
+```typescript
+const formatter = new Intl.NumberFormat('en-US', {
+  style: 'currency',
+  currency: 'KES',
+}).format(amount);
+```
+
+**After:**
+```typescript
+import { formatCurrency } from './helpers/currency';
+
+const formattedAmount = formatCurrency(amount);
+```
+
+## Testing
+
+Run the currency utility tests:
+
+```bash
+npm test -- currency.test.ts
+```
+
+## Examples
+
+### In Components
+
+```typescript
+import React from 'react';
+import { formatCurrency } from './helpers/currency';
+
+const BillItem = ({ price, quantity }) => {
+  const total = price * quantity;
+  
+  return (
+    <div>
+      <span>Price: {formatCurrency(price)}</span>
+      <span>Total: {formatCurrency(total)}</span>
+    </div>
+  );
+};
+```
+
+### In Utilities
+
+```typescript
+import { formatCurrencySimple } from './helpers/currency';
+
+export const createReceipt = (items) => {
+  const total = items.reduce((sum, item) => sum + item.price, 0);
+  
+  return {
+    items: items.map(item => ({
+      ...item,
+      formattedPrice: formatCurrencySimple(item.price)
+    })),
+    total: formatCurrency(total)
+  };
+};
+``` 

package/src/helpers/currency.test.ts

@@ -0,0 +1,114 @@
+import {
+  DEFAULT_LOCALE_CURRENCY_MAP,
+  getCurrencyForLocale,
+  getCurrentLocale,
+  formatCurrency,
+  formatCurrencySimple,
+} from './currency';
+
+// Mock localStorage
+const mockLocalStorage = {
+  getItem: jest.fn(),
+  setItem: jest.fn(),
+  removeItem: jest.fn(),
+  clear: jest.fn(),
+};
+
+Object.defineProperty(window, 'localStorage', {
+  value: mockLocalStorage,
+});
+
+describe('Currency Utilities', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('DEFAULT_LOCALE_CURRENCY_MAP', () => {
+    it('should have correct currency mappings', () => {
+      expect(DEFAULT_LOCALE_CURRENCY_MAP.en).toBe('KES');
+      expect(DEFAULT_LOCALE_CURRENCY_MAP.sw).toBe('KES');
+      expect(DEFAULT_LOCALE_CURRENCY_MAP.am).toBe('ETB');
+      expect(DEFAULT_LOCALE_CURRENCY_MAP['en-KE']).toBe('KES');
+      expect(DEFAULT_LOCALE_CURRENCY_MAP['sw-KE']).toBe('KES');
+      expect(DEFAULT_LOCALE_CURRENCY_MAP['am-ET']).toBe('ETB');
+    });
+  });
+
+  describe('getCurrentLocale', () => {
+    it('should return locale from localStorage', () => {
+      mockLocalStorage.getItem.mockReturnValue('sw');
+      expect(getCurrentLocale()).toBe('sw');
+    });
+
+    it('should return default locale when localStorage is empty', () => {
+      mockLocalStorage.getItem.mockReturnValue(null);
+      expect(getCurrentLocale()).toBe('en');
+    });
+  });
+
+  describe('getCurrencyForLocale', () => {
+    it('should return correct currency for English locale', () => {
+      mockLocalStorage.getItem.mockReturnValue('en');
+      expect(getCurrencyForLocale()).toBe('KES');
+    });
+
+    it('should return correct currency for Swahili locale', () => {
+      mockLocalStorage.getItem.mockReturnValue('sw');
+      expect(getCurrencyForLocale()).toBe('KES');
+    });
+
+    it('should return correct currency for Amharic locale', () => {
+      mockLocalStorage.getItem.mockReturnValue('am');
+      expect(getCurrencyForLocale()).toBe('ETB');
+    });
+
+    it('should return KES as fallback for unknown locale', () => {
+      mockLocalStorage.getItem.mockReturnValue('fr');
+      expect(getCurrencyForLocale()).toBe('KES');
+    });
+  });
+
+  describe('formatCurrency', () => {
+    beforeEach(() => {
+      // Mock Intl.NumberFormat
+      const mockFormatter = {
+        format: jest.fn((value) => `$${value.toFixed(2)}`),
+      };
+      jest.spyOn(Intl, 'NumberFormat').mockImplementation(() => mockFormatter as any);
+    });
+
+    it('should format positive amounts correctly', () => {
+      mockLocalStorage.getItem.mockReturnValue('en');
+      const result = formatCurrency(1234.56);
+      expect(result).toBe('$1234.56');
+    });
+
+    it('should format negative amounts with minus sign', () => {
+      mockLocalStorage.getItem.mockReturnValue('en');
+      const result = formatCurrency(-1234.56);
+      expect(result).toBe('- $1234.56');
+    });
+  });
+
+  describe('formatCurrencySimple', () => {
+    beforeEach(() => {
+      // Mock Intl.NumberFormat
+      const mockFormatter = {
+        format: jest.fn((value) => `$${value.toFixed(2)}`),
+      };
+      jest.spyOn(Intl, 'NumberFormat').mockImplementation(() => mockFormatter as any);
+    });
+
+    it('should format amounts without negative sign handling', () => {
+      mockLocalStorage.getItem.mockReturnValue('en');
+      const result = formatCurrencySimple(1234.56);
+      expect(result).toBe('$1234.56');
+    });
+
+    it('should format negative amounts without special handling', () => {
+      mockLocalStorage.getItem.mockReturnValue('en');
+      const result = formatCurrencySimple(-1234.56);
+      expect(result).toBe('$-1234.56');
+    });
+  });
+});

package/src/helpers/currency.ts

@@ -0,0 +1,138 @@
+import { useConfig } from '@openmrs/esm-framework';
+import { BillingConfig } from '../config-schema';
+
+// Default locale to currency mapping (fallback)
+export const DEFAULT_LOCALE_CURRENCY_MAP: Record<string, string> = {
+  en: 'KES', // English - Kenyan Shilling
+  sw: 'KES', // Swahili - Kenyan Shilling
+  am: 'ETB', // Amharic - Ethiopian Birr
+  'en-KE': 'KES', // English Kenya
+  'sw-KE': 'KES', // Swahili Kenya
+  'am-ET': 'ETB', // Amharic Ethiopia
+};
+
+/**
+ * Gets the currency code for the current locale
+ * @returns The currency code (e.g., 'KES', 'ETB')
+ */
+export const getCurrencyForLocale = (): string => {
+  const currentLocale = localStorage.getItem('i18nextLng') ?? 'en';
+  return DEFAULT_LOCALE_CURRENCY_MAP[currentLocale] || 'KES';
+};
+
+/**
+ * Gets the currency code for the current locale with config support
+ * @param config - The billing configuration object
+ * @returns The currency code (e.g., 'KES', 'ETB')
+ */
+export const getCurrencyForLocaleWithConfig = (config?: BillingConfig): string => {
+  const currentLocale = localStorage.getItem('i18nextLng') ?? 'en';
+
+  // Use config mapping if available, otherwise fall back to default
+  const currencyMap = config?.localeCurrencyMapping || DEFAULT_LOCALE_CURRENCY_MAP;
+  return currencyMap[currentLocale] || 'KES';
+};
+
+/**
+ * Gets the current locale from localStorage
+ * @returns The current locale (e.g., 'en', 'sw', 'am')
+ */
+export const getCurrentLocale = (): string => {
+  return localStorage.getItem('i18nextLng') ?? 'en';
+};
+
+/**
+ * Formats a number as currency based on the current locale
+ * @param amount - The amount to format
+ * @param options - Additional Intl.NumberFormat options
+ * @returns Formatted currency string
+ */
+export const formatCurrency = (amount: number, options: Intl.NumberFormatOptions = {}): string => {
+  const currentLocale = getCurrentLocale();
+  const currency = getCurrencyForLocale();
+
+  const formatter = new Intl.NumberFormat(currentLocale, {
+    style: 'currency',
+    currency: currency,
+    minimumFractionDigits: 2,
+    ...options,
+  });
+
+  let formattedAmount = formatter.format(Math.abs(amount));
+
+  if (amount < 0) {
+    formattedAmount = `- ${formattedAmount}`;
+  }
+
+  return formattedAmount;
+};
+
+/**
+ * Formats a number as currency without negative sign handling
+ * @param amount - The amount to format
+ * @param options - Additional Intl.NumberFormat options
+ * @returns Formatted currency string
+ */
+export const formatCurrencySimple = (amount: number, options: Intl.NumberFormatOptions = {}): string => {
+  const currentLocale = getCurrentLocale();
+  const currency = getCurrencyForLocale();
+
+  const formatter = new Intl.NumberFormat(currentLocale, {
+    style: 'currency',
+    currency: currency,
+    ...options,
+  });
+
+  return formatter.format(amount);
+};
+
+/**
+ * Hook to get currency formatting with config support
+ * @returns Object with currency formatting functions
+ */
+export const useCurrencyFormatting = () => {
+  const config = useConfig<BillingConfig>();
+
+  const getCurrency = () => getCurrencyForLocaleWithConfig(config);
+  const getLocale = () => getCurrentLocale();
+
+  const format = (amount: number, options: Intl.NumberFormatOptions = {}) => {
+    const currentLocale = getLocale();
+    const currency = getCurrency();
+
+    const formatter = new Intl.NumberFormat(currentLocale, {
+      style: 'currency',
+      currency: currency,
+      minimumFractionDigits: 2,
+      ...options,
+    });
+
+    let formattedAmount = formatter.format(Math.abs(amount));
+
+    if (amount < 0) {
+      formattedAmount = `- ${formattedAmount}`;
+    }
+
+    return formattedAmount;
+  };
+
+  const formatSimple = (amount: number, options: Intl.NumberFormatOptions = {}) => {
+    const currentLocale = getLocale();
+    const currency = getCurrency();
+
+    const formatter = new Intl.NumberFormat(currentLocale, {
+      style: 'currency',
+      currency: currency,
+      ...options,
+    });
+
+    return formatter.format(amount);
+  };
+
+  return {
+    getCurrency,
+    getLocale,
+    format,
+    formatSimple,
+  };
+};

package/src/helpers/functions.ts

@@ -1,5 +1,6 @@
 import dayjs from 'dayjs';
 import { Payment, LineItem } from '../types';
+import { formatCurrency } from './currency';
 
 // amount already paid
 export function calculateTotalAmountTendered(payments: Array<Payment>) {
@@ -33,19 +34,7 @@ export function calculateTotalAmount(lineItems: Array<LineItem>) {
 }
 
 export const convertToCurrency = (amountToConvert: number) => {
-  const formatter = new Intl.NumberFormat('en-KE', {
-    style: 'currency',
-    currency: 'KES',
-    minimumFractionDigits: 2,
-  });
-
-  let formattedAmount = formatter.format(Math.abs(amountToConvert));
-
-  if (amountToConvert < 0) {
-    formattedAmount = `- ${formattedAmount}`;
-  }
-
-  return formattedAmount;
+  return formatCurrency(amountToConvert);
 };
 
 export const getGender = (gender: string, t) => {

package/src/index.ts

@@ -76,6 +76,7 @@ import DepositTransactionWorkspace from './bill-deposit/components/forms/deposit
 
 // Print Preview Components
 import PrintPreviewModal from './print-preview/print-preview.modal';
+import PaymentWorkspace from './invoice/payments/payment-form/payment.workspace';
 
 // Translation
 export const importTranslation = require.context('../translations', false, /.json$/, 'lazy');
@@ -218,6 +219,7 @@ export const visitAttributeTags = getSyncLifecycle(VisitAttributeTags, options);
 export const initiatePaymentDialog = getSyncLifecycle(InitiatePaymentDialog, options);
 export const paymentModeWorkspace = getSyncLifecycle(PaymentModeWorkspace, options);
 export const deletePaymentModeModal = getSyncLifecycle(DeletePaymentModeModal, options);
+export const paymentWorkspace = getSyncLifecycle(PaymentWorkspace, options);
 
 // Payment Points Components
 export const createPaymentPoint = getSyncLifecycle(CreatePaymentPoint, options);