@openmrs/esm-billing-app 1.0.2-pre.966 → 1.0.2-pre.972

package/dist/openmrs-esm-billing-app.js.buildmanifest.json

@@ -550,9 +550,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 9123,
+      "size": 9169,
       "sizes": {
-        "javascript": 9123
+        "javascript": 9169
       },
       "names": [],
       "idHints": [],
@@ -564,7 +564,7 @@
         "4300.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "2fc64a48f3982f87",
+      "hash": "f5588eb92c4c964e",
       "childrenByOrder": {}
     },
     {
@@ -1187,9 +1187,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1109271,
+      "size": 1109850,
       "sizes": {
-        "javascript": 1109229,
+        "javascript": 1109808,
         "consume-shared": 42
       },
       "names": [],
@@ -1203,7 +1203,7 @@
       "auxiliaryFiles": [
         "8572.js.map"
       ],
-      "hash": "5370657866b7dc68",
+      "hash": "fe713f2233a8ced0",
       "childrenByOrder": {}
     },
     {
@@ -1260,10 +1260,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 5390893,
+      "size": 5391472,
       "sizes": {
         "consume-shared": 210,
-        "javascript": 5368241,
+        "javascript": 5368820,
         "share-init": 336,
         "runtime": 22106
       },
@@ -1280,7 +1280,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "a647972a2f8fae20",
+      "hash": "2a54fba878e10781",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.24.0","fhir2":">=1.2"},"pages":[{"component":"billableServicesHome","route":"billable-services"}],"extensions":[{"component":"billingDashboardLink","name":"billing-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"billing","title":"billing","slot":"billing-dashboard-slot"}},{"component":"root","name":"billing-dashboard-root","slot":"billing-dashboard-slot"},{"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 history"}},{"name":"billable-services-app-menu-item","component":"billableServicesAppMenuItem","slot":"app-menu-item-slot","meta":{"name":"Billable Services"}},{"name":"billing-checkin-form","slot":"extra-visit-attribute-slot","component":"billingCheckInForm"},{"slot":"system-admin-page-card-link-slot","component":"billableServicesCardLink","name":"billable-services-admin-card-link"},{"name":"patient-banner-billing-tags","component":"visitAttributeTags","slot":"patient-banner-tags-slot","order":2},{"name":"billable-services-left-panel-link","component":"billableServicesLeftPanelLink","slot":"billable-services-left-panel-slot","order":0},{"name":"bill-waiver-left-panel-link","component":"billWaiverLeftPanelLink","slot":"billable-services-left-panel-slot","order":1},{"name":"billing-settings-left-panel-menu","component":"billingSettingsLeftPanelMenu","slot":"billable-services-left-panel-slot","order":2}],"modals":[{"name":"add-cash-point-modal","component":"addCashPointModal"},{"name":"payment-mode-form-modal","component":"paymentModeFormModal"},{"name":"delete-payment-mode-modal","component":"deletePaymentModeModal"},{"name":"edit-bill-item-modal","component":"editBillLineItemModal"},{"name":"edit-bill-line-item-modal","component":"editBillLineItemModal"},{"name":"require-billing-modal","component":"requirePaymentModal"}],"workspaces":[{"name":"billing-form-workspace","title":"billingForm","component":"billingFormWorkspace","type":"form"},{"name":"billable-service-form","title":"billableServiceForm","component":"billableServiceFormWorkspace","type":"form","width":"wider"}],"version":"1.0.2-pre.966"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.24.0","fhir2":">=1.2"},"pages":[{"component":"billableServicesHome","route":"billable-services"}],"extensions":[{"component":"billingDashboardLink","name":"billing-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"billing","title":"billing","slot":"billing-dashboard-slot"}},{"component":"root","name":"billing-dashboard-root","slot":"billing-dashboard-slot"},{"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 history"}},{"name":"billable-services-app-menu-item","component":"billableServicesAppMenuItem","slot":"app-menu-item-slot","meta":{"name":"Billable Services"}},{"name":"billing-checkin-form","slot":"extra-visit-attribute-slot","component":"billingCheckInForm"},{"slot":"system-admin-page-card-link-slot","component":"billableServicesCardLink","name":"billable-services-admin-card-link"},{"name":"patient-banner-billing-tags","component":"visitAttributeTags","slot":"patient-banner-tags-slot","order":2},{"name":"billable-services-left-panel-link","component":"billableServicesLeftPanelLink","slot":"billable-services-left-panel-slot","order":0},{"name":"bill-waiver-left-panel-link","component":"billWaiverLeftPanelLink","slot":"billable-services-left-panel-slot","order":1},{"name":"billing-settings-left-panel-menu","component":"billingSettingsLeftPanelMenu","slot":"billable-services-left-panel-slot","order":2}],"modals":[{"name":"add-cash-point-modal","component":"addCashPointModal"},{"name":"payment-mode-form-modal","component":"paymentModeFormModal"},{"name":"delete-payment-mode-modal","component":"deletePaymentModeModal"},{"name":"edit-bill-item-modal","component":"editBillLineItemModal"},{"name":"edit-bill-line-item-modal","component":"editBillLineItemModal"},{"name":"require-billing-modal","component":"requirePaymentModal"}],"workspaces":[{"name":"billing-form-workspace","title":"billingForm","component":"billingFormWorkspace","type":"form"},{"name":"billable-service-form","title":"billableServiceForm","component":"billableServiceFormWorkspace","type":"form","width":"wider"}],"version":"1.0.2-pre.972"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-billing-app",
-  "version": "1.0.2-pre.966",
+  "version": "1.0.2-pre.972",
   "description": "O3 frontend module for handling billing concerns in healthcare settings",
   "browser": "dist/openmrs-esm-billing-app.js",
   "main": "src/index.ts",

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { type PatientDetails } from '../../types';
-import { type SessionLocation, useConfig, interpolateUrl } from '@openmrs/esm-framework';
+import { type SessionLocation, useConfig, interpolateUrl, formatDate, parseDate } from '@openmrs/esm-framework';
 import { useTranslation } from 'react-i18next';
 import type { BillingConfig } from '../../config-schema';
 import styles from './printable-invoice-header.scss';
