From 466c1d628a38e5682dd8bd2eb931c3c6d22dff17 Mon Sep 17 00:00:00 2001
From: abertnamanya <abertnamanya@gmail.com>
Date: Thu, 16 Oct 2025 09:08:53 +0300
Subject: [PATCH 01/10] O3-5121:Edit/Update Cashpoint

---
 .../billable-service.resource.ts              | 22 +++++++++++
 .../cash-point/add-cash-point.modal.tsx       | 39 +++++++++++--------
 .../cash-point-configuration.component.tsx    | 36 +++++++++++++++--
 src/types/index.ts                            |  2 +-
 translations/en.json                          |  1 +
 5 files changed, 79 insertions(+), 21 deletions(-)

diff --git a/src/billable-services/billable-service.resource.ts b/src/billable-services/billable-service.resource.ts
index 5075ec18..723184e0 100644
--- a/src/billable-services/billable-service.resource.ts
+++ b/src/billable-services/billable-service.resource.ts
@@ -91,3 +91,25 @@ export const updateBillableService = (uuid: string, payload: any) => {
     },
   });
 };
+
+export const createCashPoint = (payload: any) => {
+  const url = `${apiBasePath}cashPoint`;
+  return openmrsFetch(url, {
+    method: 'POST',
+    body: payload,
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  });
+};
+
+export const updateCashPoint = (uuid: string, payload: any) => {
+  const url = `${apiBasePath}/cashPoint/${uuid}`;
+  return openmrsFetch(url, {
+    method: 'POST',
+    body: JSON.stringify(payload),
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  });
+};
diff --git a/src/billable-services/cash-point/add-cash-point.modal.tsx b/src/billable-services/cash-point/add-cash-point.modal.tsx
index 0becde29..410c8437 100644
--- a/src/billable-services/cash-point/add-cash-point.modal.tsx
+++ b/src/billable-services/cash-point/add-cash-point.modal.tsx
@@ -5,6 +5,8 @@ import { z } from 'zod';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { Button, Dropdown, Form, ModalBody, ModalFooter, ModalHeader, TextInput } from '@carbon/react';
 import { showSnackbar, openmrsFetch, restBaseUrl, getCoreTranslation } from '@openmrs/esm-framework';
