@kenyaemr/esm-billing-app 5.3.10-pre.1666 → 5.3.10-pre.1678

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[{"component":"billableServicesHome","route":"billable-services"},{"component":"requirePaymentModal","routeRegex":"^patient/.+/chart","online":true,"offline":false}],"extensions":[{"component":"billingDashboardLink","name":"billing-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"billing","title":"billing","slot":"billing-dashboard-slot"}},{"component":"benefitsPackageDashboardLink","name":"benefits-package-dashboard-link","slot":"patient-chart-dashboard-slot","meta":{"name":"benefits-package","slot":"patient-chart-benefits-dashboard-slot","path":"insurance-benefits","columns":1,"columnSpan":1},"featureFlag":"healthInformationExchange"},{"component":"benefitsPackage","name":"benefits-package","slot":"patient-chart-benefits-dashboard-slot"},{"component":"root","name":"billing-dashboard-root","slot":"billing-dashboard-slot"},{"component":"benefitsEligibilyRequestForm","name":"benefits-eligibility-request-form"},{"component":"benefitsPreAuthForm","name":"benefits-pre-auth-form"},{"name":"billing-patient-summary","component":"billingPatientSummary","slot":"patient-chart-billing-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"billing-summary-dashboard-link","component":"billingSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":11,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-billing-dashboard-slot","path":"Billing","layoutMode":"anchored"}},{"name":"billing-check-in-form","slot":"extra-visit-attribute-slot","component":"billingCheckInForm"},{"name":"require-billing-modal","component":"requirePaymentModal"},{"name":"patient-banner-billing-tags","component":"visitAttributeTags","slot":"patient-banner-tags-slot","order":2},{"name":"initiate-payment-modal","component":"initiatePaymentDialog"},{"name":"delete-billableservice-modal","component":"deleteBillableServiceModal"},{"name":"refund-bill-modal","component":"refundBillModal"},{"name":"delete-bill-modal","component":"deleteBillModal"},{"name":"lab-order-billable-item","component":"labOrder","slot":"top-of-lab-order-form-slot"},{"name":"procedure-order-billable-item","component":"procedureOrder","slot":"top-of-procedure-order-form-slot"},{"name":"imaging-order-billable-item","component":"imagingOrder","slot":"top-of-imaging-order-form-slot"},{"name":"price-info-order","component":"priceInfoOrder"},{"name":"drug-order-billable-item","component":"drugOrder","slot":"medication-info-slot"},{"name":"billing-test-order-action","component":"testOrderAction","slot":"tests-ordered-actions-slot","order":0},{"component":"billingOverviewLink","name":"billing-overview-link","slot":"billing-dashboard-link-slot"},{"component":"paymentHistoryLink","name":"payment-history-link","slot":"billing-dashboard-link-slot"},{"component":"paymentPointsLink","name":"payment-points-link","slot":"billing-dashboard-link-slot"},{"component":"paymentModesLink","name":"payment-modes-link","slot":"billing-dashboard-link-slot"},{"component":"billManagerLink","name":"bill-manager-link","slot":"billing-dashboard-link-slot"},{"component":"chargeableItemsLink","name":"chargeable-items-link","slot":"billing-dashboard-link-slot"},{"component":"billableExemptionsLink","name":"billable-exemptions-link","slot":"billing-dashboard-link-slot"},{"component":"claimsManagementSideNavGroup","name":"claims-management-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"claims-management","title":"Claims management Overview","slot":"case-management-slot"},"featureFlag":"healthInformationExchange"},{"component":"claimsManagementOverviewDashboardLink","name":"claims-management-overview-link","slot":"claims-management-dashboard-link-slot"},{"component":"preAuthRequestsDashboardLink","name":"preauthrequest-overview-link","slot":"claims-management-dashboard-link-slot"},{"component":"claimsOverview","name":"claims-overview-dashboard-link","slot":"claims-management-overview-slot"},{"component":"waiveBillActionButton","name":"waive-bill-action-button","slot":"bill-actions-slot"},{"component":"deleteBillActionButton","name":"delete-bill-action-button","slot":"bill-actions-slot"},{"component":"refundLineItem","name":"refund-line-item","slot":"bill-actions-overflow-menu-slot"},{"name":"edit-line-item","component":"editLineItem","slot":"bill-actions-overflow-menu-slot"},{"name":"cancel-line-item","component":"cancelLineItem","slot":"bill-actions-overflow-menu-slot"}],"workspaces":[{"name":"waive-bill-form","component":"waiveBillForm","title":"Waive Bill Form","type":"other-form"},{"name":"edit-bill-form","component":"editBillForm","title":"Edit Bill Form","type":"other-form"},{"name":"billable-service-form","component":"addServiceForm","title":"Create Charge Item Form","type":"other-form"},{"name":"commodity-form","component":"addCommodityForm","title":"Create Charge Item Form","type":"other-form"},{"name":"billing-form","component":"billingForm","title":"Billing Form","type":"other-form","width":"extra-wide"},{"name":"payment-mode-workspace","component":"paymentModeWorkspace","title":"Payment Mode Workspace","type":"other-form"},{"name":"cancel-bill-workspace","component":"cancelBillWorkspace","title":"Cancel Bill Workspace","type":"other-form"}],"modals":[{"name":"create-payment-point","component":"createPaymentPoint"},{"name":"clock-out-modal","component":"clockOut"},{"name":"bulk-import-billable-services-modal","component":"bulkImportBillableServicesModal"},{"name":"delete-payment-mode-modal","component":"deletePaymentModeModal"},{"name":"retry-claim-request-modal","component":"retryClaimRequestModal"},{"name":"paid-bill-receipt-print-preview-modal","component":"paidBillReceiptPrintPreviewModal"},{"name":"clock-in-modal","component":"clockIn"}],"version":"5.3.10-pre.1666"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[{"component":"billableServicesHome","route":"billable-services"},{"component":"requirePaymentModal","routeRegex":"^patient/.+/chart","online":true,"offline":false}],"extensions":[{"component":"billingDashboardLink","name":"billing-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"billing","title":"billing","slot":"billing-dashboard-slot"}},{"component":"benefitsPackageDashboardLink","name":"benefits-package-dashboard-link","slot":"patient-chart-dashboard-slot","meta":{"name":"benefits-package","slot":"patient-chart-benefits-dashboard-slot","path":"insurance-benefits","columns":1,"columnSpan":1},"featureFlag":"healthInformationExchange"},{"component":"benefitsPackage","name":"benefits-package","slot":"patient-chart-benefits-dashboard-slot"},{"component":"root","name":"billing-dashboard-root","slot":"billing-dashboard-slot"},{"component":"benefitsEligibilyRequestForm","name":"benefits-eligibility-request-form"},{"component":"benefitsPreAuthForm","name":"benefits-pre-auth-form"},{"name":"billing-patient-summary","component":"billingPatientSummary","slot":"patient-chart-billing-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"billing-summary-dashboard-link","component":"billingSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":11,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-billing-dashboard-slot","path":"Billing","layoutMode":"anchored"}},{"name":"billing-check-in-form","slot":"extra-visit-attribute-slot","component":"billingCheckInForm"},{"name":"require-billing-modal","component":"requirePaymentModal"},{"name":"patient-banner-billing-tags","component":"visitAttributeTags","slot":"patient-banner-tags-slot","order":2},{"name":"initiate-payment-modal","component":"initiatePaymentDialog"},{"name":"delete-billableservice-modal","component":"deleteBillableServiceModal"},{"name":"refund-bill-modal","component":"refundBillModal"},{"name":"delete-bill-modal","component":"deleteBillModal"},{"name":"lab-order-billable-item","component":"labOrder","slot":"top-of-lab-order-form-slot"},{"name":"procedure-order-billable-item","component":"procedureOrder","slot":"top-of-procedure-order-form-slot"},{"name":"imaging-order-billable-item","component":"imagingOrder","slot":"top-of-imaging-order-form-slot"},{"name":"price-info-order","component":"priceInfoOrder"},{"name":"drug-order-billable-item","component":"drugOrder","slot":"medication-info-slot"},{"name":"billing-test-order-action","component":"testOrderAction","slot":"tests-ordered-actions-slot","order":0},{"component":"billingOverviewLink","name":"billing-overview-link","slot":"billing-dashboard-link-slot"},{"component":"paymentHistoryLink","name":"payment-history-link","slot":"billing-dashboard-link-slot"},{"component":"paymentPointsLink","name":"payment-points-link","slot":"billing-dashboard-link-slot"},{"component":"paymentModesLink","name":"payment-modes-link","slot":"billing-dashboard-link-slot"},{"component":"billManagerLink","name":"bill-manager-link","slot":"billing-dashboard-link-slot"},{"component":"chargeableItemsLink","name":"chargeable-items-link","slot":"billing-dashboard-link-slot"},{"component":"billableExemptionsLink","name":"billable-exemptions-link","slot":"billing-dashboard-link-slot"},{"component":"claimsManagementSideNavGroup","name":"claims-management-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"claims-management","title":"Claims management Overview","slot":"case-management-slot"},"featureFlag":"healthInformationExchange"},{"component":"claimsManagementOverviewDashboardLink","name":"claims-management-overview-link","slot":"claims-management-dashboard-link-slot"},{"component":"preAuthRequestsDashboardLink","name":"preauthrequest-overview-link","slot":"claims-management-dashboard-link-slot"},{"component":"claimsOverview","name":"claims-overview-dashboard-link","slot":"claims-management-overview-slot"},{"component":"waiveBillActionButton","name":"waive-bill-action-button","slot":"bill-actions-slot"},{"component":"deleteBillActionButton","name":"delete-bill-action-button","slot":"bill-actions-slot"},{"component":"refundLineItem","name":"refund-line-item","slot":"bill-actions-overflow-menu-slot"},{"name":"edit-line-item","component":"editLineItem","slot":"bill-actions-overflow-menu-slot"},{"name":"cancel-line-item","component":"cancelLineItem","slot":"bill-actions-overflow-menu-slot"}],"workspaces":[{"name":"waive-bill-form","component":"waiveBillForm","title":"Waive Bill Form","type":"other-form"},{"name":"edit-bill-form","component":"editBillForm","title":"Edit Bill Form","type":"other-form"},{"name":"billable-service-form","component":"addServiceForm","title":"Create Charge Item Form","type":"other-form"},{"name":"commodity-form","component":"addCommodityForm","title":"Create Charge Item Form","type":"other-form"},{"name":"billing-form","component":"billingForm","title":"Billing Form","type":"other-form","width":"extra-wide"},{"name":"payment-mode-workspace","component":"paymentModeWorkspace","title":"Payment Mode Workspace","type":"other-form"},{"name":"cancel-bill-workspace","component":"cancelBillWorkspace","title":"Cancel Bill Workspace","type":"other-form"}],"modals":[{"name":"create-payment-point","component":"createPaymentPoint"},{"name":"clock-out-modal","component":"clockOut"},{"name":"bulk-import-billable-services-modal","component":"bulkImportBillableServicesModal"},{"name":"delete-payment-mode-modal","component":"deletePaymentModeModal"},{"name":"retry-claim-request-modal","component":"retryClaimRequestModal"},{"name":"paid-bill-receipt-print-preview-modal","component":"paidBillReceiptPrintPreviewModal"},{"name":"clock-in-modal","component":"clockIn"}],"version":"5.3.10-pre.1678"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-billing-app",
-  "version": "5.3.10-pre.1666",
+  "version": "5.3.10-pre.1678",
   "description": "Billing app for KenyaEMR",
   "browser": "dist/kenyaemr-esm-billing-app.js",
   "main": "src/index.ts",

