@openmrs/esm-billing-app 1.0.2-pre.88 → 1.0.2-pre.880

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,7 +146,7 @@ export interface PatientInvoice {
   payments: Payment[];
   receiptNumber: string;
   status: string;
-  adjustmentReason: any;
+  adjustmentReason: string | null;
   id: number;
   resourceVersion: 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,52 @@ 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>;

package/translations/am.json

@@ -1,170 +1,222 @@
 {
-  "actions": "Actions",
-  "addBill": "Add bill item(s)",
-  "addBillableServices": "Add Billable Services",
-  "addCashPoint": "Add Cash Point",
+  "add": "Add",
+  "addBill": "Add bill items",
+  "addBillableService": "Add billable service",
+  "addCashPoint": "Add cash point",
   "addNewBillableService": "Add new billable service",
+  "addNewCashPoint": "Add new cash point",
+  "addNewPaymentMode": "Add new payment mode",
   "addNewService": "Add new service",
-  "addPaymentMode": "Add Payment Mode",
-  "addPaymentOptions": "Add payment option",
+  "addPaymentMethod": "Add payment method",
+  "addPaymentMode": "Add payment mode",
+  "addPaymentOption": "Add payment option",
   "amount": "Amount",
-  "amountDue": "Amount Due",
+  "amountDue": "Amount due",
+  "amountMustBePositive": "Amount must be greater than 0",
+  "amountRequired": "Amount is required",
+  "amountTendered": "Amount tendered",
   "amountToWaiveAriaLabel": "Enter amount to waive",
   "amountToWaiveHelper": "Specify the amount to be deducted from the bill",
-  "amountToWaiveLabel": "Amount to Waive",
+  "amountToWaiveLabel": "Amount to waive",
+  "associatedConcept": "Associated concept",
   "billableService": "Billable service",
-  "billableServices": "Billable Services",
-  "billedItems": "Billed Items",
+  "billableServices": "Billable services",
+  "billableServices__lower": "billable services",
+  "billableServicesManagement": "Billable services management",
+  "billAmount": "Bill amount",
+  "billCode": "Bill code",
+  "billCreatedSuccessfully": "Bill created successfully",
+  "billCreationError": "Bill creation error",
+  "billedItems": "Billed items",
   "billedTo": "Billed to",
-  "billErrorService": "Bill service error",
+  "billErrorService": "Billing service error",
   "billing": "Billing",
   "billingForm": "Billing form",
-  "billingHistory": "Billing History",
-  "billingSettings": "Billing Settings",
+  "billingHistory": "Billing history",
+  "billingSettings": "Billing settings",
   "billItem": "Bill item",
-  "billItems": "Bill Items",
+  "billItems": "Bill items",
   "billLineItemEmpty": "This bill has no line items",
   "billList": "Bill list",
   "billMetrics": "Bill metrics",
-  "billName": " {{billName}} ",
+  "billName": "{{billName}}",
   "billPayment": "Bill payment",
   "billPaymentError": "Bill payment error",
-  "billPaymentRequiredMessage": "The current patient has pending bill. Advice patient to settle bill before receiving services",
-  "billServicesManagement": "Bill services management",
-  "billsList": "Bill list",
+  "billPaymentRequiredMessage": "The current patient has a pending bill. Advise the patient to settle the bill before receiving services",
+  "billProcessedSuccessfully": "Bill processed successfully",
+  "billProcessingError": "Bill processing error",
+  "billsTable": "Bills table",
   "billTotal": "Bill total",
   "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",
+  "cashPointConfig": "Cash point configuration",
+  "cashPointHistory": "Cash point history",
+  "cashPointLocation": "Cash point location",
+  "cashPointName": "Cash point name",
+  "cashPointNamePlaceholder": "For example, Pharmacy Cash Point",
+  "cashPointNameRequired": "Cash point name is required",
   "cashPointSaved": "Cash point was successfully saved.",
-  "cashPointUuid": "Cash Point UUID",
+  "cashPointUuid": "Cash point UUID",
   "cashPointUuidPlaceholder": "Enter UUID",
   "checkFilters": "Check the filters above",
-  "clearSearchInput": "Clear search input",
-  "clientBalance": "Client Balance",
   "confirmDeleteMessage": "Are you sure you want to delete this payment mode? Proceed cautiously.",
   "createdSuccessfully": "Billable service created successfully",
+  "cumulativeBills": "Cumulative bills",
   "currentPrice": "Current price",
-  "delete": "Delete",
-  "deletePaymentMode": "Delete Payment Mode",
+  "date": "Date",
+  "dateAndTime": "Date and time",
+  "dateOfPayment": "Date of payment",
+  "deletePaymentMode": "Delete payment mode",
+  "deleting": "Deleting",
   "description": "Description",
-  "descriptionPlaceholder": "e.g., Used for all cash transactions",
+  "descriptionPlaceholder": "For example, Used for all cash transactions",
   "discard": "Discard",
   "discount": "Discount",
-  "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",
+  "discountAmount": "Discount amount",
   "editBillableService": "Edit billable service",
-  "editBillableServices": "Edit Billable Services",
-  "editBillLineItem": "Edit bill line item?",
+  "editBillLineItem": "Edit bill line item",
   "editThisBillItem": "Edit this bill item",
   "enterAmount": "Enter amount",
-  "enterConcept": "Associated concept",
-  "enterReferenceNumber": "Enter ref. number",
-  "error": "Error",
+  "enterReferenceNumber": "Enter reference number",
+  "enterSellingPrice": "Enter selling price",
+  "enterServiceName": "Enter service name",
+  "enterServiceShortName": "Enter service short name",
+  "errorCreatingBill": "An error occurred while creating the bill",
   "errorDeletingPaymentMode": "An error occurred while deleting the payment mode.",
   "errorFetchingCashPoints": "An error occurred while fetching cash points.",
   "errorFetchingLocations": "An error occurred while fetching locations.",
   "errorFetchingPaymentModes": "An error occurred while fetching payment modes.",
+  "errorLoadingBillableServices": "Error loading billable services",
   "errorLoadingBillServices": "Error loading bill services",
   "errorLoadingPaymentModes": "Payment modes error",
+  "errorPrintingInvoice": "Error printing invoice",
+  "errorProcessingPayment": "Error processing payment",
   "errorSavingCashPoint": "An error occurred while saving the cash point.",
   "errorSavingPaymentMode": "An error occurred while saving the payment mode.",
-  "filterBy": "Filter by",
+  "filterBy": "Filter by:",
   "filterTable": "Filter table",
   "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",
+  "invoiceDate": "Invoice date",
   "invoiceError": "Invoice error",
+  "invoiceLineItems": "Invoice line items",
+  "invoiceNumber": "Invoice #",
+  "invoiceStatus": "Invoice status",
   "item": "Item",
   "itemsToBeBilled": "Items to be billed",
   "launchBillForm": "Launch bill form",
   "lineItems": "Line items",
-  "loading": "Loading data...",
-  "loadingBillingServices": "Loading billing services...",
+  "lineItemUpdated": "Line item updated",
+  "lineItemUpdateErrorDefault": "Unable to update the bill line item. Please try again.",
+  "lineItemUpdateFailed": "Failed to update line item",
+  "lineItemUpdateSuccess": "The bill line item has been updated successfully",
+  "loading": "Loading data",
+  "loadingBillInfo": "Loading bill information",
+  "loadingBillingServices": "Loading billing services",
+  "loadingBillItems": "Loading bill items",
+  "loadingBillMetrics": "Loading bill metrics",
   "loadingDescription": "Loading",
-  "location": "Select Location",
+  "location": "Location",
+  "locationRequired": "Location is required",
   "manageBillableServices": "Manage billable services",
   "name": "Name",
   "nextPage": "Next page",
-  "noBilltoDisplay": "There are no bills to display for this patient",
+  "noBillToDisplay": "There are no bills to display for this patient",
   "noMatchingBillsToDisplay": "No matching bills to display",
   "noMatchingItemsToDisplay": "No matching items to display",
   "noMatchingServicesToDisplay": "No matching services to display",
-  "noResultsFor": "No results for",
-  "noResultsFound": "No results found",
-  "noServicesToDisplay": "There are no services to display",
+  "noResultsFor": "No results for {{searchTerm}}",
+  "number": "Number",
   "ok": "OK",
-  "patientBillingAlert": "Patient Billing Alert",
-  "patientBills": "Patient bill",
+  "paidBills": "Paid bills",
+  "patientBill": "Patient bill",
+  "patientBillingAlert": "Patient billing alert",
+  "patientBills": "Patient bills",
   "patientBillsDescription": "List of patient bills",
   "patientCategory": "Patient category",
-  "paymentDetails": "Payment Details",
+  "paymentAmountCannotExceedAmountDue": "Payment amount cannot exceed amount due",
+  "paymentDetails": "Payment details",
   "paymentMethod": "Payment method",
+  "paymentMethodRequired": "Payment method is required for all items",
   "paymentMethods": "Payment methods",
-  "paymentMode": "Payment Mode",
+  "paymentMode": "Payment mode",
   "paymentModeDeleted": "Payment mode was successfully deleted.",
-  "paymentModeHistory": "Payment Mode History",
-  "paymentModeName": "Payment Mode Name",
-  "paymentModeNamePlaceholder": "e.g., Cash, Credit Card",
+  "paymentModeHistory": "Payment mode history",
+  "paymentModeNameLabel": "Payment mode name",
+  "paymentModeNamePlaceholder": "For example, Cash, Credit Card",
+  "paymentModeNameRequired": "Payment mode name is required",
+  "paymentModeNameToDelete": "Payment mode name: {{paymentModeName}}",
+  "paymentModeRequired": "Payment mode is required",
   "paymentModeSaved": "Payment mode was successfully saved.",
-  "paymentModesConfig": "Payment Modes Config",
+  "paymentModesConfig": "Payment modes configuration",
+  "paymentOptionRequired": "At least one payment option is required",
+  "paymentProcessedSuccessfully": "Payment processed successfully",
   "payments": "Payments",
-  "pleaseRequiredFields": "Please fill all required fields",
+  "pendingBills": "Pending bills",
   "policyNumber": "Policy number",
   "postWaiver": "Post waiver",
   "previousPage": "Previous page",
   "price": "Price",
   "priceIsRequired": "Price is required",
+  "priceMustBeNumber": "Price must be a valid number",
+  "priceMustBePositive": "Price must be greater than 0",
   "prices": "Prices",
   "printBill": "Print bill",
   "printReceipt": "Print receipt",
-  "processPayment": "Process Payment",
+  "processPayment": "Process payment",
   "quantity": "Quantity",
-  "quantityGreaterThanZero": "Quantity must be greater than zero",
+  "quantityCannotExceed100": "Quantity cannot exceed 100",
+  "quantityMustBeAtLeastOne": "Quantity must be at least 1",
+  "quantityMustBeInteger": "Quantity must be a whole number",
+  "quantityMustBeNumber": "Quantity must be a valid number",
   "quantityRequired": "Quantity is required",
   "referenceNumber": "Reference number",
-  "save": "Save",
+  "remove": "Remove",
+  "removePaymentMethod": "Remove payment method",
   "saveAndClose": "Save and close",
+  "saveBill": "Save bill",
   "saving": "Saving",
   "searchConcepts": "Search associated concept",
   "searching": "Searching",
   "searchItems": "Search items and services",
   "searchThisTable": "Search this table",
-  "selectBillableService": "Select a billable service...",
-  "selectCategory": "Select category",
+  "selectBillableService": "Select a billable service",
+  "selectedItems": "Selected items",
+  "selectLocation": "Select location",
   "selectPatientCategory": "Select patient category",
   "selectPaymentMethod": "Select payment method",
-  "sellingAmount": "Enter selling price",
-  "sellingPrice": "Selling Price",
-  "service": "Service",
-  "serviceMetrics": "Service Metrics",
-  "serviceName": "Service Name",
-  "serviceNameExceedsLimit": "Service Name exceeds the character limit of {{MAX_NAME_LENGTH}}.",
-  "serviceShortName": "Short Name",
+  "selectPaymentMode": "Select payment mode",
+  "selectServiceType": "Select service type",
+  "sellingPrice": "Selling price",
+  "serviceList": "Service list",
+  "serviceName": "Service name",
+  "serviceNameExceedsLimit": "Service name exceeds the character limit of {{MAX_NAME_LENGTH}}.",
+  "serviceNameRequired": "Service name is required",
   "servicesList": "Services list",
-  "serviceType": "Service Type",
-  "shortName": "Short Name",
-  "shortNameExceedsLimit": "Short Name exceeds the character limit of {{MAX_NAME_LENGTH}}.",
-  "status": "Service Status",
-  "stockItem": "Stock Item",
-  "submitting": "Submitting...",
+  "serviceStatus": "Service status",
+  "serviceType": "Service type",
+  "serviceTypeRequired": "Service type is required",
+  "shortName": "Short name",
+  "shortNameExceedsLimit": "Short name exceeds the character limit of {{MAX_NAME_LENGTH}}.",
+  "status": "Service status",
+  "submitting": "Submitting",
   "success": "Success",
   "total": "Total",
-  "totalAmount": "Total Amount",
-  "totalTendered": "Total Tendered",
+  "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",
+  "validationError": "Validation error",
   "visitTime": "Visit time",
   "waiverForm": "Waiver form"
 }