+import { type CashPoint } from '../../types';
+import { createCashPoint, updateCashPoint } from '../billable-service.resource';
 
 type CashPointFormValues = {
   name: string;
@@ -13,11 +15,12 @@ type CashPointFormValues = {
 };
 
 interface AddCashPointModalProps {
+  cashPointToEdit?: CashPoint;
   closeModal: () => void;
   onCashPointAdded: () => void;
 }
 
-const AddCashPointModal: React.FC<AddCashPointModalProps> = ({ closeModal, onCashPointAdded }) => {
+const AddCashPointModal: React.FC<AddCashPointModalProps> = ({ cashPointToEdit, closeModal, onCashPointAdded }) => {
   const { t } = useTranslation();
   const [locations, setLocations] = useState([]);
 
@@ -41,9 +44,9 @@ const AddCashPointModal: React.FC<AddCashPointModalProps> = ({ closeModal, onCas
   } = useForm<CashPointFormValues>({
     resolver: zodResolver(cashPointSchema),
     defaultValues: {
-      name: '',
-      uuid: '',
-      location: '',
+      name: cashPointToEdit?.name || '',
+      uuid: cashPointToEdit?.uuid || '',
+      location: cashPointToEdit?.location?.uuid || '',
     },
   });
 
@@ -70,19 +73,12 @@ const AddCashPointModal: React.FC<AddCashPointModalProps> = ({ closeModal, onCas
   }, [fetchLocations]);
 
   const onSubmit = async (data: CashPointFormValues) => {
+    const payload = {
+      name: data.name,
+      uuid: data.uuid,
+      location: { uuid: data.location },
+    };
     try {
-      await openmrsFetch(`${restBaseUrl}/billing/cashPoint`, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: {
-          name: data.name,
-          uuid: data.uuid,
-          location: { uuid: data.location },
-        },
-      });
-
       showSnackbar({
         title: t('success', 'Success'),
         subtitle: t('cashPointSaved', 'Cash point was successfully saved.'),
@@ -90,7 +86,16 @@ const AddCashPointModal: React.FC<AddCashPointModalProps> = ({ closeModal, onCas
       });
 
       closeModal();
-      reset({ name: '', uuid: '', location: '' });
+      reset({
+        name: cashPointToEdit?.name || '',
+        uuid: cashPointToEdit?.uuid || '',
+        location: cashPointToEdit?.location.uuid || '',
+      });
+      if (cashPointToEdit) {
+        await updateCashPoint(cashPointToEdit.uuid, payload);
+      } else {
+        await createCashPoint(payload);
+      }
       onCashPointAdded();
     } catch (err) {
       showSnackbar({
diff --git a/src/billable-services/cash-point/cash-point-configuration.component.tsx b/src/billable-services/cash-point/cash-point-configuration.component.tsx
index c038edee..4c5f5a90 100644
--- a/src/billable-services/cash-point/cash-point-configuration.component.tsx
+++ b/src/billable-services/cash-point/cash-point-configuration.component.tsx
@@ -2,6 +2,8 @@ import React, { useState, useEffect, useCallback } from 'react';
 import {
   Button,
   DataTable,
+  OverflowMenu,
+  OverflowMenuItem,
   Table,
   TableBody,
   TableCell,
@@ -12,13 +14,23 @@ import {
 } from '@carbon/react';
 import { Add } from '@carbon/react/icons';
 import { useTranslation } from 'react-i18next';
-import { showSnackbar, openmrsFetch, restBaseUrl, showModal, getCoreTranslation } from '@openmrs/esm-framework';
+import {
+  showSnackbar,
+  openmrsFetch,
+  restBaseUrl,
+  showModal,
+  getCoreTranslation,
+  isDesktop,
+  useLayoutType,
+} from '@openmrs/esm-framework';
 import { CardHeader } from '@openmrs/esm-patient-common-lib';
 import styles from './cash-point-configuration.scss';
+import { type CashPoint } from '../../types/index';
 
 const CashPointConfiguration: React.FC = () => {
   const { t } = useTranslation();
   const [cashPoints, setCashPoints] = useState([]);
+  const layout = useLayoutType();
 
   const fetchCashPoints = useCallback(async () => {
     try {
@@ -45,7 +57,15 @@ const CashPointConfiguration: React.FC = () => {
     });
   };
 
-  const rowData = cashPoints.map((point) => ({
+  const handleEditCashPoint = (point: CashPoint) => {
+    const dispose = showModal('add-cash-point-modal', {
+      cashPointToEdit: point,
+      onCashPointAdded: fetchCashPoints,
+      closeModal: () => dispose(),
+    });
+  };
+
+  const rowData = cashPoints.map((point: CashPoint) => ({
     id: point.uuid,
     name: point.name,
     uuid: point.uuid,
@@ -67,7 +87,7 @@ const CashPointConfiguration: React.FC = () => {
           </Button>
         </CardHeader>
         <div>
-          <DataTable rows={rowData} headers={headerData} isSortable size="lg">
+          <DataTable rows={rowData} headers={headerData} isSortable size="lg" overflowMenuOnHover={isDesktop(layout)}>
             {({ rows, headers, getTableProps, getHeaderProps, getRowProps }) => (
               <TableContainer>
                 <Table className={styles.table} {...getTableProps()}>
@@ -78,6 +98,7 @@ const CashPointConfiguration: React.FC = () => {
                           {header.header}
                         </TableHeader>
                       ))}
+                      <TableHeader aria-label={getCoreTranslation('actions')} />
                     </TableRow>
                   </TableHead>
                   <TableBody>
@@ -86,6 +107,15 @@ const CashPointConfiguration: React.FC = () => {
                         {row.cells.map((cell) => (
                           <TableCell key={cell.id}>{cell.value}</TableCell>
                         ))}
+                        <TableCell className="cds--table-column-menu">
+                          <OverflowMenu size="lg" flipped>
+                            <OverflowMenuItem
+                              className={styles.menuItem}
+                              itemText={t('editCashPoint', 'Edit cash point')}
+                              onClick={() => handleEditCashPoint(cashPoints.find((point) => point.uuid === row.id))}
+                            />
+                          </OverflowMenu>
+                        </TableCell>
                       </TableRow>
                     ))}
                   </TableBody>
diff --git a/src/types/index.ts b/src/types/index.ts
index 34ef0b95..69f966bb 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -31,7 +31,7 @@ interface Location {
   links: LocationLink[];
 }
 
-interface CashPoint {
+export interface CashPoint {
   uuid: string;
   name: string;
   description: string;
diff --git a/translations/en.json b/translations/en.json
index ec3af7c6..966cf562 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -74,6 +74,7 @@
   "editBillableService": "Edit billable service",
   "editBillableServices": "Edit Billable Services",
   "editBillLineItem": "Edit bill line item",
+  "editCashPoint": "Edit cash point",
   "editThisBillItem": "Edit this bill item",
   "enterAmount": "Enter amount",
   "enterConcept": "Associated concept",

From 16aef2f29215338923147bc09d386533934cf12a Mon Sep 17 00:00:00 2001
From: abertnamanya <abertnamanya@gmail.com>
Date: Thu, 16 Oct 2025 13:00:04 +0300
Subject: [PATCH 02/10] Update
 src/billable-services/billable-service.resource.ts

Co-authored-by: Nethmi Rodrigo <nethmi@openmrs.org>
---
 .../billable-service.resource.ts              | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/billable-services/billable-service.resource.ts b/src/billable-services/billable-service.resource.ts
index 55497143..ee5264b8 100644
--- a/src/billable-services/billable-service.resource.ts
+++ b/src/billable-services/billable-service.resource.ts
@@ -100,24 +100,16 @@ export const updateBillableService = (uuid: string, payload: UpdateBillableServi
   });
 };
 
-export const createCashPoint = (payload: any) => {
-  const url = `${apiBasePath}cashPoint`;
+export const updateCashPoint = (uuid: string | null, payload: CashPointPayload) => {
+  let url = `${apiBasePath}/cashPoint`;
+  if (uuid) {
+    url = `${apiBasePath}/cashPoint/${uuid}`;
+  }
   return openmrsFetch(url, {
-    method: 'POST',
+    method: uuid ? 'POST' : 'PUT',
     body: payload,
     headers: {
       'Content-Type': 'application/json',
     },
   });
 };
-
-export const updateCashPoint = (uuid: string, payload: any) => {
-  const url = `${apiBasePath}/cashPoint/${uuid}`;
-  return openmrsFetch(url, {
-    method: 'POST',
-    body: JSON.stringify(payload),
-    headers: {
-      'Content-Type': 'application/json',
-    },
-  });
-};

From 9dfb19bf624bb1d959a52233e5c07bd02b92a667 Mon Sep 17 00:00:00 2001
From: abertnamanya <abertnamanya@gmail.com>
Date: Thu, 16 Oct 2025 13:00:32 +0300
Subject: [PATCH 03/10] Update
 src/billable-services/cash-point/add-cash-point.modal.tsx

Co-authored-by: Nethmi Rodrigo <nethmi@openmrs.org>
---
 src/billable-services/cash-point/add-cash-point.modal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/billable-services/cash-point/add-cash-point.modal.tsx b/src/billable-services/cash-point/add-cash-point.modal.tsx
index 410c8437..25ff8630 100644
--- a/src/billable-services/cash-point/add-cash-point.modal.tsx
+++ b/src/billable-services/cash-point/add-cash-point.modal.tsx
@@ -73,7 +73,7 @@ const AddCashPointModal: React.FC<AddCashPointModalProps> = ({ cashPointToEdit,
   }, [fetchLocations]);
 
   const onSubmit = async (data: CashPointFormValues) => {
-    const payload = {
+    const payload: CashPointPayload = {
       name: data.name,
       uuid: data.uuid,
       location: { uuid: data.location },

From 360c4cfe9fa1503ced3f020613235a25e8252fee Mon Sep 17 00:00:00 2001
From: abertnamanya <abertnamanya@gmail.com>
Date: Thu, 16 Oct 2025 13:00:51 +0300
Subject: [PATCH 04/10] Update
 src/billable-services/cash-point/add-cash-point.modal.tsx

Co-authored-by: Nethmi Rodrigo <nethmi@openmrs.org>
---
 src/billable-services/cash-point/add-cash-point.modal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/billable-services/cash-point/add-cash-point.modal.tsx b/src/billable-services/cash-point/add-cash-point.modal.tsx
index 25ff8630..86fb2895 100644
--- a/src/billable-services/cash-point/add-cash-point.modal.tsx
+++ b/src/billable-services/cash-point/add-cash-point.modal.tsx
@@ -5,8 +5,8 @@ import { z } from 'zod';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { Button, Dropdown, Form, ModalBody, ModalFooter, ModalHeader, TextInput } from '@carbon/react';
 import { showSnackbar, openmrsFetch, restBaseUrl, getCoreTranslation } from '@openmrs/esm-framework';
-import { type CashPoint } from '../../types';
 import { createCashPoint, updateCashPoint } from '../billable-service.resource';
+import type { CashPoint, CashPointPayload } from '../../types';
 
 type CashPointFormValues = {
   name: string;

From 2113069bfad7cb7b0caa6e871fa02169e3ad6cd6 Mon Sep 17 00:00:00 2001
From: abertnamanya <abertnamanya@gmail.com>
Date: Thu, 16 Oct 2025 13:31:41 +0300
Subject: [PATCH 05/10] O3-5121:Edit/Update Cashpoint fixes

---
 src/billable-services/billable-service.resource.ts   |  9 +++++----
 .../cash-point/add-cash-point.modal.tsx              | 12 ++++++------
 src/types/index.ts                                   |  8 ++++++++
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/billable-services/billable-service.resource.ts b/src/billable-services/billable-service.resource.ts
index ee5264b8..041d9255 100644
--- a/src/billable-services/billable-service.resource.ts
+++ b/src/billable-services/billable-service.resource.ts
@@ -6,6 +6,7 @@ import {
   type ServiceConcept,
   type CreateBillableServicePayload,
   type UpdateBillableServicePayload,
+  type CashPointPayload,
 } from '../types';
 import type { BillingConfig } from '../config-schema';
 
@@ -100,13 +101,13 @@ export const updateBillableService = (uuid: string, payload: UpdateBillableServi
   });
 };
 
-export const updateCashPoint = (uuid: string | null, payload: CashPointPayload) => {
-  let url = `${apiBasePath}/cashPoint`;
+export const updateOrCreateCashPoint = (uuid: string | null, payload: CashPointPayload) => {
+  let url = `${apiBasePath}cashPoint`;
   if (uuid) {
-    url = `${apiBasePath}/cashPoint/${uuid}`;
+    url = `${apiBasePath}cashPoint/${uuid}`;
   }
   return openmrsFetch(url, {
-    method: uuid ? 'POST' : 'PUT',
+    method: 'POST',
     body: payload,
     headers: {
       'Content-Type': 'application/json',
diff --git a/src/billable-services/cash-point/add-cash-point.modal.tsx b/src/billable-services/cash-point/add-cash-point.modal.tsx
index 86fb2895..669d2424 100644
--- a/src/billable-services/cash-point/add-cash-point.modal.tsx
+++ b/src/billable-services/cash-point/add-cash-point.modal.tsx
@@ -5,7 +5,7 @@ import { z } from 'zod';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { Button, Dropdown, Form, ModalBody, ModalFooter, ModalHeader, TextInput } from '@carbon/react';
 import { showSnackbar, openmrsFetch, restBaseUrl, getCoreTranslation } from '@openmrs/esm-framework';
-import { createCashPoint, updateCashPoint } from '../billable-service.resource';
+import { updateOrCreateCashPoint } from '../billable-service.resource';
 import type { CashPoint, CashPointPayload } from '../../types';
 
 type CashPointFormValues = {
@@ -85,17 +85,17 @@ const AddCashPointModal: React.FC<AddCashPointModalProps> = ({ cashPointToEdit,
         kind: 'success',
       });
 
+      if (cashPointToEdit) {
+        await updateOrCreateCashPoint(cashPointToEdit.uuid, payload);
+      } else {
+        await updateOrCreateCashPoint(null, payload);
+      }
       closeModal();
       reset({
         name: cashPointToEdit?.name || '',
         uuid: cashPointToEdit?.uuid || '',
         location: cashPointToEdit?.location.uuid || '',
       });
-      if (cashPointToEdit) {
-        await updateCashPoint(cashPointToEdit.uuid, payload);
-      } else {
-        await createCashPoint(payload);
-      }
       onCashPointAdded();
     } catch (err) {
       showSnackbar({
diff --git a/src/types/index.ts b/src/types/index.ts
index 414b2106..e438bbec 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -41,6 +41,14 @@ export interface CashPoint {
   location: Location;
 }
 
+export interface CashPointPayload {
+  uuid: string;
+  name: string;
+  location: {
+    uuid: string;
+  };
+}
+
 interface ProviderLink {
   rel: string;
   uri: string;

From 298cd00dba6e9b1478afbd79ba9364ac176af781 Mon Sep 17 00:00:00 2001
From: abertnamanya <abertnamanya@gmail.com>
Date: Mon, 20 Oct 2025 10:28:42 +0300
Subject: [PATCH 06/10] O3-5121:Edit/Update Cashpoint fixes

---
 .../cash-point/add-cash-point.modal.tsx       | 21 +++++++++----------
 .../cash-point-configuration.component.tsx    |  7 ++++++-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/billable-services/cash-point/add-cash-point.modal.tsx b/src/billable-services/cash-point/add-cash-point.modal.tsx
index 1a90161f..c745fc9a 100644
--- a/src/billable-services/cash-point/add-cash-point.modal.tsx
+++ b/src/billable-services/cash-point/add-cash-point.modal.tsx
@@ -79,23 +79,18 @@ const AddCashPointModal: React.FC<AddCashPointModalProps> = ({ cashPointToEdit,
       location: { uuid: data.location },
     };
     try {
+      if (cashPointToEdit) {
+        await updateOrCreateCashPoint(cashPointToEdit.uuid, payload);
+      } else {
+        await updateOrCreateCashPoint(null, payload);
+      }
       showSnackbar({
         title: t('success', 'Success'),
         subtitle: t('cashPointSaved', 'Cash point was successfully saved.'),
         kind: 'success',
       });
 
-      if (cashPointToEdit) {
-        await updateOrCreateCashPoint(cashPointToEdit.uuid, payload);
-      } else {
-        await updateOrCreateCashPoint(null, payload);
-      }
       closeModal();
-      reset({
-        name: cashPointToEdit?.name || '',
-        uuid: cashPointToEdit?.uuid || '',
-        location: cashPointToEdit?.location.uuid || '',
-      });
       onCashPointAdded();
     } catch (err) {
       showSnackbar({
@@ -109,7 +104,10 @@ const AddCashPointModal: React.FC<AddCashPointModalProps> = ({ cashPointToEdit,
 
   return (
     <>
-      <ModalHeader closeModal={closeModal} title={t('addCashPoint', 'Add Cash Point')} />
+      <ModalHeader
+        closeModal={closeModal}
+        title={cashPointToEdit ? t('editCashPoint', 'Edit Cash Point') : t('addCashPoint', 'Add Cash Point')}
+      />
       <Form onSubmit={handleSubmit(onSubmit)}>
         <ModalBody>
           <Controller
@@ -136,6 +134,7 @@ const AddCashPointModal: React.FC<AddCashPointModalProps> = ({ cashPointToEdit,
                 placeholder={t('cashPointUuidPlaceholder', 'Enter UUID')}
                 invalid={!!errors.uuid}
                 invalidText={errors.uuid?.message}
+                disabled={!!cashPointToEdit}
                 {...field}
               />
             )}
diff --git a/src/billable-services/cash-point/cash-point-configuration.component.tsx b/src/billable-services/cash-point/cash-point-configuration.component.tsx
index 2821e57a..91e433bc 100644
--- a/src/billable-services/cash-point/cash-point-configuration.component.tsx
+++ b/src/billable-services/cash-point/cash-point-configuration.component.tsx
@@ -112,7 +112,12 @@ const CashPointConfiguration: React.FC = () => {
                             <OverflowMenuItem
                               className={styles.menuItem}
                               itemText={t('editCashPoint', 'Edit cash point')}
-                              onClick={() => handleEditCashPoint(cashPoints.find((point) => point.uuid === row.id))}
+                              onClick={() => {
+                                const cashPoint = cashPoints.find((point) => point.uuid === row.id);
+                                if (cashPoint) {
+                                  handleEditCashPoint(cashPoint);
+                                }
+                              }}
                             />
                           </OverflowMenu>
                         </TableCell>

From ff89adfd70e4746a148a65e8db39aa7d4e7eadf0 Mon Sep 17 00:00:00 2001
From: abertnamanya <abertnamanya@gmail.com>
Date: Tue, 21 Oct 2025 11:58:28 +0300
Subject: [PATCH 07/10] conflict Merge fix

---
 src/billable-services/cash-point/add-cash-point.modal.tsx | 5 ++---
 translations/en.json                                      | 2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/billable-services/cash-point/add-cash-point.modal.tsx b/src/billable-services/cash-point/add-cash-point.modal.tsx
index b7940ea0..8e432251 100644
--- a/src/billable-services/cash-point/add-cash-point.modal.tsx
+++ b/src/billable-services/cash-point/add-cash-point.modal.tsx
@@ -134,8 +134,8 @@ const AddCashPointModal: React.FC<AddCashPointModalProps> = ({ cashPointToEdit,
                   labelText={t('cashPointUuid', 'Cash Point UUID')}
                   placeholder={t('cashPointUuidPlaceholder', 'Enter UUID')}
                   invalid={!!errors.uuid}
-                  invalidText={errors.uuid?.message
-                  disabled={!!cashPointToEdit}             
+                  invalidText={errors.uuid?.message}
+                  disabled={!!cashPointToEdit}
                   {...field}
                 />
               )}
@@ -157,7 +157,6 @@ const AddCashPointModal: React.FC<AddCashPointModalProps> = ({ cashPointToEdit,
               )}
             />
           </Stack>
-                
         </ModalBody>
         <ModalFooter>
           <Button kind="secondary" onClick={closeModal}>
diff --git a/translations/en.json b/translations/en.json
index ab65756c..641fc1b7 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -66,7 +66,6 @@
   "cashPointUuidPlaceholder": "Enter UUID",
   "checkFilters": "Check the filters above",
   "confirmDeleteMessage": "Are you sure you want to delete this payment mode? Proceed cautiously.",
-  "createdSuccessfully": "Billable service created successfully",
   "cumulativeBills": "Cumulative bills",
   "currentPrice": "Current price",
   "date": "Date",
@@ -219,7 +218,6 @@
   "totalTendered": "Total tendered",
   "unitPrice": "Unit price",
   "unitPriceHelperText": "This is the unit price for this item",
-  "updatedSuccessfully": "Billable service updated successfully",
   "uuid": "UUID",
   "uuidRequired": "UUID is required",
   "validationError": "Validation error",

From e7acf064881f488f50b6db2436b816d3a3c87ee6 Mon Sep 17 00:00:00 2001
From: abertnamanya <abertnamanya@gmail.com>
Date: Tue, 21 Oct 2025 19:17:29 +0300
Subject: [PATCH 08/10] minor fixes

---
 src/billable-services/cash-point/add-cash-point.modal.tsx      | 3 ++-
 .../cash-point/cash-point-configuration.component.tsx          | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/billable-services/cash-point/add-cash-point.modal.tsx b/src/billable-services/cash-point/add-cash-point.modal.tsx
index 8e432251..6f787814 100644
--- a/src/billable-services/cash-point/add-cash-point.modal.tsx
+++ b/src/billable-services/cash-point/add-cash-point.modal.tsx
@@ -91,6 +91,7 @@ const AddCashPointModal: React.FC<AddCashPointModalProps> = ({ cashPointToEdit,
       });
 
       closeModal();
+      reset({ name: '', uuid: '', location: '' });
       onCashPointAdded();
     } catch (err) {
       showSnackbar({
@@ -106,7 +107,7 @@ const AddCashPointModal: React.FC<AddCashPointModalProps> = ({ cashPointToEdit,
     <>
       <ModalHeader
         closeModal={closeModal}
-        title={cashPointToEdit ? t('editCashPoint', 'Edit Cash Point') : t('addCashPoint', 'Add Cash Point')}
+        title={cashPointToEdit ? t('editCashPoint', 'Edit cash point') : t('addCashPoint', 'Add cash point')}
       />
       <Form onSubmit={handleSubmit(onSubmit)}>
         <ModalBody>
diff --git a/src/billable-services/cash-point/cash-point-configuration.component.tsx b/src/billable-services/cash-point/cash-point-configuration.component.tsx
index 91e433bc..1daa7d76 100644
--- a/src/billable-services/cash-point/cash-point-configuration.component.tsx
+++ b/src/billable-services/cash-point/cash-point-configuration.component.tsx
@@ -24,8 +24,8 @@ import {
   useLayoutType,
 } from '@openmrs/esm-framework';
 import { CardHeader } from '@openmrs/esm-patient-common-lib';
-import styles from './cash-point-configuration.scss';
 import { type CashPoint } from '../../types/index';
+import styles from './cash-point-configuration.scss';
 
 const CashPointConfiguration: React.FC = () => {
   const { t } = useTranslation();

From a08ef64fca9fbecfc26ee8f07fc08c5537d38d5e Mon Sep 17 00:00:00 2001
From: abertnamanya <abertnamanya@gmail.com>
Date: Wed, 22 Oct 2025 13:37:31 +0300
Subject: [PATCH 09/10] Allow cash point create and update with two different
 functions

---
 .../billable-service.resource.ts               | 18 ++++++++++++------
 .../cash-point/add-cash-point.modal.tsx        | 12 ++++++------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/billable-services/billable-service.resource.ts b/src/billable-services/billable-service.resource.ts
index 760bf4ba..c12dbe48 100644
--- a/src/billable-services/billable-service.resource.ts
+++ b/src/billable-services/billable-service.resource.ts
@@ -101,12 +101,18 @@ export const updateBillableService = (uuid: string, payload: UpdateBillableServi
   });
 };
 
-export const updateOrCreateCashPoint = (uuid: string | null, payload: CashPointPayload) => {
-  let url = `${apiBasePath}cashPoint`;
-  if (uuid) {
-    url = `${apiBasePath}cashPoint/${uuid}`;
-  }
-  return openmrsFetch(url, {
+export const createCashPoint = (payload: CashPointPayload) => {
+  return openmrsFetch(`${apiBasePath}cashPoint`, {
+    method: 'POST',
+    body: payload,
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  });
+};
+
+export const updateCashPoint = (uuid: string, payload: CashPointPayload) => {
+  return openmrsFetch(`${apiBasePath}cashPoint/${uuid}`, {
     method: 'POST',
     body: payload,
     headers: {
diff --git a/src/billable-services/cash-point/add-cash-point.modal.tsx b/src/billable-services/cash-point/add-cash-point.modal.tsx
index 6f787814..68debb25 100644
--- a/src/billable-services/cash-point/add-cash-point.modal.tsx
+++ b/src/billable-services/cash-point/add-cash-point.modal.tsx
@@ -5,7 +5,7 @@ import { z } from 'zod';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { Button, Dropdown, Form, ModalBody, ModalFooter, ModalHeader, Stack, TextInput } from '@carbon/react';
 import { showSnackbar, openmrsFetch, restBaseUrl, getCoreTranslation } from '@openmrs/esm-framework';
-import { updateOrCreateCashPoint } from '../billable-service.resource';
+import { createCashPoint, updateCashPoint } from '../billable-service.resource';
 import type { CashPoint, CashPointPayload } from '../../types';
 
 type CashPointFormValues = {
@@ -44,9 +44,9 @@ const AddCashPointModal: React.FC<AddCashPointModalProps> = ({ cashPointToEdit,
   } = useForm<CashPointFormValues>({
     resolver: zodResolver(cashPointSchema),
     defaultValues: {
-      name: cashPointToEdit?.name || '',
-      uuid: cashPointToEdit?.uuid || '',
-      location: cashPointToEdit?.location?.uuid || '',
+      name: cashPointToEdit?.name ?? '',
+      uuid: cashPointToEdit?.uuid ?? '',
+      location: cashPointToEdit?.location?.uuid ?? '',
     },
   });
 
@@ -80,9 +80,9 @@ const AddCashPointModal: React.FC<AddCashPointModalProps> = ({ cashPointToEdit,
     };
     try {
       if (cashPointToEdit) {
-        await updateOrCreateCashPoint(cashPointToEdit.uuid, payload);
+        await updateCashPoint(cashPointToEdit.uuid, payload);
       } else {
-        await updateOrCreateCashPoint(null, payload);
+        await createCashPoint(payload);
       }
       showSnackbar({
         title: t('success', 'Success'),

From 0a84825e7ed9ec6723e64f49ce9ca2d1da1e6d5d Mon Sep 17 00:00:00 2001
From: abertnamanya <abertnamanya@gmail.com>
Date: Fri, 24 Oct 2025 20:25:02 +0300
Subject: [PATCH 10/10] Removed the uuid input field and refactored cashpoint
 payload object

---
 .../billable-service.resource.ts              |  7 +--
 .../cash-point/add-cash-point.modal.tsx       | 45 +++++--------------
 src/types/index.ts                            |  5 ++-
 translations/en.json                          |  4 --
 4 files changed, 19 insertions(+), 42 deletions(-)

diff --git a/src/billable-services/billable-service.resource.ts b/src/billable-services/billable-service.resource.ts
index 557f9306..1c42c179 100644
--- a/src/billable-services/billable-service.resource.ts
+++ b/src/billable-services/billable-service.resource.ts
@@ -7,7 +7,8 @@ import type {
   CreateBillableServicePayload,
   PaymentModePayload,
   UpdateBillableServicePayload,
-  CashPointPayload,
+  CreateCashPointPayload,
+  UpdateCashPointPayload,
 } from '../types';
 import type { BillingConfig } from '../config-schema';
 
@@ -107,7 +108,7 @@ export const updateBillableService = (uuid: string, payload: UpdateBillableServi
   });
 };
 
-export const createCashPoint = (payload: CashPointPayload) => {
+export const createCashPoint = (payload: CreateCashPointPayload) => {
   return openmrsFetch(`${apiBasePath}cashPoint`, {
     method: 'POST',
     body: payload,
@@ -117,7 +118,7 @@ export const createCashPoint = (payload: CashPointPayload) => {
   });
 };
 
-export const updateCashPoint = (uuid: string, payload: CashPointPayload) => {
+export const updateCashPoint = (uuid: string, payload: UpdateCashPointPayload) => {
   return openmrsFetch(`${apiBasePath}cashPoint/${uuid}`, {
     method: 'POST',
     body: payload,
diff --git a/src/billable-services/cash-point/add-cash-point.modal.tsx b/src/billable-services/cash-point/add-cash-point.modal.tsx
index 68debb25..f8a14abb 100644
--- a/src/billable-services/cash-point/add-cash-point.modal.tsx
+++ b/src/billable-services/cash-point/add-cash-point.modal.tsx
@@ -6,11 +6,10 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { Button, Dropdown, Form, ModalBody, ModalFooter, ModalHeader, Stack, TextInput } from '@carbon/react';
 import { showSnackbar, openmrsFetch, restBaseUrl, getCoreTranslation } from '@openmrs/esm-framework';
 import { createCashPoint, updateCashPoint } from '../billable-service.resource';
-import type { CashPoint, CashPointPayload } from '../../types';
+import type { CashPoint, CreateCashPointPayload, UpdateCashPointPayload } from '../../types';
 
 type CashPointFormValues = {
   name: string;
-  uuid: string;
   location: string;
 };
 
@@ -26,13 +25,6 @@ const AddCashPointModal: React.FC<AddCashPointModalProps> = ({ cashPointToEdit,
 
   const cashPointSchema = z.object({
     name: z.string().min(1, t('cashPointNameRequired', 'Cash Point Name is required')),
-    uuid: z
-      .string()
-      .min(1, t('uuidRequired', 'UUID is required'))
-      .regex(
-        /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i,
-        t('invalidUuidFormat', 'Invalid UUID format'),
-      ),
     location: z.string().min(1, t('locationRequired', 'Location is required')),
   });
 
@@ -45,7 +37,6 @@ const AddCashPointModal: React.FC<AddCashPointModalProps> = ({ cashPointToEdit,
     resolver: zodResolver(cashPointSchema),
     defaultValues: {
       name: cashPointToEdit?.name ?? '',
-      uuid: cashPointToEdit?.uuid ?? '',
       location: cashPointToEdit?.location?.uuid ?? '',
     },
   });
@@ -73,16 +64,19 @@ const AddCashPointModal: React.FC<AddCashPointModalProps> = ({ cashPointToEdit,
   }, [fetchLocations]);
 
   const onSubmit = async (data: CashPointFormValues) => {
-    const payload: CashPointPayload = {
-      name: data.name,
-      uuid: data.uuid,
-      location: { uuid: data.location },
-    };
     try {
       if (cashPointToEdit) {
-        await updateCashPoint(cashPointToEdit.uuid, payload);
+        const updatePayload: UpdateCashPointPayload = {
+          name: data.name,
+          location: { uuid: data.location },
+        };
+        await updateCashPoint(cashPointToEdit.uuid, updatePayload);
       } else {
-        await createCashPoint(payload);
+        const createPayload: CreateCashPointPayload = {
+          name: data.name,
+          location: { uuid: data.location },
+        };
+        await createCashPoint(createPayload);
       }
       showSnackbar({
         title: t('success', 'Success'),
@@ -91,7 +85,7 @@ const AddCashPointModal: React.FC<AddCashPointModalProps> = ({ cashPointToEdit,
       });
 
       closeModal();
-      reset({ name: '', uuid: '', location: '' });
+      reset({ name: '', location: '' });
       onCashPointAdded();
     } catch (err) {
       showSnackbar({
@@ -126,21 +120,6 @@ const AddCashPointModal: React.FC<AddCashPointModalProps> = ({ cashPointToEdit,
                 />
               )}
             />
-            <Controller
-              name="uuid"
-              control={control}
-              render={({ field }) => (
-                <TextInput
-                  id="cash-point-uuid"
-                  labelText={t('cashPointUuid', 'Cash Point UUID')}
-                  placeholder={t('cashPointUuidPlaceholder', 'Enter UUID')}
-                  invalid={!!errors.uuid}
-                  invalidText={errors.uuid?.message}
-                  disabled={!!cashPointToEdit}
-                  {...field}
-                />
-              )}
-            />
             <Controller
               name="location"
               control={control}
diff --git a/src/types/index.ts b/src/types/index.ts
index 69461c30..140a8e5c 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -41,13 +41,14 @@ export interface CashPoint {
   location: Location;
 }
 
-export interface CashPointPayload {
-  uuid: string;
+export interface CreateCashPointPayload {
   name: string;
+  description?: string;
   location: {
     uuid: string;
   };
 }
+export type UpdateCashPointPayload = Partial<CreateCashPointPayload>;
 
 interface ProviderLink {
   rel: string;
diff --git a/translations/en.json b/translations/en.json
index d76f0c6b..adcdb6ff 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -62,8 +62,6 @@
   "cashPointNamePlaceholder": "For example, Pharmacy Cash Point",
   "cashPointNameRequired": "Cash point name is required",
   "cashPointSaved": "Cash point was successfully saved.",
-  "cashPointUuid": "Cash point UUID",
-  "cashPointUuidPlaceholder": "Enter UUID",
   "checkFilters": "Check the filters above",
   "confirmDeleteMessage": "Are you sure you want to delete this payment mode? Proceed cautiously.",
   "cumulativeBills": "Cumulative bills",
@@ -105,7 +103,6 @@
   "home": "Home",
   "identifier": "Identifier",
   "insuranceScheme": "Insurance scheme",
-  "invalidUuidFormat": "Invalid UUID format",
   "invalidWaiverAmount": "Invalid waiver amount",
   "inventoryItem": "Inventory item",
   "invoice": "Invoice",
@@ -219,7 +216,6 @@
   "unitPrice": "Unit price",
   "unitPriceHelperText": "This is the unit price for this item",
   "uuid": "UUID",
-  "uuidRequired": "UUID is required",
   "validationError": "Validation error",
   "visitTime": "Visit time",
   "waiverForm": "Waiver form"