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

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

@@ -136,7 +136,7 @@
       "auxiliaryFiles": [
         "963.js.map"
       ],
-      "hash": "19b67e0ea74b31a4",
+      "hash": "c22f096f35decd72",
       "childrenByOrder": {}
     },
     {
@@ -182,7 +182,7 @@
       "auxiliaryFiles": [
         "1043.js.map"
       ],
-      "hash": "d50e59843c8f013c",
+      "hash": "3ea1a528256fd158",
       "childrenByOrder": {}
     },
     {
@@ -493,7 +493,7 @@
       "auxiliaryFiles": [
         "3568.js.map"
       ],
-      "hash": "b478e7dca213847e",
+      "hash": "ee1e7730f1b94e62",
       "childrenByOrder": {}
     },
     {
@@ -523,9 +523,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 420862,
+      "size": 410460,
       "sizes": {
-        "javascript": 420862
+        "javascript": 410460
       },
       "names": [],
       "idHints": [],
@@ -538,7 +538,7 @@
       "auxiliaryFiles": [
         "3693.js.map"
       ],
-      "hash": "1c762213ead18534",
+      "hash": "39d09212f4e31e46",
       "childrenByOrder": {}
     },
     {
@@ -584,7 +584,7 @@
       "auxiliaryFiles": [
         "4099.js.map"
       ],
-      "hash": "aed00fc516ce4dd2",
+      "hash": "140256ea3ab2aaae",
       "childrenByOrder": {}
     },
     {
@@ -1129,7 +1129,7 @@
       "auxiliaryFiles": [
         "6841.js.map"
       ],
-      "hash": "3af2687c7a431016",
+      "hash": "5b2edd8041389f9b",
       "childrenByOrder": {}
     },
     {
@@ -1439,10 +1439,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 3738287,
+      "size": 3727885,
       "sizes": {
         "consume-shared": 210,
-        "javascript": 3716038,
+        "javascript": 3705636,
         "share-init": 336,
         "runtime": 21703
       },
@@ -1459,7 +1459,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "78d4663c6c512e52",
+      "hash": "fed018c9e1c54d07",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":">=2.2.0"},"pages":[{"component":"dispensing","route":"dispensing","online":true,"offline":true}],"extensions":[{"name":"dispensing-link","slot":"app-menu-slot","component":"dispensingLink","online":true,"offline":true},{"name":"patient-diagnoses","component":"patientDiagnoses","slot":"dispensing-condition-and-diagnoses","online":true,"offline":true},{"name":"patient-conditions","component":"patientConditions","slot":"dispensing-condition-and-diagnoses","online":true,"offline":true},{"name":"dispensing-dashboard","slot":"dispensing-dashboard-slot","component":"dispensingDashboard","online":true,"offline":true},{"name":"dispensing-dashboard-link","component":"dispensingDashboardLink","meta":{"name":"dispensing","slot":"dispensing-dashboard-slot","title":"Dispensing"}},{"name":"dispense-action-button","slot":"prescription-action-button-slot","component":"dispenseActionButton"},{"name":"pause-action-button","slot":"prescription-action-button-slot","component":"pauseActionButton"},{"name":"close-action-button","slot":"prescription-action-button-slot","component":"closeActionButton"},{"name":"generate-bill-action-button","slot":"prescription-action-button-slot","component":"generateBillActionButton"}],"workspaces2":[{"name":"close-dispense-workspace","component":"closeDispenseWorkspace","window":"dispensing-window"},{"name":"pause-dispense-workspace","component":"pauseDispenseWorkspace","window":"dispensing-window"},{"name":"dispense-workspace","component":"dispenseWorkspace","window":"dispensing-window"},{"name":"dispensing-patient-search-workspace","component":"@openmrs/esm-patient-search-app#patientSearchWorkspace2","window":"fill-prescription-window"},{"name":"dispensing-start-visit-workspace","component":"@openmrs/esm-patient-chart-app#exportedVisitForm","window":"fill-prescription-window"},{"name":"dispensing-order-basket-workspace","component":"@openmrs/esm-patient-orders-app#exportedOrderBasketWorkspace","window":"fill-prescription-window"},{"name":"dispensing-order-basket-add-drug-order-workspace","component":"@openmrs/esm-patient-medications-app#exportedAddDrugOrderWorkspace","window":"fill-prescription-window"}],"workspaceWindows2":[{"name":"dispensing-window","group":"dispensing-group"},{"name":"fill-prescription-window","group":"dispensing-group"}],"workspaceGroups2":[{"name":"dispensing-group","overlay":true}],"modals":[{"name":"prescription-print-preview-modal","component":"printPrescriptionPreviewModal"},{"name":"delete-confirm-modal","component":"deleteConfirmModal"},{"name":"on-prescription-filled-modal","component":"onPrescriptionFilledModal"}],"version":"1.10.0-next.21"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":">=2.2.0"},"pages":[{"component":"dispensing","route":"dispensing","online":true,"offline":true}],"extensions":[{"name":"dispensing-link","slot":"app-menu-slot","component":"dispensingLink","online":true,"offline":true},{"name":"patient-diagnoses","component":"patientDiagnoses","slot":"dispensing-condition-and-diagnoses","online":true,"offline":true},{"name":"patient-conditions","component":"patientConditions","slot":"dispensing-condition-and-diagnoses","online":true,"offline":true},{"name":"dispensing-dashboard","slot":"dispensing-dashboard-slot","component":"dispensingDashboard","online":true,"offline":true},{"name":"dispensing-dashboard-link","component":"dispensingDashboardLink","meta":{"name":"dispensing","slot":"dispensing-dashboard-slot","title":"Dispensing"}},{"name":"dispense-action-button","slot":"prescription-action-button-slot","component":"dispenseActionButton"},{"name":"pause-action-button","slot":"prescription-action-button-slot","component":"pauseActionButton"},{"name":"close-action-button","slot":"prescription-action-button-slot","component":"closeActionButton"},{"name":"generate-bill-action-button","slot":"prescription-action-button-slot","component":"generateBillActionButton"}],"workspaces2":[{"name":"close-dispense-workspace","component":"closeDispenseWorkspace","window":"dispensing-window"},{"name":"pause-dispense-workspace","component":"pauseDispenseWorkspace","window":"dispensing-window"},{"name":"dispense-workspace","component":"dispenseWorkspace","window":"dispensing-window"},{"name":"dispensing-patient-search-workspace","component":"@openmrs/esm-patient-search-app#patientSearchWorkspace2","window":"fill-prescription-window"},{"name":"dispensing-start-visit-workspace","component":"@openmrs/esm-patient-chart-app#exportedVisitForm","window":"fill-prescription-window"},{"name":"dispensing-order-basket-workspace","component":"@openmrs/esm-patient-orders-app#exportedOrderBasketWorkspace","window":"fill-prescription-window"},{"name":"dispensing-order-basket-add-drug-order-workspace","component":"@openmrs/esm-patient-medications-app#exportedAddDrugOrderWorkspace","window":"fill-prescription-window"}],"workspaceWindows2":[{"name":"dispensing-window","group":"dispensing-group"},{"name":"fill-prescription-window","group":"dispensing-group"}],"workspaceGroups2":[{"name":"dispensing-group","overlay":true}],"modals":[{"name":"prescription-print-preview-modal","component":"printPrescriptionPreviewModal"},{"name":"delete-confirm-modal","component":"deleteConfirmModal"},{"name":"on-prescription-filled-modal","component":"onPrescriptionFilledModal"}],"version":"1.10.0-next.23"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ampath/esm-dispensing-app",
-  "version": "1.10.0-next.21",
+  "version": "1.10.0-next.23",
   "license": "MPL-2.0",
   "description": "Medication dispensing application",
   "browser": "dist/openmrs-esm-dispensing-app.js",

package/src/bill/bill.resource.ts

@@ -1,7 +1,6 @@
-import { openmrsFetch, type OpenmrsResource, restBaseUrl } from '@openmrs/esm-framework';
+import { openmrsFetch, type OpenmrsResource, restBaseUrl, useConfig } from '@openmrs/esm-framework';
 import useSWR, { mutate } from 'swr';
 import { type BillInvoice } from '../types';
-import { getHieBaseUrl, postJson } from '../utils';
 import { useCallback } from 'react';
 import dayjs from 'dayjs';
 
@@ -39,12 +38,6 @@ export function useInvalidateBills(patientUuid: string) {
   }, [patientUuid]);
 }
 
