@openmrs/esm-billing-app 1.0.2-pre.711 → 1.0.2-pre.721

package/src/billable-services/payment-modes/payment-modes-config.component.tsx

@@ -0,0 +1,125 @@
+import React, { useState, useEffect, useCallback } from 'react';
+import {
+  Button,
+  DataTable,
+  OverflowMenu,
+  OverflowMenuItem,
+  Table,
+  TableBody,
+  TableCell,
+  TableContainer,
+  TableHead,
+  TableHeader,
+  TableRow,
+} 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 { CardHeader } from '@openmrs/esm-patient-common-lib';
+import styles from './payment-modes-config.scss';
+
+const PaymentModesConfig: React.FC = () => {
+  const { t } = useTranslation();
+  const [paymentModes, setPaymentModes] = useState([]);
+
+  const fetchPaymentModes = useCallback(async () => {
+    try {
+      const response = await openmrsFetch(`${restBaseUrl}/billing/paymentMode?v=full`);
+      setPaymentModes(response.data.results || []);
+    } catch (err) {
+      showSnackbar({
+        title: getCoreTranslation('error'),
+        subtitle: t('errorFetchingPaymentModes', 'An error occurred while fetching payment modes.'),
+        kind: 'error',
+        isLowContrast: false,
+      });
+    }
+  }, [t]);
+
+  useEffect(() => {
+    fetchPaymentModes();
+  }, [fetchPaymentModes]);
+
+  const handleAddPaymentMode = () => {
+    showModal('add-payment-mode-modal', {
+      onPaymentModeAdded: fetchPaymentModes,
+    });
+  };
+
+  const handleDeletePaymentMode = (paymentMode) => {
+    showModal('delete-payment-mode-modal', {
+      paymentModeUuid: paymentMode.uuid,
+      paymentModeName: paymentMode.name,
+      onPaymentModeDeleted: fetchPaymentModes,
+    });
+  };
+
+  const rowData = paymentModes.map((mode) => ({
+    id: mode.uuid,
+    name: mode.name,
+    description: mode.description || '--',
+  }));
+
+  const headerData = [
+    { key: 'name', header: t('name', 'Name') },
+    { key: 'description', header: t('description', 'Description') },
+    { key: 'actions', header: getCoreTranslation('actions') },
+  ];
+
+  return (
+    <div className={styles.container}>
+      <div className={styles.card}>
+        <CardHeader title={t('paymentModeHistory', 'Payment Mode History')}>
+          <Button renderIcon={Add} onClick={handleAddPaymentMode} kind="ghost">
+            {t('addNewPaymentMode', 'Add New Payment Mode')}
+          </Button>
+        </CardHeader>
+        <div className={styles.historyContainer}>
+          <DataTable rows={rowData} headers={headerData} isSortable size="lg">
+            {({ rows, headers, getTableProps, getHeaderProps, getRowProps }) => (
+              <TableContainer>
+                <Table className={styles.table} {...getTableProps()}>
+                  <TableHead>
+                    <TableRow>
+                      {headers.map((header) => (
+                        <TableHeader key={header.key} {...getHeaderProps({ header })}>
+                          {header.header}
+                        </TableHeader>
+                      ))}
+                    </TableRow>
+                  </TableHead>
+                  <TableBody>
+                    {rows.map((row) => (
+                      <TableRow key={row.id} {...getRowProps({ row })}>
+                        {row.cells.map((cell) =>
+                          cell.info.header !== 'actions' ? (
+                            <TableCell key={cell.id}>{cell.value}</TableCell>
+                          ) : (
+                            <TableCell key={cell.id}>
+                              <OverflowMenu>
+                                <OverflowMenuItem
+                                  className={styles.menuItem}
+                                  itemText={getCoreTranslation('delete')}
+                                  onClick={() => {
+                                    const selected = paymentModes.find((p) => p.uuid === row.id);
+                                    handleDeletePaymentMode(selected);
+                                  }}
+                                />
+                              </OverflowMenu>
+                            </TableCell>
+                          ),
+                        )}
+                      </TableRow>
+                    ))}
+                  </TableBody>
+                </Table>
+              </TableContainer>
+            )}
+          </DataTable>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default PaymentModesConfig;

package/src/billable-services/{payyment-modes → payment-modes}/payment-modes-config.scss

@@ -20,4 +20,8 @@
 .table {
   width: 100%;
   table-layout: auto;
-}
+}
+
+.menuItem {
+  max-width: none;
+}

package/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 } from '@openmrs/esm-framework';
+import { showSnackbar, getCoreTranslation } 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';
@@ -73,7 +73,7 @@ const BillingCheckInForm: React.FC<BillingCheckInFormProps> = ({ patientUuid, se
     return (
       <InlineLoading
         status="active"
-        iconDescription={t('loading', 'Loading')}
+        iconDescription={getCoreTranslation('loading')}
         description={t('loadingBillingServices', 'Loading billing services...')}
       />
     );

package/src/billing-form/billing-form.component.tsx

@@ -17,7 +17,7 @@ import {
   TableCell,
 } from '@carbon/react';
 import { TrashCan } from '@carbon/react/icons';
-import { useConfig, useLayoutType, showSnackbar } from '@openmrs/esm-framework';
+import { useConfig, useLayoutType, showSnackbar, getCoreTranslation } from '@openmrs/esm-framework';
 import { processBillItems, useBillableServices } from '../billing.resource';
 import { calculateTotalAmount, convertToCurrency } from '../helpers/functions';
 import type { BillingConfig } from '../config-schema';
@@ -124,7 +124,7 @@ const BillingForm: React.FC<BillingFormProps> = ({ patientUuid, closeWorkspace }
     <Form className={styles.form}>
       <div className={styles.grid}>
         {isLoading ? (
-          <InlineLoading description={t('loading', 'Loading') + '...'} />
+          <InlineLoading description={getCoreTranslation('loading') + '...'} />
         ) : error ? (
           <InlineNotification
             kind="error"

package/src/helpers/functions.ts

@@ -1,3 +1,4 @@
+import { getCoreTranslation } from '@openmrs/esm-framework';
 import { type Payment, type LineItem } from '../types';
 
 // amount already paid
@@ -51,13 +52,13 @@ export const convertToCurrency = (amountToConvert: number, currencyType?: string
 export const getGender = (gender: string, t) => {
   switch (gender) {
     case 'male':
-      return t('male', 'Male');
+      return getCoreTranslation('male');
     case 'female':
-      return t('female', 'Female');
+      return getCoreTranslation('female');
     case 'other':
-      return t('other', 'Other');
+      return getCoreTranslation('other');
     case 'unknown':
-      return t('unknown', 'Unknown');
+      return getCoreTranslation('unknown');
     default:
       return gender;
   }

package/src/index.ts

@@ -3,12 +3,17 @@ import { createDashboardLink } from '@openmrs/esm-patient-common-lib';
 import { createLeftPanelLink } from './left-panel-link.component';
 import { dashboardMeta } from './dashboard.meta';
 import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle } from '@openmrs/esm-framework';
+import AddCashPointModal from './billable-services/cash-point/add-cash-point.modal';
+import AddPaymentModeModal from './billable-services/payment-modes/add-payment-mode.modal';
 import appMenu from './billable-services/billable-services-menu-item/item.component';
 import BillableServiceHome from './billable-services/billable-services-home.component';
 import BillableServicesCardLink from './billable-services-admin-card-link.component';
 import BillHistory from './bill-history/bill-history.component';
 import BillingCheckInForm from './billing-form/billing-checkin-form.component';
-import RequirePaymentModal from './modal/require-payment-modal.component';
+import DeletePaymentModeModal from './billable-services/payment-modes/delete-payment-mode.modal';
+import EditBillableServiceModal from './billable-services/create-edit/edit-billable-service.modal';
+import EditBillLineItemModal from './bill-item-actions/edit-bill-item.modal';
+import RequirePaymentModal from './modal/require-payment.modal';
 import RootComponent from './root.component';
 import ServiceMetrics from './billable-services/dashboard/service-metrics.component';
 import VisitAttributeTags from './invoice/payments/visit-tags/visit-attribute.component';
@@ -53,16 +58,21 @@ export const billingPatientSummary = getSyncLifecycle(BillHistory, options);
 
 export const requirePaymentModal = getSyncLifecycle(RequirePaymentModal, options);
 
+export const addPaymentModeModal = getSyncLifecycle(AddPaymentModeModal, options);
+
+export const deletePaymentModeModal = getSyncLifecycle(DeletePaymentModeModal, options);
+
+export const addCashPointModal = getSyncLifecycle(AddCashPointModal, options);
+
+export const editBillableServiceModal = getSyncLifecycle(EditBillableServiceModal, options);
+
+export const editBillLineItemModal = getSyncLifecycle(EditBillLineItemModal, options);
+
 export const root = getSyncLifecycle(RootComponent, options);
 
 export const serviceMetrics = getSyncLifecycle(ServiceMetrics, options);
 
 export const visitAttributeTags = getSyncLifecycle(VisitAttributeTags, options);
 
-export const editBillLineItemDialog = getAsyncLifecycle(() => import('./bill-item-actions/edit-bill-item.component'), {
-  featureName: 'edit bill line item',
-  moduleName,
-});
-
 // t('billingForm', 'Billing form')
 export const billingFormWorkspace = getAsyncLifecycle(() => import('./billing-form/billing-form.component'), options);

package/src/invoice/invoice-table.component.tsx

@@ -18,7 +18,14 @@ import {
   type DataTableRow,
 } from '@carbon/react';
 import { Edit } from '@carbon/react/icons';
-import { isDesktop, showModal, useConfig, useDebounce, useLayoutType } from '@openmrs/esm-framework';
+import {
+  isDesktop,
+  showModal,
+  useConfig,
+  useDebounce,
+  useLayoutType,
+  getCoreTranslation,
+} from '@openmrs/esm-framework';
 import { type LineItem, type MappedBill } from '../types';
 import { convertToCurrency } from '../helpers';
 import type { BillingConfig } from '../config-schema';
@@ -61,7 +68,7 @@ const InvoiceTable: React.FC<InvoiceTableProps> = ({ bill, isLoadingBill }) => {
     { header: t('quantity', 'Quantity'), key: 'quantity', width: 15 },
     { header: t('price', 'Price'), key: 'price', width: 24 },
     { header: t('total', 'Total'), key: 'total', width: 15 },
-    { header: t('actions', 'Actions'), key: 'actionButton' },
+    { header: getCoreTranslation('actions'), key: 'actionButton' },
   ];
 
   const handleSelectBillItem = useCallback(

package/src/invoice/invoice.component.tsx

@@ -52,7 +52,11 @@ const Invoice: React.FC = () => {
     onAfterPrint: handleAfterPrint,
     preserveAfterPrint: false,
     onPrintError: (_, error) =>
-      showSnackbar({ title: t('printError', 'Error printing invoice'), kind: 'error', subtitle: error.message }),
+      showSnackbar({
+        title: t('errorPrintingInvoice', 'Error printing invoice'),
+        kind: 'error',
+        subtitle: error.message,
+      }),
   });
 
   useEffect(() => {

package/src/invoice/printable-invoice/print-receipt.component.tsx

@@ -2,6 +2,7 @@ import React, { useState } from 'react';
 import { Button } from '@carbon/react';
 import { Printer } from '@carbon/react/icons';
 import { useTranslation } from 'react-i18next';
+import { getCoreTranslation } from '@openmrs/esm-framework';
 import { apiBasePath } from '../../constants';
 import styles from './print-receipt.scss';
 
@@ -36,7 +37,7 @@ const PrintReceipt: React.FC<PrintReceiptProps> = ({ billId }) => {
       renderIcon={(props) => <Printer size={24} {...props} />}
       onClick={handlePrintReceiptClick}
       disabled={isRedirecting}>
-      {isRedirecting ? t('loading', 'Loading') : t('printReceipt', 'Print receipt')}
+      {isRedirecting ? getCoreTranslation('loading') : t('printReceipt', 'Print receipt')}
     </Button>
   );
 };

package/src/modal/require-payment-modal.test.tsx

@@ -5,7 +5,7 @@ import { getDefaultsFromConfigSchema, useConfig } from '@openmrs/esm-framework';
 import { useBills } from '../billing.resource';
 import { type MappedBill } from '../types';
 import { configSchema, type BillingConfig } from '../config-schema';
-import RequirePaymentModal from './require-payment-modal.component';
+import RequirePaymentModal from './require-payment.modal';
 
 const mockUseConfig = jest.mocked(useConfig<BillingConfig>);
 const mockUseBills = jest.mocked<typeof useBills>(useBills);

package/src/modal/{require-payment-modal.component.tsx → require-payment.modal.tsx}

@@ -12,7 +12,7 @@ import {
   StructuredListRow,
   StructuredListWrapper,
 } from '@carbon/react';
-import { useConfig } from '@openmrs/esm-framework';
+import { getCoreTranslation, useConfig } from '@openmrs/esm-framework';
 import { useBills } from '../billing.resource';
 import { convertToCurrency } from '../helpers';
 import styles from './require-payment.scss';
@@ -29,22 +29,23 @@ const RequirePaymentModal: React.FC<RequirePaymentModalProps> = ({ closeModal, p
   const lineItems = bills.filter((bill) => bill?.status !== 'PAID').flatMap((bill) => bill?.lineItems);
 
   return (
-    <div>
+    <>
       <ModalHeader closeModal={closeModal} title={t('patientBillingAlert', 'Patient Billing Alert')} />
       <ModalBody>
         <p className={styles.bodyShort02}>
           {t(
             'billPaymentRequiredMessage',
-            'The current patient has pending bill. Advice patient to settle bill before receiving services',
+            'The current patient has a pending bill. Advise the patient to settle the bill before receiving services',
           )}
         </p>
         {isLoading && (
           <InlineLoading
             status="active"
             iconDescription="Loading"
-            description={t('inlineLoading', 'Loading bill items...')}
+            description={t('loadingBillItems', 'Loading bill items') + '...'}
           />
         )}
+
         <StructuredListWrapper isCondensed>
           <StructuredListHead>
             <StructuredListRow head>
@@ -55,30 +56,28 @@ const RequirePaymentModal: React.FC<RequirePaymentModalProps> = ({ closeModal, p
             </StructuredListRow>
           </StructuredListHead>
           <StructuredListBody>
-            {lineItems.map((lineItem) => {
-              return (
-                <StructuredListRow>
-                  <StructuredListCell>{lineItem.billableService || lineItem.item}</StructuredListCell>
-                  <StructuredListCell>{lineItem.quantity}</StructuredListCell>
-                  <StructuredListCell>{convertToCurrency(lineItem.price, defaultCurrency)}</StructuredListCell>
-                  <StructuredListCell>
-                    {convertToCurrency(lineItem.quantity * lineItem.price, defaultCurrency)}
-                  </StructuredListCell>
-                </StructuredListRow>
-              );
-            })}
+            {lineItems.map((lineItem) => (
+              <StructuredListRow key={lineItem.uuid}>
+                <StructuredListCell>{lineItem.billableService || lineItem.item}</StructuredListCell>
+                <StructuredListCell>{lineItem.quantity}</StructuredListCell>
+                <StructuredListCell>{convertToCurrency(lineItem.price, defaultCurrency)}</StructuredListCell>
+                <StructuredListCell>
+                  {convertToCurrency(lineItem.quantity * lineItem.price, defaultCurrency)}
+                </StructuredListCell>
+              </StructuredListRow>
+            ))}
           </StructuredListBody>
         </StructuredListWrapper>
       </ModalBody>
       <ModalFooter>
         <Button kind="secondary" onClick={closeModal}>
-          {t('cancel', 'Cancel')}
+          {getCoreTranslation('cancel')}
         </Button>
         <Button kind="primary" onClick={closeModal}>
           {t('ok', 'OK')}
         </Button>
       </ModalFooter>
-    </div>
+    </>
   );
 };
 

package/src/routes.json

@@ -81,12 +81,32 @@
     },
     {
       "name": "edit-bill-line-item-dialog",
-      "component": "editBillLineItemDialog",
+      "component": "editBillLineItemModal",
       "online": true,
       "offline": true
     }
   ],
   "modals": [
+    {
+      "name": "add-cash-point-modal",
+      "component": "addCashPointModal"
+    },
+    {
+      "name": "add-payment-mode-modal",
+      "component": "addPaymentModeModal"
+    },
+    {
+      "name": "delete-payment-mode-modal",
+      "component": "deletePaymentModeModal"
+    },
+    {
+      "name": "edit-bill-item-modal",
+      "component": "editBillLineItemModal"
+    },
+    {
+      "name": "edit-billable-service-modal",
+      "component": "editBillableServiceModal"
+    },
     {
       "name": "require-billing-modal",
       "component": "requirePaymentModal"
@@ -107,4 +127,4 @@
       "description": "This feature introduces navigation links on the patient chart and home page to allow accessing the billing module features"
     }
   ]
-}
+}

package/translations/en.json

@@ -1,6 +1,5 @@
 {
   "action": "Action",
-  "actions": "Actions",
   "addBill": "Add bill item(s)",
   "addBillableServices": "Add Billable Services",
   "addCashPoint": "Add Cash Point",
@@ -18,6 +17,7 @@
   "amountToWaiveLabel": "Amount to Waive",
   "billableService": "Billable service",
   "billableServices": "Billable Services",
+  "billableServices__lower": "billable services",
   "billAmount": "Bill amount",
   "billCode": "Bill code",
   "billedItems": "Billed Items",
@@ -35,7 +35,7 @@
   "billName": " {{billName}} ",
   "billPayment": "Bill payment",
   "billPaymentError": "Bill payment error",
-  "billPaymentRequiredMessage": "The current patient has pending bill. Advice patient to settle bill before receiving services",
+  "billPaymentRequiredMessage": "The current patient has a pending bill. Advise the patient to settle the bill before receiving services",
   "billProcessingError": "Bill processing error",
   "billProcessingSuccess": "Bill processing has been successful",
   "billServicesManagement": "Bill services management",
@@ -44,12 +44,12 @@
   "billWaiver": "Bill waiver",
   "billWaiverError": "Bill waiver failed {{error}}",
   "billWaiverSuccess": "Bill waiver successful",
-  "cancel": "Cancel",
   "cashPointConfig": "Cash Point Config",
   "cashPointHistory": "Cash Point History",
   "cashPointLocation": "Cash Point Location",
   "cashPointName": "Cash Point Name",
   "cashPointNamePlaceholder": "e.g., Pharmacy Cash Point",
+  "cashPointNameRequired": "Cash Point Name is required",
   "cashPointSaved": "Cash point was successfully saved.",
   "cashPointUuid": "Cash Point UUID",
   "cashPointUuidPlaceholder": "Enter UUID",
@@ -60,15 +60,13 @@
   "date": "Date",
   "dateAndTime": "Date And Time",
   "dateOfPayment": "Date of payment",
-  "delete": "Delete",
   "deletePaymentMode": "Delete Payment Mode",
+  "deleting": "Deleting",
   "description": "Description",
   "descriptionPlaceholder": "e.g., Used for all cash transactions",
   "discard": "Discard",
   "discount": "Discount",
   "discountAmount": "Discount Amount",
-  "duplicateCashPointError": "A cash point with the same name or UUID already exists. Please use a unique name and UUID.",
-  "duplicatePaymentModeError": "A payment mode with the same name already exists. Please create another payment mode",
   "editBillableService": "Edit billable service",
   "editBillableServices": "Edit Billable Services",
   "editBillLineItem": "Edit bill line item?",
@@ -83,6 +81,7 @@
   "errorFetchingPaymentModes": "An error occurred while fetching payment modes.",
   "errorLoadingBillServices": "Error loading bill services",
   "errorLoadingPaymentModes": "Payment modes error",
+  "errorPrintingInvoice": "Error printing invoice",
   "errorSavingCashPoint": "An error occurred while saving the cash point.",
   "errorSavingPaymentMode": "An error occurred while saving the payment mode.",
   "filterBy": "Filter by",
@@ -90,8 +89,8 @@
   "grandTotal": "Grand total",
   "home": "Home",
   "identifier": "Identifier",
-  "inlineLoading": "Loading bill items...",
   "insuranceScheme": "Insurance scheme",
+  "invalidUuidFormat": "Invalid UUID format",
   "invalidWaiverAmount": "Invalid waiver amount",
   "inventoryItem": "Inventory item",
   "invoice": "Invoice",
@@ -106,8 +105,11 @@
   "loading": "Loading data...",
   "loadingBillInfo": "Loading bill information...",
   "loadingBillingServices": "Loading billing services...",
+  "loadingBillItems": "Loading bill items",
+  "loadingData": "Loading data",
   "loadingDescription": "Loading",
   "location": "Select Location",
+  "locationRequired": "Location is required",
   "manageBillableServices": "Manage billable services",
   "name": "Name",
   "nextPage": "Next page",
@@ -116,7 +118,6 @@
   "noMatchingItemsToDisplay": "No matching items to display",
   "noMatchingServicesToDisplay": "No matching services to display",
   "noResultsFor": "No results for",
-  "noServicesToDisplay": "There are no services to display",
   "number": "No",
   "ok": "OK",
   "patientBillingAlert": "Patient Billing Alert",
@@ -131,6 +132,7 @@
   "paymentModeHistory": "Payment Mode History",
   "paymentModeName": "Payment Mode Name",
   "paymentModeNamePlaceholder": "e.g., Cash, Credit Card",
+  "paymentModeNameRequired": "Payment Mode Name is required",
   "paymentModeSaved": "Payment mode was successfully saved.",
   "paymentModesConfig": "Payment Modes Config",
   "payments": "Payments",
@@ -142,13 +144,11 @@
   "priceIsRequired": "Price is required",
   "prices": "Prices",
   "printBill": "Print bill",
-  "printError": "Error printing invoice",
   "printReceipt": "Print receipt",
   "processPayment": "Process Payment",
   "quantity": "Quantity",
   "quantityRequired": "Quantity is required",
   "referenceNumber": "Reference number",
-  "save": "Save",
   "saveAndClose": "Save and close",
   "saveBill": "Save Bill",
   "saving": "Saving",
@@ -178,8 +178,10 @@
   "totalAmount": "Total Amount",
   "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",
   "visitTime": "Visit time",
   "waiverForm": "Waiver form"
 }