@openmrs/esm-billing-app 1.0.2-pre.800 → 1.0.2-pre.802

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

@@ -71,9 +71,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1172991,
+      "size": 1173266,
       "sizes": {
-        "javascript": 1172949,
+        "javascript": 1173224,
         "consume-shared": 42
       },
       "names": [],
@@ -87,7 +87,7 @@
       "auxiliaryFiles": [
         "942.js.map"
       ],
-      "hash": "7b6c48d2956841c8",
+      "hash": "3f477f3def97306b",
       "childrenByOrder": {}
     },
     {
@@ -544,9 +544,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 8850,
+      "size": 8777,
       "sizes": {
-        "javascript": 8850
+        "javascript": 8777
       },
       "names": [],
       "idHints": [],
@@ -558,7 +558,7 @@
         "4300.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "4e1e7e3ab3cd456c",
+      "hash": "5e3aefcd437e10e9",
       "childrenByOrder": {}
     },
     {
@@ -1209,10 +1209,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 5470821,
+      "size": 5471096,
       "sizes": {
         "consume-shared": 210,
-        "javascript": 5448166,
+        "javascript": 5448441,
         "share-init": 336,
         "runtime": 22109
       },
@@ -1229,7 +1229,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "d33a3b534cb9fac4",
+      "hash": "0ffc610a1e0163be",
       "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"},"featureFlag":"billing"},{"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"},"featureFlag":"billing"},{"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","featureFlag":"billing"},{"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":"billing-home-tiles-ext","slot":"billing-home-tiles-slot","component":"serviceMetrics"},{"name":"edit-bill-line-item-dialog","component":"editBillLineItemModal","online":true,"offline":true}],"modals":[{"name":"add-cash-point-modal","component":"addCashPointModal"},{"name":"add-payment-mode-modal","component":"addPaymentModeModal"},{"name":"delete-payment-mode-modal","component":"deletePaymentModeModal"},{"name":"edit-bill-item-modal","component":"editBillLineItemModal"},{"name":"edit-billable-service-modal","component":"editBillableServiceModal"},{"name":"require-billing-modal","component":"requirePaymentModal"}],"workspaces":[{"name":"billing-form-workspace","title":"billingForm","component":"billingFormWorkspace","type":"form"}],"featureFlags":[{"flagName":"billing","label":"Billing module","description":"This feature introduces navigation links on the patient chart and home page to allow accessing the billing module features"}],"version":"1.0.2-pre.800"}
+{"$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"},"featureFlag":"billing"},{"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"},"featureFlag":"billing"},{"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","featureFlag":"billing"},{"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":"billing-home-tiles-ext","slot":"billing-home-tiles-slot","component":"serviceMetrics"},{"name":"edit-bill-line-item-dialog","component":"editBillLineItemModal","online":true,"offline":true}],"modals":[{"name":"add-cash-point-modal","component":"addCashPointModal"},{"name":"add-payment-mode-modal","component":"addPaymentModeModal"},{"name":"delete-payment-mode-modal","component":"deletePaymentModeModal"},{"name":"edit-bill-item-modal","component":"editBillLineItemModal"},{"name":"edit-billable-service-modal","component":"editBillableServiceModal"},{"name":"require-billing-modal","component":"requirePaymentModal"}],"workspaces":[{"name":"billing-form-workspace","title":"billingForm","component":"billingFormWorkspace","type":"form"}],"featureFlags":[{"flagName":"billing","label":"Billing module","description":"This feature introduces navigation links on the patient chart and home page to allow accessing the billing module features"}],"version":"1.0.2-pre.802"}

package/package.json

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

package/src/billable-services/create-edit/add-billable-service.component.tsx

@@ -65,19 +65,23 @@ const createBillableServiceSchema = (t: TFunction) => {
       })
       .trim()
       .min(1, t('paymentModeRequired', 'Payment mode is required')),
