@openmrs/esm-billing-app 1.0.2-pre.866 → 1.0.2-pre.873

package/src/index.ts

@@ -3,6 +3,9 @@ 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 { Wallet, Money, Settings } from '@carbon/react/icons';
+import { createBillableServicesLeftPanelLink } from './billable-services/billable-services-left-panel-link.component';
+import { createBillableServicesLeftPanelMenu } from './billable-services/billable-services-left-panel-menu.component';
 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';
@@ -15,7 +18,6 @@ import EditBillableServiceModal from './billable-services/create-edit/edit-billa
 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';
 
 const moduleName = '@openmrs/esm-billing-app';
@@ -70,9 +72,54 @@ export const editBillLineItemModal = getSyncLifecycle(EditBillLineItemModal, opt
 
 export const root = getSyncLifecycle(RootComponent, options);
 
-export const serviceMetrics = getSyncLifecycle(ServiceMetrics, options);
-
 export const visitAttributeTags = getSyncLifecycle(VisitAttributeTags, options);
 
 // t('billingForm', 'Billing form')
 export const billingFormWorkspace = getAsyncLifecycle(() => import('./billing-form/billing-form.component'), options);
+
+// t('billableServices', 'Billable Services')
+export const billableServicesLeftPanelLink = getSyncLifecycle(
+  createBillableServicesLeftPanelLink({
+    name: 'billable-services',
+    title: 'Billable Services',
+    path: '',
+    icon: Wallet,
+  }),
+  options,
+);
+
+// t('billWaiver', 'Bill waiver')
+export const billWaiverLeftPanelLink = getSyncLifecycle(
+  createBillableServicesLeftPanelLink({
+    name: 'bill-waiver',
+    title: 'Bill waiver',
+    path: 'waive-bill',
+    icon: Money,
+    privilege: 'coreapps.systemAdministration',
+  }),
+  options,
+);
+
+// t('billingSettings', 'Billing settings')
+// t('cashPointConfig', 'Cash point configuration')
+// t('paymentModesConfig', 'Payment modes configuration')
+export const billingSettingsLeftPanelMenu = getSyncLifecycle(
+  createBillableServicesLeftPanelMenu({
+    title: 'Billing settings',
+    icon: Settings,
+    privilege: 'coreapps.systemAdministration',
+    items: [
+      {
+        name: 'cash-point-config',
+        title: 'Cash point configuration',
+        path: 'cash-point-config',
+      },
+      {
+        name: 'payment-modes-config',
+        title: 'Payment modes configuration',
+        path: 'payment-modes-config',
+      },
+    ],
+  }),
+  options,
+);

package/src/routes.json

@@ -75,9 +75,22 @@
       "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": "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": [

package/translations/en.json

@@ -22,6 +22,7 @@
   "billableService": "Billable service",
   "billableServices": "Billable services",
   "billableServices__lower": "billable services",
+  "billableServicesManagement": "Billable services management",
   "billAmount": "Bill amount",
   "billCode": "Bill code",
   "billCreatedSuccessfully": "Bill created successfully",
@@ -44,7 +45,6 @@
   "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",
-  "billServicesManagement": "Bill services management",
   "billsTable": "Bills table",
   "billTotal": "Bill total",
   "billWaiver": "Bill waiver",
@@ -122,7 +122,6 @@
   "loadingBillItems": "Loading bill items",
   "loadingBillMetrics": "Loading bill metrics",
   "loadingDescription": "Loading",
-  "loadingServiceMetrics": "Loading service metrics",
   "location": "Location",
   "locationRequired": "Location is required",
   "manageBillableServices": "Manage billable services",
@@ -194,7 +193,6 @@
   "selectServiceType": "Select service type",
   "sellingPrice": "Selling price",
   "serviceList": "Service list",
-  "serviceMetrics": "Service metrics",
   "serviceName": "Service name",
   "serviceNameExceedsLimit": "Service name exceeds the character limit of {{MAX_NAME_LENGTH}}.",
   "serviceNameRequired": "Service name is required",