@kenyaemr/esm-billing-app 5.4.1-pre.1818 → 5.4.1-pre.1822

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":"billingDashboardLink","name":"billing-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"billing","title":"billing","slot":"billing-dashboard-slot"}},{"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":"billing-test-order-action","component":"testOrderAction","slot":"tests-ordered-actions-slot","order":0},{"component":"billingOverviewLink","name":"billing-overview-link","order":0,"slot":"billing-dashboard-link-slot"},{"component":"paymentHistoryLink","name":"payment-history-link","slot":"billing-dashboard-link-slot"},{"component":"paymentPointsLink","name":"payment-points-link","slot":"billing-dashboard-link-slot"},{"component":"paymentModesLink","name":"payment-modes-link","slot":"billing-dashboard-link-slot"},{"component":"billManagerLink","name":"bill-manager-link","slot":"billing-dashboard-link-slot"},{"component":"chargeableItemsLink","name":"chargeable-items-link","slot":"billing-dashboard-link-slot"},{"component":"billableExemptionsLink","name":"billable-exemptions-link","slot":"billing-dashboard-link-slot"},{"component":"claimsManagementSideNavGroup","name":"claims-management-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"claims-management","title":"Claims management Overview","slot":"case-management-slot"},"featureFlag":"healthInformationExchange"},{"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":"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"}],"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":"retry-claim-request-modal","component":"retryClaimRequestModal"},{"name":"paid-bill-receipt-print-preview-modal","component":"paidBillReceiptPrintPreviewModal"},{"name":"clock-in-modal","component":"clockIn"},{"name":"create-bill-item-modal","component":"createBillItemModal"}],"version":"5.4.1-pre.1818"}
+{"$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":"billingDashboardLink","name":"billing-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"billing","title":"billing","slot":"billing-dashboard-slot"}},{"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":"billing-test-order-action","component":"testOrderAction","slot":"tests-ordered-actions-slot","order":0},{"component":"billingOverviewLink","name":"billing-overview-link","order":0,"slot":"billing-dashboard-link-slot"},{"component":"paymentHistoryLink","name":"payment-history-link","slot":"billing-dashboard-link-slot"},{"component":"paymentPointsLink","name":"payment-points-link","slot":"billing-dashboard-link-slot"},{"component":"paymentModesLink","name":"payment-modes-link","slot":"billing-dashboard-link-slot"},{"component":"billManagerLink","name":"bill-manager-link","slot":"billing-dashboard-link-slot"},{"component":"chargeableItemsLink","name":"chargeable-items-link","slot":"billing-dashboard-link-slot"},{"component":"billableExemptionsLink","name":"billable-exemptions-link","slot":"billing-dashboard-link-slot"},{"component":"claimsManagementSideNavGroup","name":"claims-management-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"claims-management","title":"Claims management Overview","slot":"case-management-slot"},"featureFlag":"healthInformationExchange"},{"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":"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"}],"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":"retry-claim-request-modal","component":"retryClaimRequestModal"},{"name":"paid-bill-receipt-print-preview-modal","component":"paidBillReceiptPrintPreviewModal"},{"name":"clock-in-modal","component":"clockIn"},{"name":"create-bill-item-modal","component":"createBillItemModal"}],"version":"5.4.1-pre.1822"}

package/package.json

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

package/src/benefits-package/forms/package-interventions.component.tsx

@@ -1,9 +1,9 @@
+import React from 'react';
 import { InlineLoading, InlineNotification, MultiSelect } from '@carbon/react';
-import React, { useEffect, useState } from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { z } from 'zod';
-import { InterventionsFilter, toQueryParams, useInterventions } from '../../hooks/useInterventions';
+import { InterventionsFilter, useInterventions } from '../../hooks/useInterventions';
 import { eligibilityRequestShema } from '../benefits-package.resources';
 import { usePatient } from '@openmrs/esm-framework';
 
