@ampath/esm-dispensing-app 1.10.0-next.2 → 1.10.0-next.21

package/src/components/action-buttons.test.tsx

@@ -1,8 +1,14 @@
 import React from 'react';
 import { render } from '@testing-library/react';
-import { useConfig, ExtensionSlot } from '@openmrs/esm-framework';
+import { useConfig, ExtensionSlot, type Order } from '@openmrs/esm-framework';
 import { computeMedicationRequestStatus, getMostRecentMedicationDispenseStatus } from '../utils';
-import { MedicationDispenseStatus, type MedicationRequest, MedicationRequestStatus } from '../types';
+import {
+  type BillInvoice,
+  type BillStatus,
+  MedicationDispenseStatus,
+  type MedicationRequest,
+  MedicationRequestStatus,
+} from '../types';
 import ActionButtons from './action-buttons.component';
 import CloseActionButton from './prescription-actions/close-action-button.component';
 import DispenseActionButton from './prescription-actions/dispense-action-button.component';
@@ -111,6 +117,10 @@ const medicationRequest: MedicationRequest = {
 const medicationRequestStatus = computeMedicationRequestStatus(medicationRequest, 90);
 const mostRecentMedicationDispenseStatus: MedicationDispenseStatus = getMostRecentMedicationDispenseStatus([]);
 
+const orders = [] as Order[];
+const bills = [] as BillInvoice[];
+const mutated = () => {};
+
 const prescriptionActionsState = {
   dispensable:
     medicationRequestStatus === MedicationRequestStatus.active &&
@@ -125,6 +135,8 @@ const prescriptionActionsState = {
   session: undefined,
   providers: [],
   disabled: false,
+  billStatus: 'PAID' as BillStatus,
+  hasActiveRequests: true,
 };
 
 describe('Action Buttons Component tests', () => {
@@ -162,6 +174,10 @@ describe('Action Buttons Component tests', () => {
         encounterUuid={mockEncounterUuid}
         medicationRequestBundle={{ request: medicationRequest, dispenses: [] }}
         disabled={false}
+        orders={orders}
+        bills={bills}
+        mutated={mutated}
+        isLoading={false}
       />,
     );
     expect(getByText('Dispense')).toBeInTheDocument();
@@ -209,6 +225,10 @@ describe('Action Buttons Component tests', () => {
         encounterUuid={mockEncounterUuid}
         medicationRequestBundle={{ request: expiredMedicationRequest, dispenses: [] }}
         disabled={false}
+        orders={orders}
+        bills={bills}
+        mutated={mutated}
+        isLoading={false}
       />,
     );
 

package/src/components/prescription-actions/close-action-button.component.tsx

@@ -13,6 +13,7 @@ type CloseActionButtonProps = {
   providers: Array<Provider>;
   closeable: boolean;
   disabled: boolean;
+  hasActiveRequests: boolean;
 };
 
 const CloseActionButton: React.FC<CloseActionButtonProps> = ({
@@ -23,6 +24,7 @@ const CloseActionButton: React.FC<CloseActionButtonProps> = ({
   providers,
   closeable,
   disabled,
+  hasActiveRequests,
 }) => {
   const { t } = useTranslation();
 
@@ -31,6 +33,7 @@ const CloseActionButton: React.FC<CloseActionButtonProps> = ({
     encounterUuid,
     medicationDispense: initiateMedicationDispenseBody(medicationRequestBundle.request, session, providers, false),
     mode: 'enter',
+    hasActiveRequests,
   };
 
   const handleLaunchWorkspace = () => {

package/src/components/prescription-actions/dispense-action-button.component.tsx

@@ -1,9 +1,10 @@
 import React from 'react';
-import { Button } from '@carbon/react';
+import { Button, Tag } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
 import { launchWorkspace2, type Session } from '@openmrs/esm-framework';
 import { initiateMedicationDispenseBody } from '../../medication-dispense/medication-dispense.resource';
-import { type Provider, type MedicationRequestBundle } from '../../types';
+import { type Provider, type MedicationRequestBundle, type BillStatus } from '../../types';
+import { usePatientBills } from '../../bill/bill.resource';
 
 type DispenseActionButtonProps = {
   patientUuid: string;
@@ -15,6 +16,7 @@ type DispenseActionButtonProps = {
   quantityRemaining: number;
   quantityDispensed: number;
   disabled: boolean;
+  billStatus: BillStatus;
 };
 
 const DispenseActionButton: React.FC<DispenseActionButtonProps> = ({
@@ -27,6 +29,7 @@ const DispenseActionButton: React.FC<DispenseActionButtonProps> = ({
   quantityRemaining,
   quantityDispensed,
   disabled,
+  billStatus = 'PAID',
 }) => {
   const { t } = useTranslation();
   const dispenseWorkspaceProps = {
@@ -39,6 +42,8 @@ const DispenseActionButton: React.FC<DispenseActionButtonProps> = ({
     mode: 'enter',
   };
 
+  const { currentDayBills } = usePatientBills(patientUuid);
+
   const handleLaunchWorkspace = () => {
     launchWorkspace2('dispense-workspace', dispenseWorkspaceProps);
   };
@@ -47,11 +52,19 @@ const DispenseActionButton: React.FC<DispenseActionButtonProps> = ({
     return null;
   }
 
-  return (
+  if (currentDayBills && currentDayBills.length && (billStatus === 'PAID' || billStatus === 'POSTED')) {
+    return (
+      <Tag type="red" size="lg">
+        {t('clearPendingBills', 'Clear pending bills to dispense')}
+      </Tag>
+    );
+  }
+
+  return billStatus === 'PAID' || billStatus === 'POSTED' ? (
     <Button kind="primary" onClick={handleLaunchWorkspace} disabled={disabled}>
       {t('dispense', 'Dispense')}
     </Button>
-  );
+  ) : null;
 };
 
 export default DispenseActionButton;

package/src/components/prescription-actions/generate-bill-action-button.component.tsx

@@ -0,0 +1,53 @@
+import React from 'react';
+import { Button, InlineLoading } from '@carbon/react';
+import { useTranslation } from 'react-i18next';
+import { launchWorkspace, type Order, useConfig } from '@openmrs/esm-framework';
+import { type MedicationRequestBundle, type BillStatus } from '../../types';
+import { type PharmacyConfig } from '../../config-schema';
+
+type GenerateBillActionButtonProps = {
+  medicationRequestBundle: MedicationRequestBundle;
+  isLoading: boolean;
+  billStatus: BillStatus;
+  order: Order;
+  dispensable: boolean;
+  mutated: () => void;
+};
+
+const GenerateBillActionButton: React.FC<GenerateBillActionButtonProps> = ({
+  medicationRequestBundle,
+  isLoading,
+  billStatus,
+  order,
+  dispensable,
+  mutated,
+}) => {
+  const { t } = useTranslation();
+  const { pharmacyServiceTypedUuid } = useConfig<PharmacyConfig>();
+
+  const launchBillWorkspace = () => {
+    launchWorkspace('create-order-bill-form-workspace', {
+      workspaceTitle: t('createOrderBill', 'Create order bill form'),
+      order: order,
+      quantity: medicationRequestBundle.request.dispenseRequest.quantity.value,
+      serviceTypeUuid: pharmacyServiceTypedUuid,
+      mutated,
+    });
+  };
+
+  if (!dispensable) {
+    return null;
+  }
+
+  return isLoading ? (
+    <InlineLoading description="Checking bills" />
+  ) : billStatus === 'PENDING' ? (
+    <Button kind="secondary">{t('pendingPayment', 'Pending payment')}</Button>
+  ) : billStatus === 'BLANK' ? (
+    <Button kind="primary" onClick={launchBillWorkspace}>
+      {t('generateBill', 'Generate bill')}
+    </Button>
+  ) : null;
+};
+
+export default GenerateBillActionButton;

package/src/components/prescription-actions/pause-action-button.component.tsx

@@ -13,6 +13,7 @@ type PauseActionButtonProps = {
   providers: Array<Provider>;
   pauseable: boolean;
   disabled: boolean;
+  hasActiveRequests: boolean;
 };
 
 const PauseActionButton: React.FC<PauseActionButtonProps> = ({
@@ -23,6 +24,7 @@ const PauseActionButton: React.FC<PauseActionButtonProps> = ({
   providers,
   pauseable,
   disabled,
+  hasActiveRequests,
 }) => {
   const { t } = useTranslation();
   const pauseWorkspaceProps = {
@@ -30,6 +32,7 @@ const PauseActionButton: React.FC<PauseActionButtonProps> = ({
     encounterUuid,
     medicationDispense: initiateMedicationDispenseBody(medicationRequestBundle.request, session, providers, false),
     mode: 'enter',
+    hasActiveRequests,
   };
 
   const handleLaunchWorkspace = () => {

package/src/config-schema.ts

@@ -77,6 +77,16 @@ export const configSchema = {
         _description: 'Name of the attribute used to associate locations with a pharmacy location',
         _default: 'Associated Pharmacy Location',
       },
+      useAssociatedPharmacyLocations: {
+        _type: Type.Boolean,
+        _description: 'Show medication requests from all associated pharmacy locations of the current location',
+        _default: false,
+      },
+      useCurrentLocation: {
+        _type: Type.Boolean,
+        _description: 'Show medication requests from current location',
+        _default: false,
+      },
     },
   },
   refreshInterval: {
@@ -146,6 +156,26 @@ export const configSchema = {
     _description: 'Custom tabs to be added to the prescription panel. See README for more details.',
     _default: [],
   },
+  pharmacyServiceTypedUuid: {
+    _type: Type.UUID,
+    _default: '3adgb9de-5545-2572-add4-a661005f727r',
+    _description: 'Pharmacy billable service type',
+  },
+  enableOdooBilling: {
+    _type: Type.Boolean,
+    _default: false,
+    _description: 'Enable Odoo billing',
+  },
+  blockedPaymentModes: {
+    _type: Type.Array,
+    _default: ['MPESA', 'CASH'],
+    _description: 'Payment modes that require bill generation before picking an order',
+  },
+  serviceUuid: {
+    _type: Type.UUID,
+    _default: '2d4472e2-d7ab-4430-8e0e-a9ffcd809bf4',
+    _description: 'Service Uuid for filtering queues',
+  },
 };
 
 export interface PharmacyConfig {
@@ -174,6 +204,8 @@ export interface PharmacyConfig {
       enabled: boolean;
       tag: string;
       associatedPharmacyLocationAttribute: string;
+      useAssociatedPharmacyLocations: boolean;
+      useCurrentLocation: boolean;
     };
   };
   valueSets: {
@@ -195,4 +227,8 @@ export interface PharmacyConfig {
   validateBatch: boolean;
   leftNavMode: 'normal' | 'collapsed' | 'hidden';
   customTabs: Array<CustomTab>;
+  pharmacyServiceTypedUuid: string;
+  enableOdooBilling: boolean;
+  blockedPaymentModes: Array<string>;
+  serviceUuid: string;
 }

package/src/forms/close-dispense-form.workspace.tsx

@@ -8,6 +8,7 @@ import {
   showSnackbar,
   useConfig,
   usePatient,
+  useVisit,
   Workspace2,
   type Workspace2DefinitionProps,
 } from '@openmrs/esm-framework';
@@ -17,6 +18,7 @@ import { type MedicationDispense, MedicationDispenseStatus, MedicationRequestFul
 import { type PharmacyConfig } from '../config-schema';
 import { getUuidFromReference, markEncounterAsStale, revalidate } from '../utils';
 import styles from './forms.scss';
+import { endVisit } from '../visit/visit.resource';
 
 type CloseDispenseFormProps = {
   medicationDispense: MedicationDispense;
@@ -24,15 +26,17 @@ type CloseDispenseFormProps = {
   patientUuid?: string;
   encounterUuid: string;
   customWorkspaceTitle?: string;
+  hasActiveRequests: boolean;
 };
 
 const CloseDispenseForm: React.FC<Workspace2DefinitionProps<CloseDispenseFormProps, {}, {}>> = ({
-  workspaceProps: { medicationDispense, mode, patientUuid, encounterUuid, customWorkspaceTitle },
+  workspaceProps: { medicationDispense, mode, patientUuid, encounterUuid, customWorkspaceTitle, hasActiveRequests },
   closeWorkspace,
 }) => {
   const { t } = useTranslation();
   const config = useConfig<PharmacyConfig>();
   const { patient, isLoading } = usePatient(patientUuid);
+  const { activeVisit } = useVisit(patientUuid);
 
   // Keep track of medication dispense payload
   const [medicationDispensePayload, setMedicationDispensePayload] = useState<MedicationDispense>();
@@ -92,6 +96,14 @@ const CloseDispenseForm: React.FC<Workspace2DefinitionProps<CloseDispenseFormPro
                 mode === 'enter' ? 'Medication dispense closed.' : 'Dispense record successfully updated.',
               ),
             });
+            if (!hasActiveRequests) {
+              if (config.dispenseBehavior.endActiveVisitOnCompletingOrder) {
+                if (activeVisit) {
+                  const visitUuid = activeVisit?.uuid;
+                  endVisit(visitUuid).then(() => {});
+                }
+              }
+            }
             closeWorkspace({ discardUnsavedChanges: true });
           }
         })

package/src/forms/pause-dispense-form.workspace.tsx

@@ -8,6 +8,7 @@ import {
   showSnackbar,
   useConfig,
   usePatient,
+  useVisit,
   Workspace2,
   type Workspace2DefinitionProps,
 } from '@openmrs/esm-framework';
@@ -17,6 +18,7 @@ import { getUuidFromReference, markEncounterAsStale, revalidate } from '../utils
 import { type MedicationDispense, MedicationDispenseStatus, MedicationRequestFulfillerStatus } from '../types';
 import { type PharmacyConfig } from '../config-schema';
 import styles from './forms.scss';
+import { endVisit } from '../visit/visit.resource';
 
 type PauseDispenseFormProps = {
   medicationDispense: MedicationDispense;
@@ -24,15 +26,17 @@ type PauseDispenseFormProps = {
   patientUuid?: string;
   encounterUuid: string;
   customWorkspaceTitle?: string;
+  hasActiveRequests: boolean;
 };
 
 const PauseDispenseForm: React.FC<Workspace2DefinitionProps<PauseDispenseFormProps, {}, {}>> = ({
-  workspaceProps: { medicationDispense, mode, patientUuid, encounterUuid, customWorkspaceTitle },
+  workspaceProps: { medicationDispense, mode, patientUuid, encounterUuid, customWorkspaceTitle, hasActiveRequests },
   closeWorkspace,
 }) => {
   const { t } = useTranslation();
   const config = useConfig<PharmacyConfig>();
   const { patient, isLoading } = usePatient(patientUuid);
+  const { activeVisit } = useVisit(patientUuid);
 
   // Keep track of medication dispense payload
   const [medicationDispensePayload, setMedicationDispensePayload] = useState<MedicationDispense>();
@@ -92,6 +96,14 @@ const PauseDispenseForm: React.FC<Workspace2DefinitionProps<PauseDispenseFormPro
                 mode === 'enter' ? 'Medication dispense paused.' : 'Dispense record successfully updated.',
               ),
             });
+            if (!hasActiveRequests) {
+              if (config.dispenseBehavior.endActiveVisitOnCompletingOrder) {
+                if (activeVisit) {
+                  const visitUuid = activeVisit?.uuid;
+                  endVisit(visitUuid).then(() => {});
+                }
+              }
+            }
             closeWorkspace({ discardUnsavedChanges: true });
           }
         })

package/src/index.ts

@@ -7,10 +7,11 @@ import DispensingDashboardComponent from './dashboard/dispensing-dashboard.compo
 import DispensingLinkComponent from './dispensing-link.component';
 import DispensingLinkHomepageComponent from './dashboard/dispensing-dashboard-link.component';
 import PauseActionButton from './components/prescription-actions/pause-action-button.component';
+import GenerateBillActionButton from './components/prescription-actions/generate-bill-action-button.component';
 
 export const importTranslation = require.context('../translations', false, /.json$/, 'lazy');
 
-const moduleName = '@openmrs/esm-dispensing-app';
+const moduleName = '@ampath/esm-dispensing-app';
 
 const options = {
   featureName: 'dispensing',
@@ -33,6 +34,7 @@ export const dispensingDashboardLink = getSyncLifecycle(DispensingLinkHomepageCo
 export const closeActionButton = getSyncLifecycle(CloseActionButton, options);
 export const dispenseActionButton = getSyncLifecycle(DispenseActionButton, options);
 export const pauseActionButton = getSyncLifecycle(PauseActionButton, options);
+export const generateBillActionButton = getSyncLifecycle(GenerateBillActionButton, options);
 
 // Dispensing workspace
 // t('closePrescription', 'Close prescription')

package/src/location/location.resource.test.tsx

@@ -29,6 +29,8 @@ const pharmacyConfig: PharmacyConfig = {
       enabled: false,
       tag: 'Login Location',
       associatedPharmacyLocationAttribute: 'Associated Pharmacy Location',
+      useAssociatedPharmacyLocations: true,
+      useCurrentLocation: true,
     },
   },
   refreshInterval: 10000,
@@ -44,6 +46,10 @@ const pharmacyConfig: PharmacyConfig = {
   validateBatch: false,
   leftNavMode: 'collapsed',
   customTabs: [],
+  pharmacyServiceTypedUuid: '',
+  enableOdooBilling: false,
+  serviceUuid: '',
+  blockedPaymentModes: [],
 };
 
 describe('Location Resource tests', () => {
@@ -80,6 +86,22 @@ describe('Location Resource tests', () => {
                 uuid: '84b9b680-786c-4388-9e7c-805614c13b5a',
               },
             },
+            {
+              attributeType: {
+                name: 'Associated Pharmacy Location',
+              },
+              value: {
+                uuid: '318bb1dc-77e3-4ac4-b524-cef0e8a456bd',
+              },
+            },
+            {
+              attributeType: {
+                name: 'Associated Pharmacy Location',
+              },
+              value: {
+                uuid: '879bf321-e857-43a5-8f6b-e28e345a34c1',
+              },
+            },
           ],
         },
         {
@@ -87,6 +109,16 @@ describe('Location Resource tests', () => {
           name: 'KGH NCD',
           attributes: [],
         },
+        {
+          uuid: '318bb1dc-77e3-4ac4-b524-cef0e8a456bd',
+          name: 'KGH MCH Main Pharmacy',
+          attributes: [],
+        },
+        {
+          uuid: '879bf321-e857-43a5-8f6b-e28e345a34c1',
+          name: 'KGH MCH Revolving Fund Pharmacy',
+          attributes: [],
+        },
       ],
     };
 
@@ -94,16 +126,22 @@ describe('Location Resource tests', () => {
     useSWR.mockImplementation(() => ({ data: { data: queryResultsBundle } }));
     const { result } = renderHook(() => useLocations(pharmacyConfig));
     const { locations } = result.current;
-    expect(locations.length).toBe(3);
+    expect(locations.length).toBe(5);
     // should be sorted by name alphabetically
     expect(locations[0].id).toBe('5981f962-6eec-453d-89ce-2f9ac48d096f');
     expect(locations[0].name).toBe('KGH MCH');
-    expect(locations[0].associatedPharmacyLocation).toBe('84b9b680-786c-4388-9e7c-805614c13b5a');
-    expect(locations[1].id).toBe('7b959d2f-11f3-4611-b2e4-700200625d61');
-    expect(locations[1].name).toBe('KGH NCD');
-    expect(locations[1].associatedPharmacyLocation).toBe(null);
-    expect(locations[2].id).toBe('2bcb9215-8cd6-11eb-b7be-0242ac110002');
-    expect(locations[2].name).toBe('KGH Triage');
-    expect(locations[2].associatedPharmacyLocation).toBe(null);
+    expect(locations[0].associatedPharmacyLocations).toContain('84b9b680-786c-4388-9e7c-805614c13b5a');
+    expect(locations[1].id).toBe('318bb1dc-77e3-4ac4-b524-cef0e8a456bd');
+    expect(locations[1].name).toBe('KGH MCH Main Pharmacy');
+    expect(locations[1].associatedPharmacyLocations).toEqual([]);
+    expect(locations[2].id).toBe('879bf321-e857-43a5-8f6b-e28e345a34c1');
+    expect(locations[2].name).toBe('KGH MCH Revolving Fund Pharmacy');
+    expect(locations[2].associatedPharmacyLocations).toEqual([]);
+    expect(locations[3].id).toBe('7b959d2f-11f3-4611-b2e4-700200625d61');
+    expect(locations[3].name).toBe('KGH NCD');
+    expect(locations[3].associatedPharmacyLocations).toEqual([]);
+    expect(locations[4].id).toBe('2bcb9215-8cd6-11eb-b7be-0242ac110002');
+    expect(locations[4].name).toBe('KGH Triage');
+    expect(locations[4].associatedPharmacyLocations).toEqual([]);
   });
 });

package/src/location/location.resource.tsx

@@ -16,10 +16,13 @@ export function useLocations(config: PharmacyConfig) {
       ?.map((e) => ({
         id: e.uuid,
         name: e.name,
-        associatedPharmacyLocation:
-          e.attributes?.find(
-            (a) => a.attributeType.name === config.locationBehavior.locationFilter.associatedPharmacyLocationAttribute,
-          )?.value?.uuid ?? null,
+        associatedPharmacyLocations:
+          e.attributes
+            ?.filter(
+              (a) =>
+                a.attributeType.name === config.locationBehavior.locationFilter.associatedPharmacyLocationAttribute,
+            )
+            ?.map((a) => a.value.uuid) ?? [],
       }))
       .sort((a, b) => a.name.localeCompare(b.name));
   }, [data?.data?.results, config]);

package/src/medication-request/medication-request.resource.test.tsx

@@ -1,4 +1,3 @@
-import dayjs from 'dayjs';
 import useSWR from 'swr';
 import {
   updateMedicationRequestFulfillerStatus,
@@ -19,15 +18,12 @@ jest.mock('react', () => ({
 }));
 
 describe('Medication Request Resource Test', () => {
-  test('usePrescriptionsTable should call active endpoint and proper date based on expiration period if status parameter is active', () => {
+  test('usePrescriptionsTable should call active endpoint with a large fetch count and no page offset when status parameter is active', () => {
     // @ts-ignore
     useSWR.mockImplementation(() => ({ data: { data: 'mockedReturnData' } }));
     usePrescriptionsTable(true, '', 'ACTIVE', 5, 5, 'bob', null, 10, 10000);
     expect(useSWR).toHaveBeenCalledWith(
-      `/ws/fhir2/R4/Encounter?_query=encountersWithMedicationRequests&_getpagesoffset=5&_count=5&date=ge${dayjs()
-        .startOf('day')
-        .subtract(10, 'day')
-        .toISOString()}&status=ACTIVE&patientSearchTerm=bob`,
+      `/ws/fhir2/R4/Encounter?_query=encountersWithMedicationRequests&_getpagesoffset=0&_count=200&status=ACTIVE&patientSearchTerm=bob`,
       openmrsFetch,
       { refreshInterval: 10000 },
     );