@openmrs/esm-billing-app 1.0.2-pre.957 → 1.0.2-pre.958

package/dist/openmrs-esm-billing-app.js.buildmanifest.json

@@ -665,9 +665,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 43608,
+      "size": 43617,
       "sizes": {
-        "javascript": 43608
+        "javascript": 43617
       },
       "names": [],
       "idHints": [],
@@ -681,7 +681,7 @@
       "auxiliaryFiles": [
         "4739.js.map"
       ],
-      "hash": "9e4b1737c952553a",
+      "hash": "23dcc92713f643e8",
       "childrenByOrder": {}
     },
     {
@@ -1187,9 +1187,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1109251,
+      "size": 1109271,
       "sizes": {
-        "javascript": 1109209,
+        "javascript": 1109229,
         "consume-shared": 42
       },
       "names": [],
@@ -1203,7 +1203,7 @@
       "auxiliaryFiles": [
         "8572.js.map"
       ],
-      "hash": "b0b9fbd71c110b36",
+      "hash": "889be701a774d105",
       "childrenByOrder": {}
     },
     {
@@ -1260,10 +1260,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 5390873,
+      "size": 5390893,
       "sizes": {
         "consume-shared": 210,
-        "javascript": 5368221,
+        "javascript": 5368241,
         "share-init": 336,
         "runtime": 22106
       },
@@ -1280,7 +1280,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "27d37f680c3d59ae",
+      "hash": "42203052844b409c",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.24.0","fhir2":">=1.2"},"pages":[{"component":"billableServicesHome","route":"billable-services"}],"extensions":[{"component":"billingDashboardLink","name":"billing-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"billing","title":"billing","slot":"billing-dashboard-slot"}},{"component":"root","name":"billing-dashboard-root","slot":"billing-dashboard-slot"},{"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 history"}},{"name":"billable-services-app-menu-item","component":"billableServicesAppMenuItem","slot":"app-menu-item-slot","meta":{"name":"Billable Services"}},{"name":"billing-checkin-form","slot":"extra-visit-attribute-slot","component":"billingCheckInForm"},{"slot":"system-admin-page-card-link-slot","component":"billableServicesCardLink","name":"billable-services-admin-card-link"},{"name":"patient-banner-billing-tags","component":"visitAttributeTags","slot":"patient-banner-tags-slot","order":2},{"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":[{"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"}],"workspaces":[{"name":"billing-form-workspace","title":"billingForm","component":"billingFormWorkspace","type":"form"},{"name":"billable-service-form","title":"billableServiceForm","component":"billableServiceFormWorkspace","type":"form","width":"wider"}],"version":"1.0.2-pre.957"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.24.0","fhir2":">=1.2"},"pages":[{"component":"billableServicesHome","route":"billable-services"}],"extensions":[{"component":"billingDashboardLink","name":"billing-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"billing","title":"billing","slot":"billing-dashboard-slot"}},{"component":"root","name":"billing-dashboard-root","slot":"billing-dashboard-slot"},{"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 history"}},{"name":"billable-services-app-menu-item","component":"billableServicesAppMenuItem","slot":"app-menu-item-slot","meta":{"name":"Billable Services"}},{"name":"billing-checkin-form","slot":"extra-visit-attribute-slot","component":"billingCheckInForm"},{"slot":"system-admin-page-card-link-slot","component":"billableServicesCardLink","name":"billable-services-admin-card-link"},{"name":"patient-banner-billing-tags","component":"visitAttributeTags","slot":"patient-banner-tags-slot","order":2},{"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":[{"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"}],"workspaces":[{"name":"billing-form-workspace","title":"billingForm","component":"billingFormWorkspace","type":"form"},{"name":"billable-service-form","title":"billableServiceForm","component":"billableServiceFormWorkspace","type":"form","width":"wider"}],"version":"1.0.2-pre.958"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-billing-app",
-  "version": "1.0.2-pre.957",
+  "version": "1.0.2-pre.958",
   "description": "O3 frontend module for handling billing concerns in healthcare settings",
   "browser": "dist/openmrs-esm-billing-app.js",
   "main": "src/index.ts",

package/src/bill-item-actions/edit-bill-item.modal.tsx

@@ -168,6 +168,7 @@ const EditBillLineItemModal: React.FC<EditBillLineItemModalProps> = ({ bill, clo
                 control={control}
                 render={({ field: { onChange, value } }) => (
                   <NumberInput
+                    allowEmpty
                     disableWheel
                     className={styles.controlField}
                     hideSteppers

package/src/bill-item-actions/edit-bill-item.test.tsx

@@ -308,4 +308,23 @@ describe('EditBillItem', () => {
       expect(screen.queryByText(/Quantity must be at least 1/)).not.toBeInTheDocument();
     });
   });
+
+  test('shows validation error when quantity field is left empty', async () => {
+    const user = userEvent.setup();
+    render(<EditBillLineItemModal bill={mockBill} item={mockItem} closeModal={mockCloseModal} />);
+
+    const quantityInput = screen.getByRole('spinbutton', { name: /Quantity/ });
+    await user.clear(quantityInput);
+
+    // Try to submit with empty field
+    await user.click(screen.getByText(/save/i));
+
+    // Should show validation error (empty string coerces to 0, triggering min validation)
+    await waitFor(() => {
+      expect(screen.getByText(/Quantity must be at least 1/)).toBeInTheDocument();
+    });
+
+    // Should NOT call the update function
+    expect(mockUpdateBillItems).not.toHaveBeenCalled();
+  });
 });

package/src/billable-services/bill-waiver/bill-waiver-form.component.tsx

@@ -80,16 +80,17 @@ const BillWaiverForm: React.FC<BillWaiverFormProps> = ({ bill, lineItems, setPat
 
           <Layer className={styles.formControlLayer}>
             <NumberInput
-              label={t('amountToWaiveLabel', 'Amount to waive')}
-              helperText={t('amountToWaiveHelper', 'Specify the amount to be deducted from the bill')}
+              allowEmpty
               aria-label={t('amountToWaiveAriaLabel', 'Enter amount to waive')}
-              hideSteppers
               disableWheel
-              min={0}
-              max={totalAmount}
+              helperText={t('amountToWaiveHelper', 'Specify the amount to be deducted from the bill')}
+              hideSteppers
               invalidText={t('invalidWaiverAmount', 'Invalid waiver amount')}
-              value={waiverAmount}
+              label={t('amountToWaiveLabel', 'Amount to waive')}
+              max={totalAmount}
+              min={0}
               onChange={(event) => setWaiverAmount(event.target.value)}
+              value={waiverAmount}
             />
           </Layer>
         </FormGroup>

package/src/billing-form/billing-form.component.tsx

@@ -1,9 +1,17 @@
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { mutate } from 'swr';
-import { Button, ButtonSet, ComboBox, Form, NumberInput, InlineLoading, InlineNotification } from '@carbon/react';
-import { TrashCan } from '@carbon/react/icons';
-import { useConfig, useLayoutType, showSnackbar, getCoreTranslation } from '@openmrs/esm-framework';
+import {
+  Button,
+  ButtonSet,
+  ComboBox,
+  IconButton,
+  InlineLoading,
+  InlineNotification,
+  Form,
+  NumberInput,
+} from '@carbon/react';
+import { useConfig, useLayoutType, showSnackbar, getCoreTranslation, TrashCanIcon } from '@openmrs/esm-framework';
 import { processBillItems, useBillableServices } from '../billing.resource';
 import { calculateTotalAmount, convertToCurrency } from '../helpers/functions';
 import type { BillingConfig } from '../config-schema';
@@ -181,13 +189,13 @@ const BillingForm: React.FC<BillingFormProps> = ({ patientUuid, closeWorkspace }
               <div key={item.uuid} className={styles.itemCard}>
                 <div className={styles.itemHeader}>
                   <span className={styles.itemName}>{item.display}</span>
-                  <Button
+                  <IconButton
+                    align="top-end"
                     kind="ghost"
-                    size="sm"
-                    renderIcon={TrashCan}
-                    iconDescription={t('remove', 'Remove')}
-                    onClick={() => removeSelectedBillableItem(item.uuid)}
-                  />
+                    label={t('remove', 'Remove')}
+                    onClick={() => removeSelectedBillableItem(item.uuid)}>
+                    <TrashCanIcon size={16} />
+                  </IconButton>
                 </div>
 
                 <div className={styles.itemControls}>
@@ -197,7 +205,6 @@ const BillingForm: React.FC<BillingFormProps> = ({ patientUuid, closeWorkspace }
                       <ComboBox
                         id={`payment-method-${item.uuid}`}
                         items={item.availablePaymentMethods}
-                        size="md"
                         itemToString={(method: ServicePrice) =>
                           method
                             ? `${method.name} - ${convertToCurrency(
@@ -226,16 +233,16 @@ const BillingForm: React.FC<BillingFormProps> = ({ patientUuid, closeWorkspace }
                   <div className={styles.controlSection}>
                     <label>{t('quantity', 'Quantity')}</label>
                     <NumberInput
+                      allowEmpty
                       disableWheel
                       hideSteppers
                       id={`quantity-${item.uuid}`}
                       min={1}
-                      value={item.quantity}
-                      size="md"
                       onChange={(_, { value }) => {
                         const number = parseFloat(String(value));
                         updateQuantity(item.uuid, isNaN(number) ? 1 : number);
                       }}
+                      value={item.quantity}
                     />
                   </div>
 

package/src/invoice/invoice.component.tsx

@@ -114,8 +114,7 @@ const Invoice: React.FC = () => {
             disabled={isPrinting || isLoadingPatient || isLoadingBill}
             onClick={handlePrint}
             renderIcon={(props) => <Printer size={24} {...props} />}
-            iconDescription={t('printBill', 'Print bill')}
-            size="md">
+            iconDescription={t('printBill', 'Print bill')}>
             {t('printBill', 'Print bill')}
           </Button>
           {(bill?.status === 'PAID' || bill?.tenderedAmount > 0) && <PrintReceipt billId={bill?.id} />}

package/src/invoice/printable-invoice/print-receipt.component.tsx

@@ -33,7 +33,6 @@ const PrintReceipt: React.FC<PrintReceiptProps> = ({ billId }) => {
     <Button
       kind="secondary"
       className={styles.button}
-      size="md"
       renderIcon={(props) => <Printer size={24} {...props} />}
       onClick={handlePrintReceiptClick}
       disabled={isRedirecting}>