@openmrs/esm-billing-app 1.1.2-pre.1621 → 1.1.2-pre.1630

package/src/billing-form/billing-form.resource.ts

@@ -1,7 +1,40 @@
+import { useMemo } from 'react';
 import useSWR from 'swr';
 import { type OpenmrsResource, openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
 import { apiBasePath } from '../constants';
 
+type LastVisitInfo = {
+  diffDays: number;
+  type: string;
+  location: string;
+};
+
+export const useLastVisitInfo = (
+  patientUuid: string,
+): { lastVisitInfo: LastVisitInfo | null; isLoading: boolean; error: any } => {
+  const url = `${restBaseUrl}/visit?patient=${patientUuid}&v=default&limit=1&sort=desc:startDatetime`;
+  const { data, isLoading, error } = useSWR<{ data: { results: Array<any> } }>(patientUuid ? url : null, openmrsFetch);
+
+  const lastVisitInfo = useMemo((): LastVisitInfo | null => {
+    const results = data?.data?.results;
+    if (!results?.length) return null;
+
+    const visit = results[0];
+    const visitDate = new Date(visit.startDatetime);
+    if (isNaN(visitDate.getTime())) return null;
+    const diffTime = Math.abs(Date.now() - visitDate.getTime());
+    const diffDays = Math.floor(diffTime / (1000 * 60 * 60 * 24));
+
+    return {
+      diffDays,
+      type: visit.visitType?.display ?? '',
+      location: visit.location?.display ?? '',
+    };
+  }, [data]);
+
+  return { lastVisitInfo, isLoading, error };
+};
+
 export const useBillableItems = () => {
   const url = `${apiBasePath}billableService?v=custom:(uuid,name,shortName,serviceStatus,serviceType:(display),servicePrices:(uuid,name,price,paymentMode))`;
   const { data, isLoading, error } = useSWR<{ data: { results: Array<OpenmrsResource> } }>(url, openmrsFetch);

package/src/billing-form/visit-attributes/visit-attributes-form.component.tsx

@@ -3,7 +3,18 @@ import { z } from 'zod';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { Controller, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
-import { ComboBox, InlineLoading, RadioButton, RadioButtonGroup, Stack, TextInput } from '@carbon/react';
+import {
+  ComboBox,
+  InlineLoading,
+  RadioButton,
+  RadioButtonGroup,
+  Stack,
+  TextInput,
+  Toggletip,
+  ToggletipButton,
+  ToggletipContent,
+} from '@carbon/react';
+import { Information } from '@carbon/react/icons';
 import { useConfig } from '@openmrs/esm-framework';
 import { usePaymentMethods } from '../billing-form.resource';
 import styles from './visit-attributes-form.scss';
@@ -121,7 +132,19 @@ const VisitAttributesForm: React.FC<VisitAttributesFormProps> = ({ setAttributes
         render={({ field }) => (
           <RadioButtonGroup
             className={styles.radioButtonGroup}
-            legendText={t('paymentDetails', 'Payment details')}
+            legendText={
+              <div className={styles.paymentDetailsLegend}>
+                {t('paymentDetails', 'Payment details')}
+                <Toggletip autoAlign align="bottom">
+                  <ToggletipButton label={t('showInformation', 'Show information')}>
+                    <Information />
+                  </ToggletipButton>
+                  <ToggletipContent>
+                    <p>{t('nonPayingInfo', 'Any services rendered to non-paying patients will not be billed')}</p>
+                  </ToggletipContent>
+                </Toggletip>
+              </div>
+            }
             name="payment-details"
             onChange={(selected) => field.onChange(selected)}
             orientation="vertical">

package/src/billing-form/visit-attributes/visit-attributes-form.scss

@@ -19,7 +19,11 @@
 }
 
 .radioButtonGroup {
+  overflow: visible;
+
   :global(.cds--radio-button-group) {
+    overflow: visible;
+
     :global(.cds--radio-button-wrapper) {
       margin-bottom: layout.$spacing-03;
 
@@ -28,8 +32,33 @@
       }
     }
   }
+
+  :global(fieldset.cds--fieldset) {
+    overflow: visible;
+  }
 }
 
 .stack {
   margin-bottom: layout.$spacing-05;
+  overflow: visible;
+}
+
+.paymentDetailsLegend {
+  display: flex;
+  align-items: center;
+  gap: layout.$spacing-03;
+  overflow: visible;
+
+  :global(.cds--toggletip) {
+    overflow: visible;
+  }
+
+  :global(.cds--popover-content) {
+    z-index: 9100;
+  }
+
+  :global(.cds--toggletip-content) {
+    min-width: 16rem;
+    white-space: normal;
+  }
 }

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/en.json

@@ -105,6 +105,7 @@
   "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",
@@ -132,6 +133,10 @@
   "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",
@@ -159,6 +164,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",
@@ -237,6 +243,7 @@
   "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",