From bd1e5b44047192c1a669cd543ebd002046c1e0fe Mon Sep 17 00:00:00 2001
From: ELVIS-KATO <katoelvis23@gmail.com>
Date: Tue, 11 Nov 2025 06:50:48 +0300
Subject: [PATCH 1/3] Added a validation of active visit before billing

---
 .../billing-checkin-form.component.tsx        | 13 ++++++-
 src/billing-form/billing-form.component.tsx   | 39 ++++++++++++++++---
 translations/en.json                          |  3 +-
 3 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/src/billing-form/billing-checkin-form.component.tsx b/src/billing-form/billing-checkin-form.component.tsx
index 3f797515..4abfadc2 100644
--- a/src/billing-form/billing-checkin-form.component.tsx
+++ b/src/billing-form/billing-checkin-form.component.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useState } from 'react';
 import { Dropdown, InlineLoading, InlineNotification } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
-import { showSnackbar, getCoreTranslation } from '@openmrs/esm-framework';
+import { showSnackbar, getCoreTranslation, useVisit } from '@openmrs/esm-framework';
 import { useCashPoint, useBillableItems, createPatientBill } from './billing-form.resource';
 import VisitAttributesForm from './visit-attributes/visit-attributes-form.component';
 import styles from './billing-checkin-form.scss';