@@ -45,6 +45,14 @@ const PrintableInvoiceHeader: React.FC<PrintableInvoiceHeaderProps> = ({ patient
         <div className={styles.billDetails}>
           <p className={styles.itemHeading}>{t('billedTo', 'Billed to')}</p>
           <p className={styles.itemLabel}>{patientDetails?.name}</p>
+          {patientDetails?.gender && (
+            <p className={styles.itemLabel}>{`${t('gender', 'Gender')}: ${patientDetails.gender}`}</p>
+          )}
+          {patientDetails?.birthDate && (
+            <p className={styles.itemLabel}>
+              {`${t('birthDate', 'Date of birth')}: ${formatDate(parseDate(patientDetails.birthDate), { time: false })}`}
+            </p>
+          )}
           <p className={styles.itemLabel}>{patientDetails?.county}</p>
           <p className={styles.itemLabel}>
             {patientDetails?.subCounty}

package/src/invoice/printable-invoice/printable-invoice-header.test.tsx

@@ -18,7 +18,7 @@ const testProps = {
     county: 'Nairobi',
     subCounty: 'Westlands',
     city: 'Nairobi',
-    age: '45',
+    birthDate: '1980-05-15',
     gender: 'Male',
   },
 };
@@ -44,6 +44,8 @@ describe('PrintableInvoiceHeader', () => {
     expect(screen.getByText('Westlands, Nairobi')).toBeInTheDocument();
     expect(screen.getByText('MTRH')).toBeInTheDocument();
     expect(screen.getByText('Kenya')).toBeInTheDocument();
+    expect(screen.getByText('Gender: Male')).toBeInTheDocument();
+    expect(screen.getByText('Date of birth: 15-May-1980')).toBeInTheDocument();
   });
 
   test('should display the logo when logo is provided', () => {
@@ -52,9 +54,84 @@ describe('PrintableInvoiceHeader', () => {
     expect(logo).toBeInTheDocument();
   });
 
-  test('should display the default logo when logo is not provided', () => {
+  test('should display the default OpenMRS SVG logo when logo src is not provided', () => {
+    mockUseConfig.mockReturnValue({
+      logo: { src: '', alt: '' },
+      country: 'Kenya',
+    } as unknown as BillingConfig);
+
     render(<PrintableInvoiceHeader {...testProps} defaultFacility={defaultFacility} />);
     const logo = screen.getByRole('img');
     expect(logo).toBeInTheDocument();
+    expect(logo.tagName).toBe('svg');
+  });
+
+  test('should display logo alt text when src is empty but alt is provided', () => {
+    mockUseConfig.mockReturnValue({
+      logo: { src: '', alt: 'Test Facility Logo' },
+      country: 'Kenya',
+    } as unknown as BillingConfig);
+
+    render(<PrintableInvoiceHeader {...testProps} defaultFacility={defaultFacility} />);
+    expect(screen.getByText('Test Facility Logo')).toBeInTheDocument();
+  });
+
+  test('should format birthDate correctly', () => {
+    const propsWithDifferentDate = {
+      patientDetails: {
+        name: 'Jane Doe',
+        county: 'Mombasa',
+        subCounty: 'Nyali',
+        city: 'Mombasa',
+        birthDate: '1995-12-25',
+        gender: 'Female',
+      },
+    };
+    render(<PrintableInvoiceHeader {...propsWithDifferentDate} defaultFacility={defaultFacility} />);
+    expect(screen.getByText('Date of birth: 25-Dec-1995')).toBeInTheDocument();
+  });
+
+  test('should not render birthDate and gender when not provided', () => {
+    const propsWithoutBirthDateAndGender = {
+      patientDetails: {
+        name: 'Jane Doe',
+        county: 'Mombasa',
+        subCounty: 'Nyali',
+        city: 'Mombasa',
+        birthDate: '',
+        gender: '',
+      },
+    };
+    render(<PrintableInvoiceHeader {...propsWithoutBirthDateAndGender} defaultFacility={defaultFacility} />);
+
+    expect(screen.queryByText(/Date of birth:/i)).not.toBeInTheDocument();
+    expect(screen.queryByText(/Gender:/i)).not.toBeInTheDocument();
+  });
+
+  test('should render city with comma when provided', () => {
+    render(<PrintableInvoiceHeader {...testProps} defaultFacility={defaultFacility} />);
+    expect(screen.getByText('Westlands, Nairobi')).toBeInTheDocument();
+  });
+
+  test('should render subCounty without comma when city is not provided', () => {
+    const propsWithoutCity = {
+      patientDetails: {
+        name: 'Jane Doe',
+        county: 'Mombasa',
+        subCounty: 'Nyali',
+        city: '',
+        birthDate: '1990-01-01',
+        gender: 'Female',
+      },
+    };
+    render(<PrintableInvoiceHeader {...propsWithoutCity} defaultFacility={defaultFacility} />);
+    expect(screen.getByText('Nyali')).toBeInTheDocument();
+    expect(screen.queryByText(/Nyali,/)).not.toBeInTheDocument();
+  });
+
+  test('should handle null defaultFacility gracefully', () => {
+    render(<PrintableInvoiceHeader {...testProps} defaultFacility={null} />);
+    expect(screen.getByText('Invoice')).toBeInTheDocument();
+    expect(screen.getByText('John Doe')).toBeInTheDocument();
   });
 });

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

@@ -9,7 +9,7 @@ import {
   TableHeader,
   TableCell,
 } from '@carbon/react';
-import { age, isDesktop, type SessionLocation, useLayoutType } from '@openmrs/esm-framework';
+import { isDesktop, type SessionLocation, useLayoutType } from '@openmrs/esm-framework';
 import { getGender } from '../../helpers';
 import { type MappedBill } from '../../types';
 import { useTranslation } from 'react-i18next';
@@ -56,7 +56,7 @@ const PrintableInvoice: React.FC<PrintableInvoiceProps> = ({ bill, patient, comp
   const patientDetails = useMemo(() => {
     return {
       name: `${patient?.name?.[0]?.given?.join(' ')} ${patient?.name?.[0].family}`,
-      age: age(patient?.birthDate),
+      birthDate: patient?.birthDate,
       gender: getGender(patient?.gender, t),
       city: patient?.address?.[0].city,
       county: patient?.address?.[0].district,

package/src/types/index.ts

@@ -153,7 +153,7 @@ export interface PatientInvoice {
 
 export interface PatientDetails {
   name: string;
-  age: string;
+  birthDate: string;
   gender: string;
   city: string;
   county: string;

package/translations/en.json

@@ -55,6 +55,7 @@
   "billWaiver": "Bill waiver",
   "billWaiverError": "Bill waiver failed {{error}}",
   "billWaiverSuccess": "Bill waiver successful",
+  "birthDate": "Date of birth",
   "cashPointConfig": "Cash point configuration",
   "cashPointHistory": "Cash point history",
   "cashPointLocation": "Cash point location",
@@ -100,6 +101,7 @@
   "errorSavingPaymentMode": "An error occurred while saving the payment mode.",
   "filterBy": "Filter by:",
   "filterTable": "Filter table",
+  "gender": "Gender",
   "grandTotal": "Grand total",
   "home": "Home",
   "identifier": "Identifier",