@kenyaemr/esm-billing-app 5.4.1-pre.1801 → 5.4.1-pre.1821

package/src/billable-services/billiable-item/test-order/test-order-action.test.tsx

@@ -6,8 +6,12 @@ import * as resource from './test-order-action.resource';
 import userEvent from '@testing-library/user-event';
 import { launchWorkspace, showModal } from '@openmrs/esm-framework';
 import { createMedicationDispenseProps } from './dispense.resource';
+import { useStockItemQuantity } from '../useBillableItem';
 
 jest.mock('./test-order-action.resource');
+jest.mock('../useBillableItem', () => ({
+  useStockItemQuantity: jest.fn(),
+}));
 
 const mockTestProps = {
   order: { uuid: '123', patient: { uuid: '456' } } as Order,
@@ -75,13 +79,31 @@ describe('TestOrderAction', () => {
   });
 
   test('should render loading when isLoading is true', () => {
-    jest.spyOn(resource, 'useTestOrderBillStatus').mockReturnValueOnce({ isLoading: true, hasPendingPayment: false });
+    jest.spyOn(resource, 'useTestOrderBillStatus').mockReturnValue({ isLoading: true, hasPendingPayment: false });
+    jest.spyOn(resource, 'useOrderBill').mockReturnValue({
+      itemHasBill: [],
+    });
+    (useStockItemQuantity as jest.Mock).mockReturnValue({
+      stockItemQuantity: 5,
+      stockItemUuid: 'some-uuid',
+      isLoading: false,
+      error: undefined,
+    });
     render(<TestOrderAction {...testProps} />);
     expect(screen.getByText('Verifying bill status...')).toBeInTheDocument();
   });
 
   test("should display `Unsettled bill for test` when there's a pending payment", () => {
     jest.spyOn(resource, 'useTestOrderBillStatus').mockReturnValueOnce({ isLoading: false, hasPendingPayment: true });
+    jest.spyOn(resource, 'useOrderBill').mockReturnValueOnce({
+      itemHasBill: [],
+    });
+    (useStockItemQuantity as jest.Mock).mockReturnValueOnce({
+      stockItemQuantity: 5,
+      stockItemUuid: 'some-uuid',
+      isLoading: false,
+      error: undefined,
+    });
     render(<TestOrderAction {...testProps} />);
     expect(screen.getByText('Unsettled bill')).toBeInTheDocument();
   });
@@ -89,6 +111,15 @@ describe('TestOrderAction', () => {
   test("should display `Pick Lab Request` when there's no pending payment", async () => {
     const user = userEvent.setup();
     jest.spyOn(resource, 'useTestOrderBillStatus').mockReturnValueOnce({ isLoading: false, hasPendingPayment: false });
+    jest.spyOn(resource, 'useOrderBill').mockReturnValueOnce({
+      itemHasBill: [],
+    });
+    (useStockItemQuantity as jest.Mock).mockReturnValueOnce({
+      stockItemQuantity: 5,
+      stockItemUuid: 'some-uuid',
+      isLoading: false,
+      error: undefined,
+    });
     render(<TestOrderAction {...testProps} />);
     const pickLabRequestMenuItem = screen.getByText('Pick Lab Request');
     await user.click(pickLabRequestMenuItem);
@@ -101,7 +132,16 @@ describe('TestOrderAction', () => {
   });
 
   test('should not render the dispense form if closeable is false', () => {
-    jest.spyOn(resource, 'useTestOrderBillStatus').mockReturnValueOnce({ isLoading: false, hasPendingPayment: false });
+    jest.spyOn(resource, 'useTestOrderBillStatus').mockReturnValue({ isLoading: false, hasPendingPayment: false });
+    jest.spyOn(resource, 'useOrderBill').mockReturnValue({
+      itemHasBill: [],
+    });
+    (useStockItemQuantity as jest.Mock).mockReturnValue({
+      stockItemQuantity: 5,
+      stockItemUuid: 'some-uuid',
+      isLoading: false,
+      error: undefined,
+    });
     render(<TestOrderAction {...testProps} closeable={false} />);
     expect(screen.queryByText('Dispense')).not.toBeInTheDocument();
   });
@@ -109,6 +149,15 @@ describe('TestOrderAction', () => {
   test('should launch the dispense form when dispense order is part of props', async () => {
     const user = userEvent.setup();
     jest.spyOn(resource, 'useTestOrderBillStatus').mockReturnValueOnce({ isLoading: false, hasPendingPayment: false });
+    jest.spyOn(resource, 'useOrderBill').mockReturnValueOnce({
+      itemHasBill: [],
+    });
+    (useStockItemQuantity as jest.Mock).mockReturnValueOnce({
+      stockItemQuantity: 5,
+      stockItemUuid: 'some-uuid',
+      isLoading: false,
+      error: undefined,
+    });
     render(<TestOrderAction {...mockTestProps} />);
     const dispenseButton = screen.getByRole('button', { name: 'Dispense' });
     expect(dispenseButton).toBeInTheDocument();

package/src/billable-services/billiable-item/useBillableItem.tsx

@@ -39,10 +39,25 @@ export const useSockItemInventory = (stockItemId: string) => {
   const { data, error, isLoading } = useSWR<{
     data: { results: Array<{ quantityUoM: string; quantity: number; partyName: string }> };
   }>(url, openmrsFetch);
-
   return {
     stockItem: (data?.data?.results as Array<any>) ?? [],
     isLoading: isLoading,
     error,
   };
 };
+
+export const useStockItemQuantity = (drugUuid: string) => {
+  const url = `/ws/rest/v1/stockmanagement/stockiteminventory?v=default&limit=10&totalCount=true&drugUuid=${drugUuid}`;
+  const { data, error, isLoading } = useSWR<{
+    data: {
+      results: Array<{ quantityUoM: string; quantity: number; partyName: string; stockItemUuid: string }>;
+      total: number;
+    };
+  }>(url, openmrsFetch);
+  return {
+    stockItemQuantity: data?.data?.total ?? 0,
+    stockItemUuid: data?.data?.results[0]?.stockItemUuid ?? '',
+    isLoading: isLoading,
+    error,
+  };
+};

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/billing.resource.ts

@@ -275,6 +275,7 @@ export const billingFormSchema = z.object({
         priceName: z.string().optional().default('Default'),
         priceUuid: z.string().uuid(),
         lineItemOrder: z.number().optional().default(0),
+        order: z.string().optional().default(''),
         paymentStatus: z.enum(['PENDING']),
       }),
     )

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/index.ts

@@ -1,4 +1,4 @@
-import { defineConfigSchema, getSyncLifecycle, registerFeatureFlag } from '@openmrs/esm-framework';
+import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle, registerFeatureFlag } from '@openmrs/esm-framework';
 import { createDashboardGroup, createDashboardLink } from '@openmrs/esm-patient-common-lib';
 import BenefitsPackage from './benefits-package/benefits-package.component';
 import Benefits from './benefits-package/benefits/benefits.component';
@@ -12,6 +12,7 @@ import WaiveBillActionButton from './billable-services/bill-manager/bill-actions
 import { DeleteBillModal } from './billable-services/bill-manager/modals/delete-bill.modal';
 import { RefundBillModal } from './billable-services/bill-manager/modals/refund-bill.modal';
 import { DeleteBillableServiceModal } from './billable-services/bill-manager/modals/serviceItemCard.component';
+import CreateBillItemModal from './billable-services/bill-manager/modals/create-bill-item-modal.component';
 import CancelBillWorkspace from './billable-services/bill-manager/workspaces/cancel-bill/cancel-bill.workspace';
 import { EditBillForm } from './billable-services/bill-manager/workspaces/edit-bill/edit-bill-form.workspace';
 import { WaiveBillForm } from './billable-services/bill-manager/workspaces/waive-bill/waive-bill-form.workspace';
@@ -156,6 +157,7 @@ export const root = getSyncLifecycle(rootComponent, options);
 export const billingPatientSummary = getSyncLifecycle(BillHistory, options);
 export const billingCheckInForm = getSyncLifecycle(BillingCheckInForm, options);
 export const deleteBillableServiceModal = getSyncLifecycle(DeleteBillableServiceModal, options);
+export const createBillItemModal = getSyncLifecycle(CreateBillItemModal, options);
 
 export const billingForm = getSyncLifecycle(BillingForm, options);
 export const requirePaymentModal = getSyncLifecycle(RequirePaymentModal, options);

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/src/routes.json

@@ -302,6 +302,10 @@
     {
       "name": "clock-in-modal",
       "component": "clockIn"
+    },
+    {
+      "name": "create-bill-item-modal",
+      "component": "createBillItemModal"
     }
   ]
 }

package/translations/en.json

@@ -22,6 +22,7 @@
   "attributeRetired": "Attribute retired",
   "attributeRetiredReason": "Attribute retired reason",
   "benefits": "Benefits",
+  "bill": "Bill",
   "billableExemptionAdministration": "Exemption Administration",
   "billableServicesError": "Billable services error",
   "billAmount": "Bill Amount",
@@ -55,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",
@@ -176,6 +178,7 @@
   "noTransactionHistory": "No transaction history",
   "noTransactionHistorySubtitle": "No transaction history loaded for the selected filters",
   "notSearchedState": "Please search for a patient in the input above",
+  "outOfStock": "Out of Stock",
   "overflowMenu": "Overflow menu",
   "overPayment": "Over payment",
   "overPaymentSubtitle": "Amount paid {{totalAmountTendered}} should not be greater than amount due {{selectedLineItemsAmountDue}} for selected line items",