-export const getOrderNumberFromHie = async (orderNumber: string) => {
-  const hieBaseUrl = await getHieBaseUrl();
-  const url = `${hieBaseUrl}/bill-order?order_no=${orderNumber}`;
-  return postJson<{ bill_uuid: string; line_item_uuid: string }>(url, null, 'GET');
-};
-
 export const usePatientBills = (patientUuid: string, billStatus: string = 'PENDING,POSTED') => {
   const url = `${restBaseUrl}/billing/bill?patientUuid=${patientUuid}&status=${billStatus}&v=custom:(uuid,lineItems,dateCreated)`;
 
@@ -76,14 +69,50 @@ export const usePatientBills = (patientUuid: string, billStatus: string = 'PENDI
   };
 };
 
-export const getOdooBills = async (patientUuid: string) => {
-  const url = `/openmrs/etl/odoo/billing/patient/${patientUuid}`;
-  return postJson<{
-    orders: Array<{
-      order_lines: Array<{
-        billing_status: string;
-        openmrs_order_id: string;
+export const useOrderBill = (orderNumber: string) => {
+  const { hieBaseUrl } = useConfig({
+    externalModuleName: '@ampath/esm-dha-workflow-app',
+  });
+  const url = `${hieBaseUrl}/bill-order?order_no=${orderNumber}`;
+
+  const {
+    data,
+    error,
+    isLoading,
+    isValidating,
+    mutate: mutated,
+  } = useSWR<{ data: { bill_uuid: string; line_item_uuid: string } }>(url, openmrsFetch);
+
+  const results = data?.data;
+
+  return {
+    orderBill: results,
+    error,
+    isLoadingOrderBill: isLoading,
+    isValidating,
+    mutated,
+  };
+};
+
+export const useOdooBills = (patientUuid: string, enableOdooBilling: boolean = false) => {
+  const url = enableOdooBilling ? `etl/odoo/billing/patient/${patientUuid}` : null;
+
+  const { data, error, isLoading } = useSWR<{
+    data: {
+      orders: Array<{
+        order_lines: Array<{
+          billing_status: string;
+          openmrs_order_id: string;
+        }>;
       }>;
-    }>;
-  }>(url, null, 'GET');
+    };
+  }>(url, openmrsFetch);
+
+  const results = data?.data;
+
+  return {
+    odooBills: results,
+    error,
+    isLoadingOdooBills: isLoading,
+  };
 };

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

@@ -16,7 +16,7 @@ import {
 import { type PharmacyConfig } from '../config-schema';
 import { useProviders } from '../medication-dispense/medication-dispense.resource';
 import styles from './action-buttons.scss';
-import { getOdooBills, getOrderNumberFromHie } from '../bill/bill.resource';
+import { useOdooBills, useOrderBill } from '../bill/bill.resource';
 import { InlineLoading } from '@carbon/react';
 
 interface ActionButtonsProps {
@@ -45,7 +45,6 @@ const ActionButtons: React.FC<ActionButtonsProps> = ({
   mutated,
 }) => {
   const [status, setStatus] = useState<BillStatus>('BLANK');
-  const [isLoadingOdooBills, setIsLoadingOdooBills] = useState(false);
   const config = useConfig<PharmacyConfig>();
   const session = useSession();
   const providers = useProviders(config.dispenserProviderRoles);
@@ -57,13 +56,16 @@ const ActionButtons: React.FC<ActionButtonsProps> = ({
     return {} as Order;
   }, [orders, medicationRequestBundle, isLoadingOrders]);
 
+  const { orderBill, isLoadingOrderBill } = useOrderBill(order?.orderNumber);
+  const { odooBills, isLoadingOdooBills } = useOdooBills(order?.patient?.uuid, config.enableOdooBilling);
+
   useEffect(() => {
-    const getBillStatus = async () => {
-      try {
-        const response = await getOrderNumberFromHie(order?.orderNumber);
-        const billUuid = response.bill_uuid;
+    if (!config.enableOdooBilling) {
+      if (!isLoading && !isLoadingOrderBill && orderBill) {
+        const billUuid = orderBill?.bill_uuid;
+        const lineItemUuid = orderBill?.line_item_uuid;
         const bill = bills.find((b) => b.uuid === billUuid);
-        const lineItem = bill?.lineItems?.find((i) => i.uuid === response?.line_item_uuid);
+        const lineItem = bill?.lineItems?.find((i) => i.uuid === lineItemUuid);
         if (lineItem) {
           if (!config.blockedPaymentModes.includes(lineItem.priceName.toUpperCase())) {
             setStatus('PAID');
@@ -73,40 +75,29 @@ const ActionButtons: React.FC<ActionButtonsProps> = ({
         } else {
           setStatus('BLANK');
         }
-      } catch (error) {
-        setStatus('BLANK');
       }
-    };
-
-    const odooBills = async () => {
-      try {
-        setIsLoadingOdooBills(true);
-        const results = await getOdooBills(order?.patient?.uuid);
-        if (results.orders && results.orders[0].order_lines && results.orders[0].order_lines.length) {
-          const currentOrder = results.orders[0].order_lines.find((o) => o.openmrs_order_id === order?.uuid);
-          if (currentOrder) {
-            if (currentOrder.billing_status.toUpperCase() === 'PAID') {
-              setStatus('PAID');
-            } else {
-              setStatus('PENDING');
-            }
+    } else {
+      if (odooBills && odooBills.orders && odooBills.orders[0].order_lines && odooBills.orders[0].order_lines.length) {
+        const currentOrder = odooBills.orders[0].order_lines.find((o) => o.openmrs_order_id === order?.uuid);
+        if (currentOrder) {
+          if (currentOrder.billing_status.toUpperCase() === 'PAID') {
+            setStatus('PAID');
+          } else {
+            setStatus('PENDING');
           }
         }
-      } catch (error) {
-        console.error(error);
-      } finally {
-        setIsLoadingOdooBills(false);
-      }
-    };
-
-    if (config.enableOdooBilling) {
-      odooBills();
-    } else {
-      if (order?.orderNumber) {
-        getBillStatus();
       }
     }
-  }, [order, bills, isLoadingOrders, config.enableOdooBilling, config.blockedPaymentModes]);
+  }, [
+    order,
+    isLoading,
+    bills,
+    odooBills,
+    orderBill,
+    isLoadingOrderBill,
+    config.blockedPaymentModes,
+    config.enableOdooBilling,
+  ]);
 
   const mostRecentMedicationDispenseStatus: MedicationDispenseStatus = getMostRecentMedicationDispenseStatus(
     medicationRequestBundle.dispenses,
@@ -161,7 +152,7 @@ const ActionButtons: React.FC<ActionButtonsProps> = ({
     mutated,
   };
 
-  if (isLoadingOdooBills) {
+  if (isLoadingOdooBills || isLoading || isLoadingOrderBill) {
     return <InlineLoading />;
   }