-    price: z.union([
-      z.number().positive(t('priceMustBeGreaterThanZero', 'Price must be greater than 0')),
-      z
-        .string({
-          required_error: t('priceIsRequired', 'Price is required'),
-        })
-        .trim()
-        .min(1, t('priceIsRequired', 'Price is required'))
-        .refine(
-          (val) => !isNaN(parseFloat(val)) && parseFloat(val) > 0,
-          t('priceMustBeValidPositiveNumber', 'Price must be a valid positive number'),
-        ),
-    ]),
+    price: z.union([z.number(), z.string(), z.undefined()]).superRefine((val, ctx) => {
+      if (val === undefined || val === null || val === '') {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: t('priceIsRequired', 'Price is required'),
+        });
+        return;
+      }
+
+      const numValue = typeof val === 'number' ? val : parseFloat(val);
+      if (isNaN(numValue) || numValue <= 0) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: t('priceMustBeGreaterThanZero', 'Price must be greater than 0'),
+        });
+      }
+    }),
   });
 
   return z.object({

package/src/billable-services/create-edit/add-billable-service.test.tsx

@@ -52,64 +52,75 @@ const mockServiceTypes = [
   { uuid: 'a487a743-62ce-4f93-a66b-c5154ee8987d', display: 'Adherence counselling  service' },
 ];
 
+// Test helpers (canonical pattern)
+const setupMocks = () => {
+  mockUseBillableServices.mockReturnValue({
+    billableServices: [],
+    isLoading: false,
+    error: null,
+    mutate: jest.fn(),
+    isValidating: false,
+  });
+  mockUsePaymentModes.mockReturnValue({ paymentModes: mockPaymentModes, error: null, isLoadingPaymentModes: false });
+  mockUseServiceTypes.mockReturnValue({ serviceTypes: mockServiceTypes, error: false, isLoadingServiceTypes: false });
+  mockUseConceptsSearch.mockReturnValue({ searchResults: [], isSearching: false, error: null });
+};
+
+const renderAddBillableService = (props = {}) => {
+  const defaultProps = {
+    onClose: jest.fn(),
+    ...props,
+  };
+  setupMocks();
+  return render(<AddBillableService {...defaultProps} />);
+};
+
+interface FillOptions {
+  serviceName?: string;
+  shortName?: string;
+  skipPrice?: boolean;
+}
+
+const fillRequiredFields = async (user, options: FillOptions = {}) => {
+  const { serviceName = 'Test Service Name', shortName = 'Test Short Name', skipPrice = false } = options;
+
+  if (serviceName) {
+    await user.type(screen.getByRole('textbox', { name: /Service Name/i }), serviceName);
+  }
+  if (shortName) {
+    await user.type(screen.getByRole('textbox', { name: /Short Name/i }), shortName);
+  }
+
+  await user.click(screen.getByRole('combobox', { name: /Service type/i }));
+  await user.click(screen.getByRole('option', { name: /Lab service/i }));
+
+  await user.click(screen.getByRole('combobox', { name: /Payment mode/i }));
+  await user.click(screen.getByRole('option', { name: /Cash/i }));
+
+  if (!skipPrice) {
+    const priceInput = screen.getByRole('textbox', { name: /Selling Price/i });
+    await user.type(priceInput, '100');
+  }
+};
+
+const submitForm = async (user) => {
+  const saveBtn = screen.getByRole('button', { name: /save/i });
+  await user.click(saveBtn);
+};
+
 describe('AddBillableService', () => {
   test('should render billable services form and generate correct payload', async () => {
     const user = userEvent.setup();
     const mockOnClose = jest.fn();
-    mockUseBillableServices.mockReturnValue({
-      billableServices: [],
-      isLoading: false,
-      error: null,
-      mutate: jest.fn(),
-      isValidating: false,
-    });
-    mockUsePaymentModes.mockReturnValue({ paymentModes: mockPaymentModes, error: null, isLoadingPaymentModes: false });
-    mockUseServiceTypes.mockReturnValue({ serviceTypes: mockServiceTypes, error: false, isLoadingServiceTypes: false });
-    mockUseConceptsSearch.mockReturnValue({ searchResults: [], isSearching: false, error: null });
-
-    render(<AddBillableService onClose={mockOnClose} />);
+    renderAddBillableService({ onClose: mockOnClose });
 
     const formTitle = screen.getByRole('heading', { name: /Add Billable Services/i });
     expect(formTitle).toBeInTheDocument();
 
-    const serviceNameTextInp = screen.getByRole('textbox', { name: /Service Name/i });
-    expect(serviceNameTextInp).toBeInTheDocument();
-
-    const serviceShortNameTextInp = screen.getByRole('textbox', { name: /Short Name/i });
-    expect(serviceShortNameTextInp).toBeInTheDocument();
-
-    await user.type(serviceNameTextInp, 'Test Service Name');
-    await user.type(serviceShortNameTextInp, 'Test Short Name');
-
-    expect(serviceNameTextInp).toHaveValue('Test Service Name');
-    expect(serviceShortNameTextInp).toHaveValue('Test Short Name');
-
-    const serviceTypeComboBox = screen.getByRole('combobox', { name: /Service type/i });
-    expect(serviceTypeComboBox).toBeInTheDocument();
-    await user.click(serviceTypeComboBox);
-    const serviceTypeOptions = screen.getByRole('option', { name: /Lab service/i });
-    expect(serviceTypeOptions).toBeInTheDocument();
-    await user.click(serviceTypeOptions);
-
-    // Fill in the default payment option (first one)
-    const paymentMethodComboBoxes = screen.getAllByRole('combobox', { name: /Payment mode/i });
-    expect(paymentMethodComboBoxes).toHaveLength(1); // Should have one default
-    await user.click(paymentMethodComboBoxes[0]);
-    const paymentMethodOptions = screen.getByRole('option', { name: /Cash/i });
-    expect(paymentMethodOptions).toBeInTheDocument();
-    await user.click(paymentMethodOptions);
+    await fillRequiredFields(user);
+    mockCreateBillableService.mockResolvedValue({} as FetchResponse<any>);
 
-    const priceTextInps = screen.getAllByRole('textbox', { name: /Selling Price/i });
-    expect(priceTextInps).toHaveLength(1); // Should have one price input for the default payment method
-    const priceTextInp = priceTextInps[0];
-    expect(priceTextInp).toBeInTheDocument();
-    await user.type(priceTextInp, '1000');
-
-    mockCreateBillableService.mockReturnValue(Promise.resolve({} as FetchResponse<any>));
-    const saveBtn = screen.getAllByRole('button').find((btn) => btn.getAttribute('type') === 'submit');
-    expect(saveBtn).toBeInTheDocument();
-
-    await user.click(saveBtn);
+    await submitForm(user);
 
     expect(mockCreateBillableService).toHaveBeenCalledTimes(1);
     expect(mockCreateBillableService).toHaveBeenCalledWith({
@@ -119,7 +130,7 @@ describe('AddBillableService', () => {
       servicePrices: [
         {
           paymentMode: '63eff7a4-6f82-43c4-a333-dbcc58fe9f74',
-          price: 1000,
+          price: 100,
           name: 'Cash',
         },
       ],
@@ -133,23 +144,97 @@ describe('AddBillableService', () => {
   test("should navigate back to billable services dashboard when 'Cancel' button is clicked", async () => {
     const user = userEvent.setup();
     const mockOnClose = jest.fn();
-    mockUseBillableServices.mockReturnValue({
-      billableServices: [],
-      isLoading: false,
-      error: null,
-      mutate: jest.fn(),
-      isValidating: false,
-    });
-    mockUsePaymentModes.mockReturnValue({ paymentModes: mockPaymentModes, error: null, isLoadingPaymentModes: false });
-    mockUseServiceTypes.mockReturnValue({ serviceTypes: mockServiceTypes, error: false, isLoadingServiceTypes: false });
-    mockUseConceptsSearch.mockReturnValue({ searchResults: [], isSearching: false, error: null });
+    renderAddBillableService({ onClose: mockOnClose });
 
-    render(<AddBillableService onClose={mockOnClose} />);
-
-    const cancelBtn = screen.getAllByRole('button').find((btn) => btn.className.includes('cds--btn--secondary'));
-    expect(cancelBtn).toBeInTheDocument();
+    const cancelBtn = screen.getByRole('button', { name: /cancel/i });
     await user.click(cancelBtn);
 
     expect(mockOnClose).toHaveBeenCalledTimes(1);
   });
+
+  describe('Form Validation', () => {
+    test('should show "Price must be greater than 0" error for zero price', async () => {
+      const user = userEvent.setup();
+      renderAddBillableService();
+
+      await fillRequiredFields(user, { skipPrice: true });
+
+      const priceInput = screen.getByRole('textbox', { name: /selling price/i });
+      await user.type(priceInput, '0');
+
+      await submitForm(user);
+
+      expect(screen.getByText('Price must be greater than 0')).toBeInTheDocument();
+      expect(mockCreateBillableService).not.toHaveBeenCalled();
+    });
+
+    test('should show "Price must be greater than 0" error for negative price', async () => {
+      const user = userEvent.setup();
+      renderAddBillableService();
+
+      await fillRequiredFields(user, { skipPrice: true });
+
+      const priceInput = screen.getByRole('textbox', { name: /Selling Price/i });
+      await user.type(priceInput, '-10');
+
+      await submitForm(user);
+
+      expect(screen.getByText('Price must be greater than 0')).toBeInTheDocument();
+      expect(mockCreateBillableService).not.toHaveBeenCalled();
+    });
+
+    test('should show "Service name is required" error when service name is empty', async () => {
+      const user = userEvent.setup();
+      renderAddBillableService();
+
+      // Fill all fields except service name
+      await user.type(screen.getByRole('textbox', { name: /Short Name/i }), 'Test Short Name');
+
+      await user.click(screen.getByRole('combobox', { name: /Service type/i }));
+      await user.click(screen.getByRole('option', { name: /Lab service/i }));
+
+      await user.click(screen.getByRole('combobox', { name: /Payment mode/i }));
+      await user.click(screen.getByRole('option', { name: /Cash/i }));
+
+      const priceInput = screen.getByRole('textbox', { name: /Selling Price/i });
+      await user.type(priceInput, '100');
+
+      await submitForm(user);
+
+      expect(screen.getByText('Service name is required')).toBeInTheDocument();
+      expect(mockCreateBillableService).not.toHaveBeenCalled();
+    });
+
+    test('should accept valid decimal price values', async () => {
+      const user = userEvent.setup();
+      renderAddBillableService();
+
+      await fillRequiredFields(user, { skipPrice: true });
+
+      const priceInput = screen.getByRole('textbox', { name: /Selling Price/i });
+      await user.type(priceInput, '10.50');
+
+      mockCreateBillableService.mockResolvedValue({} as FetchResponse<any>);
+
+      await submitForm(user);
+
+      expect(screen.queryByText('Price is required')).not.toBeInTheDocument();
+      expect(screen.queryByText('Price must be greater than 0')).not.toBeInTheDocument();
+      expect(mockCreateBillableService).toHaveBeenCalledTimes(1);
+      expect(mockCreateBillableService).toHaveBeenCalledWith({
+        name: 'Test Service Name',
+        shortName: 'Test Short Name',
+        serviceType: 'c9604249-db0a-4d03-b074-fc6bc2fa13e6',
+        servicePrices: [
+          {
+            paymentMode: '63eff7a4-6f82-43c4-a333-dbcc58fe9f74',
+            price: 10.5,
+            name: 'Cash',
+          },
+        ],
+        serviceStatus: 'ENABLED',
+        concept: undefined,
+      });
+    });
+  });
 });

package/translations/en.json

@@ -161,7 +161,6 @@
   "priceMustBeGreaterThanZero": "Price must be greater than 0",
   "priceMustBeNumber": "Price must be a valid number",
   "priceMustBePositive": "Price must be greater than 0",
-  "priceMustBeValidPositiveNumber": "Price must be a valid positive number",
   "prices": "Prices",
   "printBill": "Print bill",
   "printReceipt": "Print receipt",