@openmrs/esm-billing-app 1.0.2-pre.811 → 1.0.2-pre.814

package/src/billing.resource.ts

@@ -1,5 +1,3 @@
-import { useContext } from 'react';
-import dayjs from 'dayjs';
 import isEmpty from 'lodash-es/isEmpty';
 import sortBy from 'lodash-es/sortBy';
 import useSWR from 'swr';
@@ -12,29 +10,31 @@ import {
   type SessionLocation,
   useOpenmrsFetchAll,
 } from '@openmrs/esm-framework';
-import { apiBasePath, omrsDateFormat } from './constants';
-import type { MappedBill, PatientInvoice, BillableItem } from './types';
-import SelectedDateContext from './hooks/selectedDateContext';
+import { apiBasePath } from './constants';
+import type {
+  MappedBill,
+  PatientInvoice,
+  BillableItem,
+  BillPaymentPayload,
+  CreateBillPayload,
+  UpdateBillPayload,
+} from './types';
+
+const mapBillProperties = (bill: PatientInvoice): MappedBill => {
+  const status =
+    bill.lineItems.length > 1
+      ? bill.lineItems.some((item) => item.paymentStatus === 'PENDING')
+        ? 'PENDING'
+        : 'PAID'
+      : bill.status;
 
-export const useBills = (patientUuid: string = '', billStatus: string = '') => {
-  const { selectedDate } = useContext(SelectedDateContext);
-  const endDate = dayjs().endOf('day').format(omrsDateFormat);
-  const url = `${apiBasePath}bill?q=&v=full`;
-
-  const patientUrl = `${apiBasePath}bill?patientUuid=${patientUuid}&v=full`;
-
-  const { data, error, isLoading, isValidating, mutate } = useSWR<{ data: { results: Array<PatientInvoice> } }>(
-    isEmpty(patientUuid) ? url : patientUrl,
-    openmrsFetch,
-  );
-
-  const mapBillProperties = (bill: PatientInvoice): MappedBill => ({
+  return {
     id: bill?.id,
     uuid: bill?.uuid,
     patientName: bill?.patient?.display.split('-')?.[1],
     identifier: bill?.patient?.display.split('-')?.[0],
     patientUuid: bill?.patient?.uuid,
-    status: bill.lineItems.some((item) => item.paymentStatus === 'PENDING') ? 'PENDING' : 'PAID',
+    status,
     receiptNumber: bill?.receiptNumber,
     cashier: bill?.cashier,
     cashPointUuid: bill?.cashPoint?.uuid,
@@ -42,11 +42,23 @@ export const useBills = (patientUuid: string = '', billStatus: string = '') => {
     cashPointLocation: bill?.cashPoint?.location?.display,
     dateCreated: bill?.dateCreated ? formatDate(parseDate(bill.dateCreated), { mode: 'wide' }) : '--',
     lineItems: bill?.lineItems,
-    billingService: bill?.lineItems.map((bill) => bill?.item || bill?.billableService || '--').join('  '),
-    payments: bill?.payments,
+    billingService: bill?.lineItems.map((lineItem) => lineItem?.item || lineItem?.billableService || '--').join('  '),
+    payments: bill.payments,
     display: bill?.display,
     totalAmount: bill?.lineItems?.map((item) => item.price * item.quantity).reduce((prev, curr) => prev + curr, 0),
-  });
+    tenderedAmount: bill?.payments?.map((item) => item.amountTendered).reduce((prev, curr) => prev + curr, 0),
+  };
+};
+
+export const useBills = (patientUuid: string = '', billStatus: string = '') => {
+  const url = `${apiBasePath}bill?q=&v=full`;
+
+  const patientUrl = `${apiBasePath}bill?patientUuid=${patientUuid}&v=full`;
+
+  const { data, error, isLoading, isValidating, mutate } = useSWR<{ data: { results: Array<PatientInvoice> } }>(
+    isEmpty(patientUuid) ? url : patientUrl,
+    openmrsFetch,
+  );
 
   const sortedBills = sortBy(data?.data?.results ?? [], ['dateCreated']).reverse();
   const filteredBills = billStatus === '' ? sortedBills : sortedBills?.filter((bill) => bill?.status === billStatus);
@@ -68,31 +80,6 @@ export const useBill = (billUuid: string) => {
     openmrsFetch,
   );
 
-  const mapBillProperties = (bill: PatientInvoice): MappedBill => ({
-    id: bill?.id,
-    uuid: bill?.uuid,
-    patientName: bill?.patient?.display.split('-')?.[1],
-    identifier: bill?.patient?.display.split('-')?.[0],
-    patientUuid: bill?.patient?.uuid,
-    status:
-      bill.lineItems.length > 1
-        ? bill.lineItems.some((item) => item.paymentStatus === 'PENDING')
-          ? 'PENDING'
-          : 'PAID'
-        : bill.status,
-    receiptNumber: bill?.receiptNumber,
-    cashier: bill?.cashier,
-    cashPointUuid: bill?.cashPoint?.uuid,
-    cashPointName: bill?.cashPoint?.name,
-    cashPointLocation: bill?.cashPoint?.location?.display,
-    dateCreated: bill?.dateCreated ? formatDate(parseDate(bill.dateCreated), { mode: 'wide' }) : '--',
-    lineItems: bill?.lineItems,
-    billingService: bill?.lineItems.map((bill) => bill.item).join(' '),
-    payments: bill.payments,
-    totalAmount: bill?.lineItems?.map((item) => item.price * item.quantity).reduce((prev, curr) => prev + curr, 0),
-    tenderedAmount: bill?.payments?.map((item) => item.amountTendered).reduce((prev, curr) => prev + curr, 0),
-  });
-
   const formattedBill = data?.data ? mapBillProperties(data?.data) : null;
 
   return {
@@ -104,7 +91,7 @@ export const useBill = (billUuid: string) => {
   };
 };
 
-export const processBillPayment = (payload, billUuid: string) => {
+export const processBillPayment = (payload: BillPaymentPayload, billUuid: string) => {
   const url = `${apiBasePath}bill/${billUuid}`;
 
   return openmrsFetch(url, {
@@ -139,7 +126,7 @@ export function useBillableServices() {
   return useOpenmrsFetchAll<BillableItem>(url);
 }
 
-export const processBillItems = (payload) => {
+export const processBillItems = (payload: CreateBillPayload) => {
   const url = `${apiBasePath}bill`;
   return openmrsFetch(url, {
     method: 'POST',
@@ -150,7 +137,7 @@ export const processBillItems = (payload) => {
   });
 };
 
-export const updateBillItems = (payload) => {
+export const updateBillItems = (payload: UpdateBillPayload) => {
   const url = `${apiBasePath}bill/${payload.uuid}`;
   return openmrsFetch(url, {
     method: 'POST',

package/src/invoice/payments/utils.ts

@@ -1,4 +1,4 @@
-import { type MappedBill } from '../../types';
+import { type MappedBill, type BillableService } from '../../types';
 import { type Payment } from './payments.component';
 
 export const createPaymentPayload = (
@@ -6,7 +6,7 @@ export const createPaymentPayload = (
   patientUuid: string,
   formValues: Array<Payment>,
   amountDue: number,
-  billableServices: Array<any>,
+  billableServices: Array<BillableService>,
 ) => {
   const { cashier } = bill;
   const totalAmount = bill.totalAmount ?? 0;
@@ -48,7 +48,13 @@ export const createPaymentPayload = (
   return processedPayment;
 };
 
-export const getBillableServiceUuid = (billableServices: Array<any>, serviceName: string) => {
-  return billableServices.length ? billableServices.find((service) => service.name === serviceName).uuid : null;
+export const getBillableServiceUuid = (billableServices: Array<BillableService>, serviceName: string) => {
+  if (!billableServices.length) {
+    return null;
+  }
+  const service = billableServices.find((service) => service.name === serviceName);
+  return service?.uuid ?? null;
 };
-const processBillItem = (item) => (item.item || item.billableService)?.split(':')[0];
+
+const processBillItem = (item: { item?: string; billableService?: string }) =>
+  (item.item || item.billableService)?.split(':')[0];

package/src/types/index.ts

@@ -1,3 +1,5 @@
+import { type OpenmrsResource } from '@openmrs/esm-framework';
+
 export interface MappedBill {
   uuid: string;
   id: number;
@@ -121,13 +123,21 @@ export interface Payment {
   resourceVersion: string;
 }
 
+export type PaymentPayload = {
+  amount: number;
+  amountTendered: number;
+  attributes: Array<Attribute>;
+  instanceType: string;
+  dateCreated?: Date | number;
+};
+
 export interface PatientInvoice {
   uuid: string;
   display: string;
   voided: boolean;
   voidReason: string | null;
-  adjustedBy: any[];
-  billAdjusted: any;
+  adjustedBy: Array<OpenmrsResource>;
+  billAdjusted: OpenmrsResource | null;
   cashPoint: CashPoint;
   cashier: Provider;
   dateCreated: string;
@@ -136,7 +146,7 @@ export interface PatientInvoice {
   payments: Payment[];
   receiptNumber: string;
   status: string;
-  adjustmentReason: any;
+  adjustmentReason: string | null;
   id: number;
   resourceVersion: string;
 }
@@ -156,7 +166,7 @@ export interface FacilityDetail {
 }
 
 export type ServiceConcept = {
-  uuid: any;
+  uuid: string;
   concept: {
     uuid: string;
     display: string;
@@ -203,3 +213,46 @@ export interface BillableService {
   concept?: ServiceConcept;
   servicePrices: Array<ServicePrice>;
 }
+
+export type BillPaymentPayload = {
+  cashPoint: string;
+  cashier: string;
+  lineItems: Array<LineItem>;
+  payments: Array<PaymentPayload>;
+  patient: string;
+  status?: string;
+};
+
+export type CreateBillPayload = {
+  cashPoint: string;
+  cashier: string;
+  lineItems: Array<LineItem>;
+  payments: Array<PaymentPayload>;
+  patient: string;
+  status: string;
+};
+
+export type UpdateBillPayload = {
+  cashPoint: string;
+  cashier: string;
+  lineItems: Array<LineItem>;
+  patient: string;
+  status: string;
+  uuid: string;
+  payments?: Array<PaymentPayload>;
+};
+
+export type CreateBillableServicePayload = {
+  name: string;
+  shortName: string;
+  serviceStatus: string;
+  serviceType?: string;
+  concept?: string;
+  servicePrices: Array<{
+    name: string;
+    price: number;
+    paymentMode: string;
+  }>;
+};
+
+export type UpdateBillableServicePayload = Partial<CreateBillableServicePayload>;