Skip to content

Commit

Permalink
Revert "Update billable services workspace (#267)" (#298)
Browse files Browse the repository at this point in the history
This reverts commit 5b81cb1.
donaldkibet authored Aug 6, 2024
1 parent 5b81cb1 commit baa4d7f
Showing 6 changed files with 14 additions and 428 deletions.
1 change: 0 additions & 1 deletion kenyaemr-esm-3.x
Submodule kenyaemr-esm-3.x deleted from a0a110
Original file line number Diff line number Diff line change
@@ -24,13 +24,12 @@ import {
ErrorState,
navigate,
WorkspaceContainer,
launchWorkspace,
} from '@openmrs/esm-framework';
import { EmptyState } from '@openmrs/esm-patient-common-lib';
import styles from './billable-services.scss';
import { useTranslation } from 'react-i18next';
import { useBillableServices } from './billable-service.resource';
import { ArrowRight, Edit } from '@carbon/react/icons';
import { ArrowRight } from '@carbon/react/icons';

const BillableServices = () => {
const { t } = useTranslation();
@@ -46,12 +45,6 @@ const BillableServices = () => {
const [showOverlay, setShowOverlay] = useState(false);
const [overlayHeader, setOverlayTitle] = useState('');

const handleEditClick = (service) => {
launchWorkspace('update-billable-services-workspace', {
service,
});
};

const headerData = [
{
header: t('serviceName', 'Service Name'),
@@ -110,7 +103,7 @@ const BillableServices = () => {
serviceType: service?.serviceType?.display,
status: service.serviceStatus,
prices: '--',
actions: <Edit onClick={() => handleEditClick(service)} style={{ cursor: 'pointer' }} />,
actions: '--',
};
let cost = '';
service.servicePrices.forEach((price) => {
@@ -145,7 +138,6 @@ const BillableServices = () => {

return (
<>
<WorkspaceContainer overlay contextKey="billable-services" />
{billableServices?.length > 0 ? (
<div className={styles.serviceContainer}>
<FilterableTableHeader

This file was deleted.

This file was deleted.

14 changes: 12 additions & 2 deletions packages/esm-billing-app/src/index.ts
Original file line number Diff line number Diff line change
@@ -22,7 +22,6 @@ import { DeleteBillModal } from './billable-services/bill-manager/modals/delete-
import PriceInfoOrder from './billable-services/billiable-item/test-order/price-info-order.componet';
import ProcedureOrder from './billable-services/billiable-item/test-order/procedure-order.component';
import ImagingOrder from './billable-services/billiable-item/test-order/imaging-order.component';
import UpdateBillableServicesDialog from './billable-services/create-edit/update-billable-service.component';

const moduleName = '@kenyaemr/esm-billing-app';

@@ -63,4 +62,15 @@ export const procedureOrder = getSyncLifecycle(ProcedureOrder, options);
export const imagingOrder = getSyncLifecycle(ImagingOrder, options);
export const drugOrder = getSyncLifecycle(DrugOrder, options);
export const testOrderAction = getSyncLifecycle(TestOrderAction, options);
export const updateBillableServicesWorkspace = getSyncLifecycle(UpdateBillableServicesDialog, options);

// bill manager modals
export const cancelBillModal = getSyncLifecycle(CancelBillModal, options);
export const deleteBillModal = getSyncLifecycle(DeleteBillModal, options);

// bill manager extensions
export const waiveBillForm = getSyncLifecycle(WaiveBillForm, options);
export const editBillForm = getSyncLifecycle(EditBillForm, options);

export function startupApp() {
defineConfigSchema(moduleName, configSchema);
}
9 changes: 0 additions & 9 deletions packages/esm-billing-app/src/routes.json
Original file line number Diff line number Diff line change
@@ -118,15 +118,6 @@
"slot": "tests-ordered-actions-slot",
"order": 0
}

],
"workspaces": [
{
"name": "update-billable-services-workspace",
"title": "Update Billable Services",
"component": "updateBillableServicesWorkspace",
"type": "workspace"
}
],
"workspaces": [
{

0 comments on commit baa4d7f

Please sign in to comment.