@openmrs/esm-billing-app 1.0.2-pre.812 → 1.0.2-pre.814

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

@@ -564,9 +564,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1170419,
+      "size": 1166398,
       "sizes": {
-        "javascript": 1170377,
+        "javascript": 1166356,
         "consume-shared": 42
       },
       "names": [],
@@ -580,7 +580,7 @@
       "auxiliaryFiles": [
         "4344.js.map"
       ],
-      "hash": "bfa35f1cea18b33d",
+      "hash": "f506d0d12e301fca",
       "childrenByOrder": {}
     },
     {
@@ -1209,10 +1209,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 5468250,
+      "size": 5464229,
       "sizes": {
         "consume-shared": 210,
-        "javascript": 5445594,
+        "javascript": 5441573,
         "share-init": 336,
         "runtime": 22110
       },
@@ -1229,7 +1229,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "0d7fd510052d0245",
+      "hash": "990a506cca0049ff",
       "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.812"}
+{"$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.814"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-billing-app",
-  "version": "1.0.2-pre.812",
+  "version": "1.0.2-pre.814",
   "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

@@ -7,6 +7,7 @@ import {
   FormLabel,
   InlineLoading,
   Layer,
+  NumberInput,
   Search,
   Stack,
   TextInput,
@@ -36,7 +37,7 @@ interface ServiceType {
 
 interface PaymentModeForm {
   paymentMode: string;
-  price: string | number;
+  price: string | number | undefined;
 }
 
 interface BillableServiceFormData {
@@ -54,7 +55,7 @@ interface AddBillableServiceProps {
   isModal?: boolean;
 }
 
-const DEFAULT_PAYMENT_OPTION: PaymentModeForm = { paymentMode: '', price: 0 };
+const DEFAULT_PAYMENT_OPTION: PaymentModeForm = { paymentMode: '', price: undefined };
 const MAX_NAME_LENGTH = 19;
 
 const createBillableServiceSchema = (t: TFunction) => {
@@ -150,7 +151,7 @@ const AddBillableService: React.FC<AddBillableServiceProps> = ({
       concept: serviceToEdit?.concept || null,
       payment: serviceToEdit?.servicePrices?.map((servicePrice: ServicePrice) => ({
         paymentMode: servicePrice.paymentMode?.uuid || '',
-        price: servicePrice.price,
+        price: servicePrice.price || undefined,
       })) || [DEFAULT_PAYMENT_OPTION],
     },
     resolver: zodResolver(billableServiceSchema),
@@ -181,7 +182,7 @@ const AddBillableService: React.FC<AddBillableServiceProps> = ({
         concept: serviceToEdit.concept || null,
         payment: serviceToEdit.servicePrices.map((payment: ServicePrice) => ({
           paymentMode: payment.paymentMode?.uuid || '',
-          price: payment.price,
+          price: payment.price || undefined,
         })),
       });
     }
@@ -407,14 +408,20 @@ const AddBillableService: React.FC<AddBillableServiceProps> = ({
                   name={`payment.${index}.price`}
                   render={({ field }) => (
                     <Layer>
-                      {/* FIXME: this should be a NumberInput */}
-                      <TextInput
-                        {...field}
+                      <NumberInput
+                        allowEmpty
                         id={`price-${index}`}
                         invalid={!!errors?.payment?.[index]?.price}
                         invalidText={errors?.payment?.[index]?.price?.message}
-                        labelText={t('sellingPrice', 'Selling Price')}
+                        label={t('sellingPrice', 'Selling Price')}
                         placeholder={t('enterSellingPrice', 'Enter selling price')}
+                        min={0}
+                        step={0.01}
+                        value={field.value ?? ''}
+                        onChange={(_, { value }) => {
+                          const numValue = value === '' || value === undefined ? undefined : Number(value);
+                          field.onChange(numValue);
+                        }}
                       />
                     </Layer>
                   )}

package/src/billable-services/create-edit/add-billable-service.scss

@@ -10,29 +10,8 @@
   margin: layout.$spacing-05;
 }
 
-.sectionTitle {
-  @include type.type-style('heading-compact-02');
-  color: $text-02;
-  margin-bottom: layout.$spacing-04;
-}
-
-.modalBody {
-  padding-bottom: layout.$spacing-05;
-}
-
-.container {
-  margin: layout.$spacing-05;
-}
-
-.paymentContainer {
-  margin: layout.$layout-01;
-  padding: layout.$layout-01;
-  width: 70%;
-  border-right: 1px solid colors.$cool-gray-40;
-}
-
 .paymentButtons {
-  margin: layout.$layout-01 0;
+  margin: layout.$spacing-05 0;
 }
 
 .paymentMethodContainer {
@@ -44,22 +23,6 @@
   width: 100%;
 }
 
-.paymentTotals {
-  margin-top: layout.$spacing-01;
-}
-
-.processPayments {
-  display: flex;
-  justify-content: flex-end;
-  margin: layout.$spacing-05;
-  column-gap: layout.$spacing-04;
-}
-
-.errorPaymentContainer {
-  margin: layout.$spacing-04;
-  min-height: layout.$spacing-09;
-}
-
 .removeButtonContainer {
   display: flex;
   align-self: center;
@@ -98,39 +61,18 @@
   margin-bottom: layout.$spacing-05;
 }
 
-.errorContainer {
-  margin: layout.$spacing-05;
-}
-
-.serviceError {
-  :global(.cds--search-input):focus {
-    outline: 2.5px solid $danger;
-  }
-
-  :global(.cds--search-magnifier) {
-    svg {
-      fill: $danger;
-    }
-  }
-}
-
 .errorMessage {
   @include type.type-style('label-02');
   color: $danger;
-  margin-top: 0.5rem;
+  margin-bottom: layout.$spacing-05;
 }
 
-.spinner {
+.loader {
   &:global(.cds--inline-loading) {
     min-height: layout.$spacing-05;
   }
 }
 
-.errorMessage {
-  color: red;
-  font-size: 0.875rem;
-}
-
 .serviceNameLabel {
   @include type.type-style('body-compact-02');
 }

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

@@ -98,7 +98,7 @@ const fillRequiredFields = async (user, options: FillOptions = {}) => {
   await user.click(screen.getByRole('option', { name: /Cash/i }));
 
   if (!skipPrice) {
-    const priceInput = screen.getByRole('textbox', { name: /Selling Price/i });
+    const priceInput = screen.getByRole('spinbutton', { name: /Selling Price/i });
     await user.type(priceInput, '100');
   }
 };
@@ -159,7 +159,7 @@ describe('AddBillableService', () => {
 
       await fillRequiredFields(user, { skipPrice: true });
 
-      const priceInput = screen.getByRole('textbox', { name: /selling price/i });
+      const priceInput = screen.getByRole('spinbutton', { name: /selling price/i });
       await user.type(priceInput, '0');
 
       await submitForm(user);
@@ -174,7 +174,7 @@ describe('AddBillableService', () => {
 
       await fillRequiredFields(user, { skipPrice: true });
 
-      const priceInput = screen.getByRole('textbox', { name: /Selling Price/i });
+      const priceInput = screen.getByRole('spinbutton', { name: /Selling Price/i });
       await user.type(priceInput, '-10');
 
       await submitForm(user);
@@ -196,7 +196,7 @@ describe('AddBillableService', () => {
       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 });
+      const priceInput = screen.getByRole('spinbutton', { name: /Selling Price/i });
       await user.type(priceInput, '100');
 
       await submitForm(user);
@@ -211,7 +211,7 @@ describe('AddBillableService', () => {
 
       await fillRequiredFields(user, { skipPrice: true });
 
-      const priceInput = screen.getByRole('textbox', { name: /Selling Price/i });
+      const priceInput = screen.getByRole('spinbutton', { name: /selling price/i });
       await user.type(priceInput, '10.50');
 
       mockCreateBillableService.mockResolvedValue({} as FetchResponse<any>);