(Enhancement) Enhance Line Items Billing Status

openmrs · Jun 4, 2024 · 6697a49 · 6697a49
1 parent e4b087f
commit 6697a49
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/src/invoice/payments/payments.component.tsx b/src/invoice/payments/payments.component.tsx
@@ -31,7 +31,6 @@ export type PaymentFormValue = {
 
 const Payments: React.FC<PaymentProps> = ({ bill, selectedLineItems, mutate }) => {
   const { t } = useTranslation();
-  const { defaultCurrency } = useConfig();
   const { billableServices, isLoading, isValidating, error } = useBillableServices();
   const paymentSchema = z.object({
     method: z.string().refine((value) => !!value, 'Payment method is required'),
@@ -43,6 +42,7 @@ const Payments: React.FC<PaymentProps> = ({ bill, selectedLineItems, mutate }) =
 
   const paymentFormSchema = z.object({ payment: z.array(paymentSchema) });
   const { currentVisit } = useVisit(bill?.patientUuid);
+  const { defaultCurrency } = useConfig();
   const methods = useForm<PaymentFormValue>({
     mode: 'all',
     defaultValues: {},
@@ -58,7 +58,6 @@ const Payments: React.FC<PaymentProps> = ({ bill, selectedLineItems, mutate }) =
   const computedTotal = hasMoreThanOneLineItem ? computeTotalPrice(selectedLineItems) : bill?.totalAmount ?? 0;
   const totalAmountTendered = formValues?.reduce((curr: number, prev) => curr + Number(prev.amount) ?? 0, 0) ?? 0;
   const amountDue = Number(computedTotal) - (Number(bill?.tenderedAmount) + Number(totalAmountTendered));
-  const newAmountDue = Number(bill?.totalAmount - bill?.tenderedAmount);
 
   const handleNavigateToBillingDashboard = () =>
     navigate({
@@ -68,7 +67,7 @@ const Payments: React.FC<PaymentProps> = ({ bill, selectedLineItems, mutate }) =
   const handleProcessPayment = () => {
     const paymentPayload = createPaymentPayload(
       bill,
-      bill.patientUuid,
+      bill?.patientUuid,
       formValues,
       amountDue,
       billableServices,
@@ -109,7 +108,7 @@ const Payments: React.FC<PaymentProps> = ({ bill, selectedLineItems, mutate }) =
           </CardHeader>
           <div>
             {bill && <PaymentHistory bill={bill} />}
-            <PaymentForm disablePayment={computedTotal <= 0} amountDue={amountDue} />
+            <PaymentForm disablePayment={amountDue <= 0} amountDue={amountDue} />
           </div>
         </div>
         <div className={styles.divider} />

diff --git a/src/invoice/payments/utils.ts b/src/invoice/payments/utils.ts
@@ -1,4 +1,3 @@
-import { type OpenmrsResource } from '@openmrs/esm-framework';
 import { type LineItem, type MappedBill } from '../../types';
 import { type Payment } from './payments.component';
 
@@ -20,8 +19,8 @@ export const createPaymentPayload = (
 ) => {
   const { cashier } = bill;
   const totalAmount = bill?.totalAmount;
-  const totalPaymentStatus = amountDue <= 0 ? 'PAID' : 'PENDING';
-  const previousPayments = bill.payments.map((payment) => ({
+  const paymentStatus = amountDue <= 0 ? 'PAID' : 'PENDING';
+  const previousPayments = bill?.payments.map((payment) => ({
     amount: payment.amount,
     amountTendered: payment.amountTendered,
     attributes: [],
@@ -39,27 +38,29 @@ export const createPaymentPayload = (
 
   const updatedPayments = [...newPayments, ...previousPayments];
   const totalAmountRendered = updatedPayments.reduce((acc, payment) => acc + payment.amountTendered, 0);
+
   const updatedLineItems = bill?.lineItems.map((lineItem) => ({
     ...lineItem,
     billableService: getBillableServiceUuid(billableServices, lineItem.billableService),
-    item: lineItem?.item,
-    paymentStatus: hasLineItem(selectedLineItems ?? [], lineItem)
-      ? totalAmountRendered >= lineItem.price * lineItem.quantity
-        ? 'PAID'
-        : 'PENDING'
-      : lineItem.paymentStatus,
+    item: processBillItem?.(lineItem),
+    paymentStatus:
+      bill?.lineItems.length > 1
+        ? hasLineItem(selectedLineItems ?? [], lineItem) && totalAmountRendered >= lineItem.price * lineItem.quantity
+          ? 'PAID'
+          : 'PENDING'
+        : paymentStatus,
   }));
 
   const allItemsBillPaymentStatus =
     updatedLineItems.filter((item) => item.paymentStatus === 'PENDING').length === 0 ? 'PAID' : 'PENDING';
 
   const processedPayment = {
-    cashPoint: bill.cashPointUuid,
+    cashPoint: bill?.cashPointUuid,
     cashier: cashier.uuid,
     lineItems: updatedLineItems,
     payments: [...updatedPayments],
     patient: patientUuid,
-    status: selectedLineItems?.length > 0 ? allItemsBillPaymentStatus : totalPaymentStatus,
+    status: selectedLineItems?.length > 0 ? allItemsBillPaymentStatus : paymentStatus,
   };
 
   return processedPayment;
@@ -68,3 +69,4 @@ export const createPaymentPayload = (
 export const getBillableServiceUuid = (billableServices: Array<any>, serviceName: string) => {
   return billableServices.length ? billableServices.find((service) => service.name === serviceName).uuid : null;
 };
+const processBillItem = (item) => (item.item || item.billableService)?.split(':')[0];