@openmrs/esm-billing-app 1.0.2-pre.786 → 1.0.2-pre.793

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

@@ -71,9 +71,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1174566,
+      "size": 1173460,
       "sizes": {
-        "javascript": 1174524,
+        "javascript": 1173418,
         "consume-shared": 42
       },
       "names": [],
@@ -87,7 +87,7 @@
       "auxiliaryFiles": [
         "942.js.map"
       ],
-      "hash": "df6eba76d10cbba0",
+      "hash": "aff6c4786ba5c020",
       "childrenByOrder": {}
     },
     {
@@ -1209,10 +1209,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 5472396,
+      "size": 5471290,
       "sizes": {
         "consume-shared": 210,
-        "javascript": 5449741,
+        "javascript": 5448635,
         "share-init": 336,
         "runtime": 22109
       },
@@ -1229,7 +1229,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "e97d3163f7776c90",
+      "hash": "107ca2c0e902d4db",
       "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.786"}
+{"$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.793"}

package/package.json

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

package/src/invoice/payments/invoice-breakdown/invoice-breakdown.scss

@@ -5,25 +5,25 @@
 .invoiceBreakdown {
   display: grid;
   grid-template-columns: 1fr 1fr;
-  align-items: flex-end;
-  margin: layout.$spacing-02 0;
+  align-items: center;
+  margin: layout.$spacing-03 0;
 }
 
 .label {
-  @include type.type-style('heading-03');
+  @include type.type-style('body-compact-01');
   color: colors.$gray-100;
-  text-align: end;
+  text-align: left;
 }
 
 .value {
-  @extend .label;
-  font-weight: bold;
+  @include type.type-style('body-compact-01');
+  color: colors.$gray-100;
+  text-align: left;
   margin-left: layout.$spacing-03;
-  text-align: start;
 }
 
 .extendedLabel {
-  @extend .label;
-  font-weight: bold;
+  @include type.type-style('heading-compact-01');
   color: crimson;
+  text-align: left;
 }

package/src/invoice/payments/payment-form/payment-form.component.tsx

@@ -26,13 +26,20 @@ const PaymentForm: React.FC<PaymentFormProps> = ({ disablePayment, isSingleLineI
   const [isFormVisible, setIsFormVisible] = useState(isSingleLineItem);
 
   useEffect(() => {
-    if (isSingleLineItem) {
+    if (isSingleLineItem && !disablePayment) {
       setIsFormVisible(true);
       if (fields.length === 0) {
         append(DEFAULT_PAYMENT);
       }
     }
-  }, [isSingleLineItem, append, fields.length]);
+  }, [isSingleLineItem, append, fields.length, disablePayment]);
+
+  useEffect(() => {
+    if (disablePayment) {
+      setIsFormVisible(false);
+      remove();
+    }
+  }, [disablePayment, remove]);
 
   const handleAppendPaymentMode = useCallback(() => {
     setIsFormVisible(true);
@@ -63,7 +70,7 @@ const PaymentForm: React.FC<PaymentFormProps> = ({ disablePayment, isSingleLineI
               name={`payment.${index}.method`}
               render={({ field }) => (
                 <Dropdown
-                  id="paymentMethod"
+                  id={`paymentMethod-${fieldItem.id}`}
                   onChange={({ selectedItem }) => field.onChange(selectedItem?.uuid)}
                   titleText={t('paymentMethod', 'Payment method')}
                   label={t('selectPaymentMethod', 'Select payment method')}
@@ -82,7 +89,7 @@ const PaymentForm: React.FC<PaymentFormProps> = ({ disablePayment, isSingleLineI
                   allowEmpty
                   disableWheel
                   hideSteppers
-                  id="paymentAmount"
+                  id={`paymentAmount-${fieldItem.id}`}
                   invalid={!!errors?.payment?.[index]?.amount}
                   invalidText={errors?.payment?.[index]?.amount?.message}
                   label={t('amount', 'Amount')}
@@ -100,7 +107,7 @@ const PaymentForm: React.FC<PaymentFormProps> = ({ disablePayment, isSingleLineI
               control={control}
               render={({ field }) => (
                 <TextInput
-                  id="paymentReferenceCode"
+                  id={`paymentReferenceCode-${fieldItem.id}`}
                   labelText={t('referenceNumber', 'Reference number')}
                   name={field.name}
                   onBlur={field.onBlur}

package/src/invoice/payments/payments.component.tsx

@@ -88,7 +88,7 @@ const Payments: React.FC<PaymentProps> = ({ bill, mutate }) => {
       if (currentVisit) {
         updateBillVisitAttribute(currentVisit);
       }
-      methods.reset({ payment: [{ method: '', amount: undefined, referenceCode: '' }] });
+      methods.reset({ payment: [{ method: '', amount: null, referenceCode: '' }] });
       mutate();
     } catch (error) {
       showSnackbar({

package/src/invoice/payments/payments.scss

@@ -32,14 +32,15 @@
 }
 
 .paymentTotals {
-  margin: layout.$spacing-05 0;
+  margin: layout.$spacing-05 auto;
   padding: layout.$spacing-07 layout.$spacing-05;
+  max-width: 90%;
 }
 
 .processPayments {
   display: flex;
   justify-content: flex-end;
-  margin: layout.$spacing-05;
+  margin: layout.$spacing-05 0;
   padding-top: layout.$spacing-05;
   column-gap: layout.$spacing-04;
   border-top: 1px solid colors.$cool-gray-40;