@@ -14,25 +14,16 @@ type PackageInterventionsProps = {
   patientUuid: string;
 };
 const PackageInterventions: React.FC<PackageInterventionsProps> = ({ category, patientUuid }) => {
-  const [filters, setFilters] = useState<InterventionsFilter>({ package_code: category });
   const { error: patientError, isLoading: isPatientLoading, patient } = usePatient(patientUuid);
+  const filters: InterventionsFilter = {
+    package_code: category,
+    applicable_gender: patient?.gender === 'male' ? 'MALE' : 'FEMALE',
+  };
   const { error, interventions, isLoading } = useInterventions(filters);
 
   const form = useFormContext<EligibilityRequest>();
   const { t } = useTranslation();
 
-  useEffect(() => {
-    setFilters((state) => ({
-      ...state,
-      package_code: category,
-      applicable_gender: patient?.gender === 'male' ? 'MALE' : patient?.gender === 'female' ? 'FEMALE' : undefined,
-    }));
-  }, [category, patient]);
-
-  useEffect(() => {
-    form.setValue('interventions', []);
-  }, [category]);
-
   if (isLoading || isPatientLoading) {
     return (
       <InlineLoading
@@ -56,6 +47,10 @@ const PackageInterventions: React.FC<PackageInterventionsProps> = ({ category, p
     );
   }
 
+  if (interventions.length === 0) {
+    return null;
+  }
+
   return (
     <Controller
       control={form.control}
@@ -71,7 +66,7 @@ const PackageInterventions: React.FC<PackageInterventionsProps> = ({ category, p
             field.onChange(e.selectedItems);
           }}
           initialSelectedItems={field.value}
-          label="Choose option"
+          label={t('chooseInterventions', 'Choose interventions')}
           items={interventions.map((r) => r.interventionCode)}
           itemToString={(item) => interventions.find((r) => r.interventionCode === item)?.interventionName ?? ''}
         />

package/src/billable-services/bill-manager/modals/refund-bill.modal.tsx

@@ -71,7 +71,7 @@ export const RefundBillModal: React.FC<RefundBillModalProps> = ({ onClose, bill,
     } finally {
       setIsLoading(false);
     }
-  }, [bill, lineItem, onClose, t]);
+  }, [bill, lineItem, onClose, t, billableServiceUuid, itemUuid]);
 
   return (
     <>

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

@@ -60,7 +60,7 @@ export const EditBillForm: React.FC<EditBillFormProps> = ({
 
   useEffect(() => {
     promptBeforeClosing(() => isDirty);
-  }, [isDirty]);
+  }, [isDirty, promptBeforeClosing]);
 
   const onSubmit: SubmitHandler<EditBillFormData> = async (formData) => {
     const updateBill = createEditBillPayload(lineItem, formData, bill, formData.adjustmentReason);

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

@@ -89,7 +89,7 @@ export const WaiveBillForm: React.FC<BillWaiverFormProps> = ({
 
   useEffect(() => {
     promptBeforeClosing(() => isDirty);
-  }, [isDirty]);
+  }, [isDirty, promptBeforeClosing]);
 
   if (lineItems?.length === 0) {
     return null;

package/src/billable-services/billable-exemptions/billable-exemptions-viewer.component.tsx

@@ -62,17 +62,20 @@ export const BillableExemptionsViewer = () => {
         setInvalidJsonErrorMessage(t('invalidJsonError', 'Invalid JSON input.'));
       }
     },
-    [resetErrorMessage],
+    [resetErrorMessage, t],
   );
 
-  const updateSchema = useCallback((updatedSchema: Schema) => {
-    try {
-      setSchema(updatedSchema);
-      setStringifiedSchema(JSON.stringify(updatedSchema, null, 2));
-    } catch (error) {
-      setInvalidJsonErrorMessage(t('saveError', 'Failed to save schema.'));
-    }
-  }, []);
+  const updateSchema = useCallback(
+    (updatedSchema: Schema) => {
+      try {
+        setSchema(updatedSchema);
+        setStringifiedSchema(JSON.stringify(updatedSchema, null, 2));
+      } catch (error) {
+        setInvalidJsonErrorMessage(t('saveError', 'Failed to save schema.'));
+      }
+    },
+    [t],
+  );
 
   useEffect(() => {
     if (billableExceptionSchema) {

package/src/billable-services/billables/commodity/commodity-form.workspace.tsx

@@ -52,7 +52,7 @@ const CommodityForm: React.FC<CommodityFormProps> = ({
     if (initialValues) {
       trigger();
     }
-  }, [initialValues]);
+  }, [initialValues, trigger]);
 
   const onSubmit = async (formValues: BillableFormSchema) => {
     const payload = formatBillableServicePayloadForSubmission(formValues, initialValues?.['uuid']);

package/src/billable-services/billables/services/service-form.workspace.tsx

@@ -66,7 +66,7 @@ const AddServiceForm: React.FC<AddServiceFormProps> = ({
       setConceptToLookup(initialValues.concept?.concept?.display);
       trigger();
     }
-  }, [initialValues]);
+  }, [initialValues, trigger]);
 
   const {
     fields: servicePriceFields,

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

@@ -48,6 +48,12 @@ const VisitAttributesForm: React.FC<VisitAttributesFormProps> = ({ setAttributes
     }));
   }, [visitAttributeTypes, getValues]);
 