@@ -19,10 +19,19 @@ const BillingCheckInForm: React.FC<BillingCheckInFormProps> = ({ patientUuid, se
   const { lineItems, isLoading: isLoadingLineItems, error: lineError } = useBillableItems();
   const [attributes, setAttributes] = useState([]);
   const [paymentMethod, setPaymentMethod] = useState<any>();
+  const { currentVisit } = useVisit(patientUuid);
   let lineList = [];
 
   const handleCreateExtraVisitInfo = useCallback(
     async (createBillPayload) => {
+      if (!currentVisit) {
+        showSnackbar({
+          title: t('validationError', 'Validation error'),
+          subtitle: t('activeVisitRequired', 'Patient must have an active visit before creating a bill'),
+          kind: 'error',
+        });
+        return;
+      }
       try {
         await createPatientBill(createBillPayload);
         showSnackbar({
@@ -38,7 +47,7 @@ const BillingCheckInForm: React.FC<BillingCheckInFormProps> = ({ patientUuid, se
         });
       }
     },
-    [t],
+    [t, currentVisit],
   );
 
   const handleBillingService = ({ selectedItem }) => {
diff --git a/src/billing-form/billing-form.component.tsx b/src/billing-form/billing-form.component.tsx
index f812c412..72f9ca6a 100644
--- a/src/billing-form/billing-form.component.tsx
+++ b/src/billing-form/billing-form.component.tsx
@@ -11,7 +11,14 @@ import {
   InlineNotification,
   NumberInput,
 } from '@carbon/react';
-import { useConfig, useLayoutType, showSnackbar, getCoreTranslation, TrashCanIcon } from '@openmrs/esm-framework';
+import {
+  useConfig,
+  useLayoutType,
+  showSnackbar,
+  getCoreTranslation,
+  TrashCanIcon,
+  useVisit,
+} from '@openmrs/esm-framework';
 import { processBillItems, useBillableServices } from '../billing.resource';
 import { calculateTotalAmount, convertToCurrency } from '../helpers/functions';
 import type { BillingConfig } from '../config-schema';
@@ -37,6 +44,7 @@ const BillingForm: React.FC<BillingFormProps> = ({ patientUuid, closeWorkspace }
   const [isSubmitting, setIsSubmitting] = useState(false);
   const [selectedItems, setSelectedItems] = useState<ExtendedLineItem[]>([]);
   const { data, error, isLoading } = useBillableServices();
+  const { currentVisit } = useVisit(patientUuid);
 
   const selectBillableItem = (item: BillableItem) => {
     if (!item) {
@@ -116,7 +124,19 @@ const BillingForm: React.FC<BillingFormProps> = ({ patientUuid, closeWorkspace }
     return true;
   };
 
-  const postBillItems = async () => {
+  const postBillItems = async (event?: React.FormEvent<HTMLFormElement>) => {
+    if (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    }
+    if (!currentVisit) {
+      showSnackbar({
+        title: t('validationError', 'Validation error'),
+        subtitle: t('activeVisitRequired', 'Patient must have an active visit before creating a bill'),
+        kind: 'error',
+      });
+      return;
+    }
     if (!validateSelectedItems()) {
       return;
     }
@@ -167,7 +187,12 @@ const BillingForm: React.FC<BillingFormProps> = ({ patientUuid, closeWorkspace }
   };
 
   return (
-    <Form className={styles.form}>
+    <Form
+      className={styles.form}
+      onSubmit={(e) => {
+        e.preventDefault();
+        e.stopPropagation();
+      }}>
       <div className={styles.grid}>
         {isLoading ? (
           <InlineLoading description={getCoreTranslation('loading') + '...'} />
@@ -278,9 +303,13 @@ const BillingForm: React.FC<BillingFormProps> = ({ patientUuid, closeWorkspace }
         <Button
           className={styles.button}
           kind="primary"
-          onClick={postBillItems}
+          onClick={(e) => {
+            e.preventDefault();
+            e.stopPropagation(e);
+            postBillItems(e);
+          }}
           disabled={isSubmitting || selectedItems.length === 0}
-          type="submit">
+          type="button">
           {isSubmitting ? (
             <InlineLoading description={t('saving', 'Saving') + '...'} />
           ) : (
diff --git a/translations/en.json b/translations/en.json
index 7d7d81e1..a1e70b80 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -226,5 +226,6 @@
   "uuidRequired": "UUID is required",
   "validationError": "Validation error",
   "visitTime": "Visit time",
-  "waiverForm": "Waiver form"
+  "waiverForm": "Waiver form",
+  "activeVisitRequired": "Patient must have an active visit before creating a bill"
 }

From b99f72b6e7da6bb71e7884ceb3f560fe60566d53 Mon Sep 17 00:00:00 2001
From: ELVIS-KATO <katoelvis23@gmail.com>
Date: Tue, 11 Nov 2025 08:03:28 +0300
Subject: [PATCH 2/3] Solved the validation issue to only validate billing form

---
 src/billing-form/billing-form.component.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/billing-form/billing-form.component.tsx b/src/billing-form/billing-form.component.tsx
index 72f9ca6a..a5a2b1a5 100644
--- a/src/billing-form/billing-form.component.tsx
+++ b/src/billing-form/billing-form.component.tsx
@@ -124,11 +124,14 @@ const BillingForm: React.FC<BillingFormProps> = ({ patientUuid, closeWorkspace }
     return true;
   };
 
-  const postBillItems = async (event?: React.FormEvent<HTMLFormElement>) => {
+  const postBillItems = async (event?: React.MouseEvent<HTMLButtonElement>) => {
     if (event) {
       event.preventDefault();
       event.stopPropagation();
     }
+    if (selectedItems.length === 0) {
+      return;
+    }
     if (!currentVisit) {
       showSnackbar({
         title: t('validationError', 'Validation error'),
@@ -305,7 +308,7 @@ const BillingForm: React.FC<BillingFormProps> = ({ patientUuid, closeWorkspace }
           kind="primary"
           onClick={(e) => {
             e.preventDefault();
-            e.stopPropagation(e);
+            e.stopPropagation();
             postBillItems(e);
           }}
           disabled={isSubmitting || selectedItems.length === 0}

From 2599bd8e45934a3cd9d684e3eb401444d4a6c872 Mon Sep 17 00:00:00 2001
From: ELVIS-KATO <katoelvis23@gmail.com>
Date: Thu, 20 Nov 2025 17:02:35 +0300
Subject: [PATCH 3/3] Only pending bills to be edited

---
 .../edit-bill-item.modal.tsx                  |  8 +++++
 src/billing.resource.ts                       |  6 ++--
 src/invoice/invoice-table.component.tsx       | 33 +++++++++++++------
 translations/en.json                          |  4 ++-
 4 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/src/bill-item-actions/edit-bill-item.modal.tsx b/src/bill-item-actions/edit-bill-item.modal.tsx
index 88580914..8862f85b 100644
--- a/src/bill-item-actions/edit-bill-item.modal.tsx
+++ b/src/bill-item-actions/edit-bill-item.modal.tsx
@@ -89,6 +89,14 @@ const EditBillLineItemModal: React.FC<EditBillLineItemModalProps> = ({ bill, clo
 
   const onSubmit = async (data: BillLineItemForm) => {
     const url = `${apiBasePath}bill`;
+    if (bill?.status === 'PENDING') {
+      showSnackbar({
+        title: t('cannotEditBill', 'This bill can not be edited'),
+        subtitle: t('onlyPendingBillsCanBeEdited', 'Only pending bills can be editted'),
+        kind: 'error',
+      });
+    }
+    return;
 
     const newItem = {
       ...item,
diff --git a/src/billing.resource.ts b/src/billing.resource.ts
index 41cd80af..d002685d 100644
--- a/src/billing.resource.ts
+++ b/src/billing.resource.ts
@@ -21,9 +21,11 @@ import type {
 
 export const mapBillProperties = (bill: PatientInvoice): MappedBill => {
   const activeLineItems = bill?.lineItems?.filter((item) => !item.voided) || [];
+  const isSpecialStatus = bill.status === ' PAID' || bill.status === 'POSTED';
 
-  const status =
-    activeLineItems.length > 0
+  const status = isSpecialStatus
+    ? bill.status
+    : activeLineItems.length > 0
       ? activeLineItems.some((item) => item.paymentStatus === 'PENDING')
         ? 'PENDING'
         : 'PAID'
diff --git a/src/invoice/invoice-table.component.tsx b/src/invoice/invoice-table.component.tsx
index f0c32556..ec75c73c 100644
--- a/src/invoice/invoice-table.component.tsx
+++ b/src/invoice/invoice-table.component.tsx
@@ -85,6 +85,7 @@ const InvoiceTable: React.FC<InvoiceTableProps> = ({ bill, isLoadingBill }) => {
   const tableRows: Array<typeof DataTableRow> = useMemo(
     () =>
       filteredLineItems?.map((item, index) => {
+        const canEditBill = bill?.status === 'PENDING';
         return {
           no: `${index + 1}`,
           id: `${item.uuid}`,
@@ -96,20 +97,32 @@ const InvoiceTable: React.FC<InvoiceTableProps> = ({ bill, isLoadingBill }) => {
           total: convertToCurrency(item.price * item.quantity, defaultCurrency),
           actionButton: (
             <span>
-              <Button
-                data-testid={`edit-button-${item.uuid}`}
-                renderIcon={Edit}
-                hasIconOnly
-                kind="ghost"
-                iconDescription={t('editThisBillItem', 'Edit this bill item')}
-                tooltipPosition="left"
-                onClick={() => handleSelectBillItem(item)}
-              />
+              {canEditBill ? (
+                <Button
+                  data-testid={`edit-button-${item.uuid}`}
+                  renderIcon={Edit}
+                  hasIconOnly
+                  kind="ghost"
+                  iconDescription={t('editThisBillItem', 'Edit this bill item')}
+                  tooltipPosition="left"
+                  onClick={() => handleSelectBillItem(item)}
+                />
+              ) : (
+                <Button
+                  data-testid={`edit-button-${item.uuid}`}
+                  renderIcon={Edit}
+                  hasIconOnly
+                  kind="ghost"
+                  iconDescription={t('cannotEditPendingItem', 'Only pending bill items can be edited')}
+                  disabled
+                  tooltipPosition="left"
+                />
+              )}
             </span>
           ),
         };
       }) ?? [],
-    [filteredLineItems, bill?.receiptNumber, defaultCurrency, t, handleSelectBillItem],
+    [filteredLineItems, bill?.receiptNumber, bill?.status, defaultCurrency, t, handleSelectBillItem],
   );
 
   if (isLoadingBill) {
diff --git a/translations/en.json b/translations/en.json
index a1e70b80..91dbc052 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -227,5 +227,7 @@
   "validationError": "Validation error",
   "visitTime": "Visit time",
   "waiverForm": "Waiver form",
-  "activeVisitRequired": "Patient must have an active visit before creating a bill"
+  "activeVisitRequired": "Patient must have an active visit before creating a bill",
+  "cannotEditBill": "cannot edit this bill",
+  "onlyPendingBillsCanBeEdited" : "Only pending bills can be edited"
 }