@openmrs/esm-billing-app 1.0.2-pre.112 → 1.0.2-pre.1124

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...')}
+            iconDescription={getCoreTranslation('loading')}
+            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

@@ -19,8 +19,7 @@
         "name": "billing",
         "title": "billing",
         "slot": "billing-dashboard-slot"
-      },
-      "featureFlag": "billing"
+      }
     },
     {
       "component": "root",
@@ -46,8 +45,7 @@
         "columnSpan": 1,
         "slot": "patient-chart-billing-dashboard-slot",
         "path": "Billing history"
-      },
-      "featureFlag": "billing"
+      }
     },
     {
       "name": "billable-services-app-menu-item",
@@ -60,8 +58,7 @@
     {
       "name": "billing-checkin-form",
       "slot": "extra-visit-attribute-slot",
-      "component": "billingCheckInForm",
-      "featureFlag": "billing"
+      "component": "billingCheckInForm"
     },
     {
       "slot": "system-admin-page-card-link-slot",
@@ -75,18 +72,45 @@
       "order": 2
     },
     {
-      "name": "billing-home-tiles-ext",
-      "slot": "billing-home-tiles-slot",
-      "component": "serviceMetrics"
+      "name": "billable-services-left-panel-link",
+      "component": "billableServicesLeftPanelLink",
+      "slot": "billable-services-left-panel-slot",
+      "order": 0
     },
     {
-      "name": "edit-bill-line-item-dialog",
-      "component": "editBillLineItemDialog",
-      "online": true,
-      "offline": true
+      "name": "bill-waiver-left-panel-link",
+      "component": "billWaiverLeftPanelLink",
+      "slot": "billable-services-left-panel-slot",
+      "order": 1
+    },
+    {
+      "name": "billing-settings-left-panel-menu",
+      "component": "billingSettingsLeftPanelMenu",
+      "slot": "billable-services-left-panel-slot",
+      "order": 2
     }
   ],
   "modals": [
+    {
+      "name": "add-cash-point-modal",
+      "component": "addCashPointModal"
+    },
+    {
+      "name": "payment-mode-form-modal",
+      "component": "paymentModeFormModal"
+    },
+    {
+      "name": "delete-payment-mode-modal",
+      "component": "deletePaymentModeModal"
+    },
+    {
+      "name": "edit-bill-item-modal",
+      "component": "editBillLineItemModal"
+    },
+    {
+      "name": "edit-bill-line-item-modal",
+      "component": "editBillLineItemModal"
+    },
     {
       "name": "require-billing-modal",
       "component": "requirePaymentModal"
@@ -98,13 +122,13 @@
       "title": "billingForm",
       "component": "billingFormWorkspace",
       "type": "form"
-    }
-  ],
-  "featureFlags": [
+    },
     {
-      "flagName": "billing",
-      "label": "Billing module",
-      "description": "This feature introduces navigation links on the patient chart and home page to allow accessing the billing module features"
+      "name": "billable-service-form",
+      "title": "billableServiceForm",
+      "component": "billableServiceFormWorkspace",
+      "type": "form",
+      "width": "wider"
     }
   ]
-}
+}

package/src/types/index.ts

@@ -1,3 +1,5 @@
+import { type OpenmrsResource } from '@openmrs/esm-framework';
+
 export interface MappedBill {
   uuid: string;
   id: number;
@@ -52,19 +54,19 @@ interface Provider {
 }
 
 export interface LineItem {
-  uuid: string;
-  display: string;
-  voided: boolean;
-  voidReason: string | null;
-  item: string;
-  billableService: string;
+  uuid?: string;
+  item?: string;
+  paymentStatus: string;
+  billableService?: string;
   quantity: number;
   price: number;
-  priceName: string;
-  priceUuid: string;
-  lineItemOrder: number;
-  resourceVersion: string;
-  paymentStatus: string;
+  priceName?: string;
+  priceUuid?: string;
+  lineItemOrder?: number;
+  resourceVersion?: string;
+  display?: string;
+  voided?: boolean;
+  voidReason?: string | null;
 }
 
 interface PatientLink {
@@ -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,14 +146,14 @@ export interface PatientInvoice {
   payments: Payment[];
   receiptNumber: string;
   status: string;
-  adjustmentReason: any;
+  adjustmentReason: string | null;
   id: number;
   resourceVersion: string;
 }
 
 export interface PatientDetails {
   name: string;
-  age: string;
+  birthDate: string;
   gender: string;
   city: string;
   county: string;
@@ -155,20 +165,16 @@ export interface FacilityDetail {
   display: string;
 }
 
-export type ServiceConcept = {
-  uuid: any;
+export type ConceptSearchResult = {
+  uuid: string;
   concept: {
     uuid: string;
     display: string;
   };
-  conceptName: {
-    uuid: string;
-    display: string;
-  };
   display: string;
 };
 
-export type BillabeItem = {
+export type BillableItem = {
   uuid: string;
   id?: number;
   name?: string;
@@ -177,7 +183,17 @@ export type BillabeItem = {
 };
 
 export type ServicePrice = {
-  price: string;
+  itemPriceId?: number;
+  name?: string;
+  price: string | number;
+  paymentMode?: {
+    paymentModeId?: number;
+    uuid: string;
+    name: string;
+    description?: string;
+    sortOrder?: number;
+  };
+  billableService?: BillableService;
   uuid: string;
 };
 
@@ -187,10 +203,57 @@ export interface BillableService {
   shortName: string;
   serviceStatus: string;
   serviceType?: {
+    uuid: string;
     display: string;
   };
+  concept?: ConceptSearchResult;
+  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>;
+
+export type PaymentModePayload = {
+  name: string;
+  description: string;
+};