package/src/billable-services/billiable-item/test-order/test-order-action.component.tsx

@@ -56,7 +56,7 @@ const TestOrderAction: React.FC<TestOrderProps> = (props) => {
       order,
       ...(additionalProps && { additionalProps }),
     });
-  }, [order, additionalProps, modalName, handleModalClose]);
+  }, [isDispenseOrder, modalName, order, additionalProps, dispenseFormProps, handleModalClose]);
 
   if (isLoading) {
     return (
@@ -80,6 +80,7 @@ const TestOrderAction: React.FC<TestOrderProps> = (props) => {
     <Button
       kind="primary"
       className={!isDispenseOrder ? styles.actionButton : ''}
+      size={!isDispenseOrder ? 'md' : ''}
       disabled={hasPendingPayment}
       onClick={launchModal}>
       {buttonText}

package/src/hooks/useInterventions.ts

@@ -1,22 +1,42 @@
-import { FetchResponse, openmrsFetch, useConfig } from '@openmrs/esm-framework';
+import { FetchResponse, openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
 import useSWR from 'swr';
-import { BillingConfig } from '../config-schema';
 import { SHAIntervension } from '../types';
-import { interventions } from './benefits.mock';
 
 export const useInterventions = (code: string) => {
-  const { hieBaseUrl } = useConfig<BillingConfig>();
-
-  const url = `${hieBaseUrl}/master/benefit-master/code?searchKey=${code}`;
-  const { isLoading, error, data } = useSWR<Array<SHAIntervension>>(url, async (key) => {
-    await new Promise((resolve, reject) => {
-      setTimeout(resolve, 2000);
+  const fetcher = (url: string) => {
+    return openmrsFetch(url, {
+      method: 'POST',
+      body: {
+        searchKeyAndValues: {
+          // scheme_code: 'UHC',
+          package_code: code,
+        },
+      },
     });
-    return interventions?.filter((inter) => inter.interventionCode.includes(code));
-  });
+  };
+  const url = `${restBaseUrl}/insuranceclaims/claims/interventions/query?code=${code}`;
+  const { isLoading, error, data } = useSWR<
+    FetchResponse<{
+      status: string;
+      data: Array<{
+        interventionName: string;
+        interventionCode: string;
+        interventionPackage: string;
+        interventionSubPackage: string;
+        interventionDescription?: string;
+      }>;
+    }>
+  >(url, fetcher);
   return {
     isLoading,
-    interventions: data ?? [],
+    interventions: (data?.data?.data ?? []).map(
+      ({ interventionCode, interventionName, interventionPackage, interventionSubPackage, interventionDescription }) =>
+        ({
+          interventionCode,
+          subCategoryBenefitsPackage: interventionSubPackage,
+          interventionName,
+        } as SHAIntervension),
+    ),
     error,
   };
 };

package/src/hooks/usePackages.ts

@@ -1,35 +1,27 @@
-import { FetchResponse, openmrsFetch, useConfig } from '@openmrs/esm-framework';
+import { FetchResponse, openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
 import useSWR from 'swr';
-import { BillingConfig } from '../config-schema';
 import { Package } from '../types';
-import { category } from './benefits.mock';
 
 /**
  * Hook that return a list of sha benefits category/packages
  * @returns
  */
 const usePackages = () => {
-  const { hieBaseUrl } = useConfig<BillingConfig>();
-  const url = `${hieBaseUrl}/master/category/all-`;
+  const url = `${restBaseUrl}/insuranceclaims/claims/benefit-package`;
 
-  const { data, isLoading, error } = useSWR<Array<{ id: number; code: string; categoryName: string }>>(
+  const { data, isLoading, error } = useSWR<FetchResponse<Array<{ code: string; name: string; description: string }>>>(
     url,
-    async () => {
-      await new Promise((resolve, reject) => {
-        setTimeout(resolve, 2000);
-      });
-      return category;
-    },
+    openmrsFetch,
   );
 
   return {
     isLoading,
-    packages: (data ?? []).map(
+    packages: (data?.data ?? []).map(
       (category) =>
         ({
-          uuid: `${category.id}`,
+          uuid: `${category.code}`,
           packageCode: category.code,
-          packageName: category.categoryName,
+          packageName: category.name,
         } as Package),
     ),
     error,

package/src/invoice/invoice.component.tsx

@@ -23,7 +23,7 @@ import { LineItem } from '../types';
 import InvoiceTable from './invoice-table.component';
 import styles from './invoice.scss';
 import Payments from './payments/payments.component';
-import PrintPaidBillReceiptAction from './print-bill-receipt/print-receipt-action.component';
+import ReceiptPrintButton from './print-bill-receipt/receipt-print-button.component';
 import PrintableInvoice from './printable-invoice/printable-invoice.component';
 
 interface InvoiceDetailsProps {
@@ -130,7 +130,7 @@ const Invoice: React.FC = () => {
         </section>
       </div>
       <div className={styles.actionArea}>
-        <PrintPaidBillReceiptAction bill={bill} />
+        <ReceiptPrintButton bill={bill} />
         <Button
           onClick={handlePrint}
           kind="tertiary"

package/src/invoice/print-bill-receipt/receipt-print-button.component.tsx

@@ -0,0 +1,55 @@
+import { Button } from '@carbon/react';
+import { Printer } from '@carbon/react/icons';
+import { showModal } from '@openmrs/esm-framework';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { MappedBill, PaymentStatus } from '../../types';
+
+interface ReceiptPrintButtonProps {
+  bill: MappedBill;
+}
+
+const ReceiptPrintButton: React.FC<ReceiptPrintButtonProps> = ({ bill }) => {
+  const { t } = useTranslation();
+
+  const isPrintingDisabled = shouldDisablePrinting(bill);
+
+  const handlePrintClick = () => {
+    const dispose = showModal('paid-bill-receipt-print-preview-modal', {
+      onClose: () => dispose(),
+      bill,
+    });
+  };
+
+  return (
+    <Button
+      kind="secondary"
+      size="sm"
+      disabled={isPrintingDisabled}
+      onClick={handlePrintClick}
+      renderIcon={Printer}
+      iconDescription={t('printReceipt', 'Print receipt')}>
+      {t('printReceipt', 'Print receipt')}
+    </Button>
+  );
+};
+
+/**
+ * Determines if receipt printing should be disabled based on bill status
+ * @param bill - The bill to check
+ * @returns true if printing should be disabled, false otherwise
+ */
+function shouldDisablePrinting(bill: MappedBill): boolean {
+  const hasPayments = bill.payments.length > 0;
+  const hasExemptedItems = bill.lineItems.some((item) => item.paymentStatus === PaymentStatus.EXEMPTED);
+
+  // If there are exempted items, we need special handling
+  if (hasExemptedItems) {
+    return !hasExemptedItems;
+  }
+
+  // For regular bills, disable if there are no payments
+  return !hasPayments;
+}
+
+export default ReceiptPrintButton;

package/translations/en.json

@@ -234,7 +234,6 @@
   "printingInvoice": "Printing invoice...",
   "printInvoice": "Print invoice",
   "printReceipt": "Print receipt",
-  "printRecept": "Print receipt",
   "proceedToCare": "Proceed to care",
   "processClaim": "Process Claim",
   "processing": "Processing...",