+  const [policyNumber, exemptionCategory, insuranceScheme] = watch([
+    'policyNumber',
+    'exemptionCategory',
+    'insuranceScheme',
+  ]);
+
   useEffect(() => {
     setAttributes(createVisitAttributesPayload());
   }, [
@@ -55,9 +61,9 @@ const VisitAttributesForm: React.FC<VisitAttributesFormProps> = ({ setAttributes
     paymentMethods,
     setAttributes,
     createVisitAttributesPayload,
-    watch('policyNumber'),
-    watch('exemptionCategory'),
-    watch('insuranceScheme'),
+    policyNumber,
+    exemptionCategory,
+    insuranceScheme,
   ]);
 
   if (isLoadingPaymentModes) {

package/src/claims/claims-management/main/claims-pre-auth-main.component.tsx

@@ -20,7 +20,7 @@ const ClaimsManagementPreAuthRequest = () => {
       { value: 'cancelled', label: t('cancelled', 'Cancelled') },
       { value: 'entered-in-error', label: t('enteredInError', 'Entered in error') },
     ],
-    [],
+    [t],
   );
 
   return (

package/src/claims/claims-management/table/claims-list-table.component.tsx

@@ -37,7 +37,7 @@ const ClaimsManagementTable: React.FC = () => {
       { value: 'CHECKED', label: t('checked', 'Checked') },
       { value: 'VALUATED', label: t('valuated', 'Valuated') },
     ],
-    [],
+    [t],
   );
   const [pageSize, setPageSize] = useState(5);
   const filterClaims = (claim) => {

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

@@ -45,7 +45,9 @@ const ClaimsFormSchema = z.object({
   treatmentStart: z.string().nonempty({ message: 'Treatment start date is required' }),
   treatmentEnd: z.string().nonempty({ message: 'Treatment end date is required' }),
   package: z.string().min(1, 'Package Required'),
-  interventions: z.array(z.string()).nonempty({ message: 'At least one intervention is required' }),
+  interventions: z.array(z.string()).min(1, {
+    message: 'At least one intervention is required',
+  }),
   provider: z.string().nonempty({ message: 'provider is provider' }),
 });
 
@@ -97,6 +99,11 @@ const ClaimsForm: React.FC<ClaimsFormProps> = ({ bill, selectedLineItems }) => {
     reset,
   } = form;
 
+  const handleInterventionsChange = (e: { selectedItem: string }) => {
+    form.setValue('interventions', []);
+    setValue('package', e.selectedItem);
+  };
+
   const onSubmit = async (data: z.infer<typeof ClaimsFormSchema>) => {
     setLoading(true);
     const providedItems = selectedLineItems.reduce((acc, item) => {
@@ -163,7 +170,7 @@ const ClaimsForm: React.FC<ClaimsFormProps> = ({ bill, selectedLineItems }) => {
       setLoading(false);
     }
   };
-  const selectedPackageObservable = form.watch('package');
+  const selectedPackage = packages.find((package_) => package_.uuid === form.watch('package'))?.packageCode ?? '';
 
   useEffect(() => {
     setValue('diagnoses', diagnoses?.map((d) => d.id) ?? ([] as any));
@@ -297,9 +304,7 @@ const ClaimsForm: React.FC<ClaimsFormProps> = ({ bill, selectedLineItems }) => {
                         invalidText={form.formState.errors[field.name]?.message}
                         id="package"
                         titleText={t('package', 'Package')}
-                        onChange={(e) => {
-                          field.onChange(e.selectedItem);
-                        }}
+                        onChange={handleInterventionsChange}
                         initialSelectedItem={field.value}
                         label="Choose package"
                         items={packages.map((r) => r.uuid)}
@@ -311,16 +316,12 @@ const ClaimsForm: React.FC<ClaimsFormProps> = ({ bill, selectedLineItems }) => {
               />
             </Layer>
           </Column>
-          {selectedPackageObservable && (
-            <Column>
-              <Layer className={styles.input}>
-                <PackageInterventions
-                  category={packages.find((package_) => package_.uuid === selectedPackageObservable)?.packageCode ?? ''}
-                  patientUuid={patientUuid}
-                />
-              </Layer>
-            </Column>
-          )}
+
+          <Column>
+            <Layer className={styles.input}>
+              <PackageInterventions key={selectedPackage} category={selectedPackage} patientUuid={patientUuid} />
+            </Layer>
+          </Column>
 
           <Column>
             <Layer className={styles.input}>

package/src/invoice/invoice.component.tsx

@@ -85,7 +85,7 @@ const Invoice: React.FC = () => {
   useEffect(() => {
     const paidLineItems = bill?.lineItems?.filter((item) => item.paymentStatus === 'PAID') ?? [];
     setSelectedLineItems(paidLineItems);
-  }, [bill?.lineItems?.length]);
+  }, [bill?.lineItems]);
 
   const invoiceDetails = {
     'Total Amount': convertToCurrency(bill?.totalAmount),

package/src/invoice/payments/payment-form/payment-form.component.tsx

@@ -32,11 +32,9 @@ const PaymentForm: React.FC<PaymentFormProps> = ({ disablePayment, amountDue, ap
   };
 
   const handleAppendPaymentMode = useCallback(() => {
-    {
-      append({ method: null, amount: 0, referenceCode: '' });
-      setFocus(`payment.${fields.length}.method`);
-    }
-  }, [append]);
+    append({ method: null, amount: 0, referenceCode: '' });
+    setFocus(`payment.${fields.length}.method`);
+  }, [append, fields.length, setFocus]);
 
   const handleRemovePaymentMode = useCallback((index) => remove(index), [remove]);
 

package/translations/en.json

@@ -56,6 +56,7 @@
   "chargeItemsDescription": "Charge Items and Services Dashboard",
   "checked": "Checked",
   "checkFilters": "Check the filters above",
+  "chooseInterventions": "Choose interventions",
   "claim": "Process claims",
   "claimCode": "Claim Code",
   "claimedAmount": "Claimed Amount",