@openmrs/esm-billing-app 1.0.1-pre.49 → 1.0.1-pre.53

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

@@ -32,10 +32,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 3924822,
+      "size": 3926402,
       "sizes": {
         "consume-shared": 210,
-        "javascript": 3903906,
+        "javascript": 3905486,
         "share-init": 210,
         "runtime": 20496
       },
@@ -52,7 +52,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "7c1c500ac7087214",
+      "hash": "ff84fda83499e6b0",
       "childrenByOrder": {}
     },
     {
@@ -84,9 +84,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 3688,
+      "size": 3751,
       "sizes": {
-        "javascript": 3688
+        "javascript": 3751
       },
       "names": [],
       "idHints": [],
@@ -98,7 +98,7 @@
         "319.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "85f40c398640df7e",
+      "hash": "e994e9d3a961bab0",
       "childrenByOrder": {}
     },
     {
@@ -207,9 +207,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 348101,
+      "size": 349681,
       "sizes": {
-        "javascript": 348101
+        "javascript": 349681
       },
       "names": [],
       "idHints": [],
@@ -222,7 +222,7 @@
       "auxiliaryFiles": [
         "547.js.map"
       ],
-      "hash": "878a6402db533011",
+      "hash": "cb9d2a76b5046766",
       "childrenByOrder": {}
     },
     {
@@ -230,9 +230,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 3688,
+      "size": 3751,
       "sizes": {
-        "javascript": 3688
+        "javascript": 3751
       },
       "names": [],
       "idHints": [],
@@ -244,7 +244,7 @@
         "574.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "abcaca794998764d",
+      "hash": "b91a335059d19c61",
       "childrenByOrder": {}
     },
     {
@@ -273,9 +273,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 3688,
+      "size": 3751,
       "sizes": {
-        "javascript": 3688
+        "javascript": 3751
       },
       "names": [],
       "idHints": [],
@@ -287,7 +287,7 @@
         "757.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "49e12e466ed9d679",
+      "hash": "9eba956efc09103d",
       "childrenByOrder": {}
     },
     {
@@ -295,9 +295,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 3688,
+      "size": 3751,
       "sizes": {
-        "javascript": 3688
+        "javascript": 3751
       },
       "names": [],
       "idHints": [],
@@ -309,7 +309,7 @@
         "788.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "a1f46249e68ba343",
+      "hash": "67642acd4101304e",
       "childrenByOrder": {}
     },
     {
@@ -344,9 +344,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 3688,
+      "size": 3751,
       "sizes": {
-        "javascript": 3688
+        "javascript": 3751
       },
       "names": [],
       "idHints": [],
@@ -358,7 +358,7 @@
         "807.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "8b032e0438d8b411",
+      "hash": "224710844eeec81c",
       "childrenByOrder": {}
     },
     {
@@ -366,9 +366,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 3688,
+      "size": 3751,
       "sizes": {
-        "javascript": 3688
+        "javascript": 3751
       },
       "names": [],
       "idHints": [],
@@ -380,7 +380,7 @@
         "833.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "0da57eb06315c8bb",
+      "hash": "413ff22ef577e6ea",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^18.2.0"},"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":"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":"billing-form","component":"billingForm"},{"name":"require-billing-modal","component":"requirePaymentModal"},{"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"}],"version":"1.0.1-pre.49"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^18.2.0"},"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":"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":"billing-form","component":"billingForm"},{"name":"require-billing-modal","component":"requirePaymentModal"},{"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"}],"version":"1.0.1-pre.53"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-billing-app",
-  "version": "1.0.1-pre.49",
+  "version": "1.0.1-pre.53",
   "description": "Billing frontend module for use in O3",
   "browser": "dist/openmrs-esm-billing-app.js",
   "main": "src/index.ts",

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

@@ -83,7 +83,7 @@ const BillingCheckInForm: React.FC<BillingCheckInFormProps> = ({ patientUuid, se
   if (paymentMethod) {
     lineList = [];
     lineList = lineItems.filter((e) =>
-      e.servicePrices.some((p) => p.paymentMode && p.paymentMode.uuid === paymentMethod?.paymentMethods),
+      e.servicePrices.some((p) => p.paymentMode && p.paymentMode.uuid === paymentMethod),
     );
   }
 

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

@@ -1,4 +1,4 @@
-import React, { useState, useRef } from 'react';
+import React, { useState, useRef, useEffect } from 'react';
 import {
   ButtonSet,
   Button,
@@ -14,10 +14,11 @@ import {
 } from '@carbon/react';
 import styles from './billing-form.scss';
 import { useTranslation } from 'react-i18next';
-import { showSnackbar, useConfig } from '@openmrs/esm-framework';
+import { showSnackbar, showToast, useConfig } from '@openmrs/esm-framework';
 import { useFetchSearchResults, processBillItems } from '../billing.resource';
 import { mutate } from 'swr';
 import { convertToCurrency } from '../helpers';
+import { z } from 'zod';
 
 type BillingFormProps = {
   patientUuid: string;
@@ -32,26 +33,46 @@ const BillingForm: React.FC<BillingFormProps> = ({ patientUuid, closeWorkspace }
   const [billItems, setBillItems] = useState([]);
   const [searchVal, setSearchVal] = useState('');
   const [category, setCategory] = useState('');
+  const [saveDisabled, setSaveDisabled] = useState<boolean>(false);
 
   const toggleSearch = (choiceSelected) => {
     (document.getElementById('searchField') as HTMLInputElement).disabled = false;
     setCategory(choiceSelected === 'Stock Item' ? 'Stock Item' : 'Service');
   };
 
+  const billItemSchema = z.object({
+    Qnty: z.number().min(1, t('quantityGreaterThanZero', 'Quantity must be at least one for all items.')), // zod logic
+  });
+
   const calculateTotal = (event, itemName) => {
     const quantity = parseInt(event.target.value);
+    let isValid = true;
+
+    try {
+      billItemSchema.parse({ Qnty: quantity });
+    } catch (error) {
+      isValid = false;
+      const parsedErrorMessage = JSON.parse(error.message);
+      showToast({
+        title: t('billItems', 'Save Bill'),
+        kind: 'error',
+        description: parsedErrorMessage[0].message,
+      });
+    }
+
     const updatedItems = billItems.map((item) => {
       if (item.Item.toLowerCase().includes(itemName.toLowerCase())) {
-        const price = item.Price;
-        const total = price * quantity;
-        return { ...item, Qnty: quantity, Total: total };
+        return { ...item, Qnty: quantity, isValid: quantity > 0 };
       }
       return item;
     });
 
+    const anyInvalidQuantity = updatedItems.some((item) => item.Qnty <= 0);
+
     setBillItems(updatedItems);
+    setSaveDisabled(!isValid || anyInvalidQuantity);
 
-    const updatedGrandTotal = updatedItems.reduce((acc, item) => acc + item.Total, 0);
+    const updatedGrandTotal = updatedItems.reduce((acc, item) => acc + item.Price * item.Qnty, 0);
     setGrandTotal(updatedGrandTotal);
   };
 
@@ -215,7 +236,7 @@ const BillingForm: React.FC<BillingFormProps> = ({ patientUuid, closeWorkspace }
                 <TableCell>
                   <input
                     type="number"
-                    className="form-control"
+                    className={`form-control ${row.Qnty <= 0 ? styles.invalidInput : ''}`}
                     id={row.Item}
                     min={0}
                     max={100}
@@ -248,7 +269,12 @@ const BillingForm: React.FC<BillingFormProps> = ({ patientUuid, closeWorkspace }
         <Button kind="secondary" onClick={closeWorkspace}>
           Discard
         </Button>
-        <Button kind="primary" onClick={postBillItems}>
+        <Button
+          kind="primary"
+          disabled={saveDisabled}
+          onClick={() => {
+            postBillItems();
+          }}>
           Save & Close
         </Button>
       </ButtonSet>

package/src/billing-form/billing-form.scss

@@ -22,4 +22,8 @@
   border-bottom: 0.1rem solid;
   border-bottom-color: silver;
   cursor: pointer;
+}
+
+.invalidInput {
+  border: 2px solid red;
 }

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

@@ -51,16 +51,14 @@ const VisitAttributesForm: React.FC<VisitAttributesFormProps> = ({ setAttributes
   }, [paymentDetails, paymentMethods, insuranceSchema, policyNumber, patientCategory]);
 
   const createVisitAttributesPayload = () => {
-    const paymentMethods = getValues();
+    const { paymentDetails, paymentMethods, insuranceScheme, policyNumber, patientCategory } = getValues();
     setPaymentMethod(paymentMethods);
     const formPayload = [
-      patientCatergory.paymentDetails,
-      patientCatergory.paymentMethods,
-      patientCatergory.policyNumber,
-      patientCatergory.insuranceScheme,
-      patientCatergory.patientCategory,
-      patientCatergory.formPayloadPending,
-      true,
+      { uuid: patientCatergory.paymentDetails, value: paymentDetails },
+      { uuid: patientCatergory.paymentMethods, value: paymentMethods },
+      { uuid: patientCatergory.insuranceScheme, value: insuranceScheme },
+      { uuid: patientCatergory.policyNumber, value: policyNumber },
+      { uuid: patientCatergory.patientCategory, value: patientCategory },
     ];
     const visitAttributesPayload = formPayload.filter(
       (item) => item.value !== undefined && item.value !== null && item.value !== '',
@@ -92,7 +90,7 @@ const VisitAttributesForm: React.FC<VisitAttributesFormProps> = ({ setAttributes
             onChange={(selected) => field.onChange(selected)}
             orientation="vertical"
             legendText={t('paymentDetails', 'Payment Details')}
-            name="payment-details-group">
+            name="payment-details">
             <RadioButton labelText="Paying" value={catergoryConcepts.payingDetails} id="radio-1" />
             <RadioButton labelText="Non paying" value={catergoryConcepts.nonPayingDetails} id="radio-2" />
           </RadioButtonGroup>

package/src/config-schema.ts

@@ -7,10 +7,10 @@ export const configSchema = {
     _type: Type.Object,
     _description: 'Patient Category Custom UUIDs',
     _default: {
-      paymentDetails: 'caf2124f-00a9-4620-a250-efd8535afd6d',
-      paymentMethods: 'c39b684c-250f-4781-a157-d6ad7353bc90',
-      policyNumber: '0f4f3306-f01b-43c6-af5b-fdb60015cb02',
-      insuranceScheme: '2d0fa959-6780-41f1-85b1-402045935068',
+      paymentDetails: 'fbc0702d-b4c9-4968-be63-af8ad3ad6239',
+      paymentMethods: '8553afa0-bdb9-4d3c-8a98-05fa9350aa85',
+      policyNumber: '3a988e33-a6c0-4b76-b924-01abb998944b',
+      insuranceScheme: 'aac48226-d143-4274-80e0-264db4e368ee',
       patientCategory: '3b9dfac8-9e4d-11ee-8c90-0242ac120002',
       formPayloadPending: '919b51c9-8e2e-468f-8354-181bf3e55786',
     },
@@ -20,10 +20,10 @@ export const configSchema = {
     _type: Type.Object,
     _description: 'Patient Category Concept UUIDs',
     _default: {
-      payingDetails: '1c30ee58-82d4-4ea4-a8c1-4bf2f9dfc8cf',
-      nonPayingDetails: 'a28d7929-050a-4249-a61a-551e9b8cc102',
+      payingDetails: '44b34972-6630-4e5a-a9f6-a6eb0f109650',
+      nonPayingDetails: 'f3fb2d88-cccd-422c-8766-be101ba7bd2e',
       insuranceDetails: 'beac329b-f1dc-4a33-9e7c-d95821a137a6',
-      childUnder5: '2d61b762-6e32-4e2e-811f-ac72cbd3600a',
+      childUnder5: '1528AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
       student: '159465AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
     },
   },

package/translations/am.json

@@ -81,6 +81,7 @@
   "printReceipt": "Print receipt",
   "processPayment": "Process Payment",
   "quantity": "Quantity",
+  "quantityGreaterThanZero": "Quantity must be greater than zero",
   "referenceNumber": "Reference number",
   "save": "Save",
   "searchConcepts": "Search associated concept",

package/translations/en.json

@@ -81,6 +81,7 @@
   "printReceipt": "Print receipt",
   "processPayment": "Process Payment",
   "quantity": "Quantity",
+  "quantityGreaterThanZero": "Quantity must be greater than zero",
   "referenceNumber": "Reference number",
   "save": "Save",
   "searchConcepts": "Search associated concept",

package/translations/es.json

@@ -81,6 +81,7 @@
   "printReceipt": "Print receipt",
   "processPayment": "Process Payment",
   "quantity": "Quantity",
+  "quantityGreaterThanZero": "Quantity must be greater than zero",
   "referenceNumber": "Reference number",
   "save": "Save",
   "searchConcepts": "Search associated concept",

package/translations/fr.json

@@ -81,6 +81,7 @@
   "printReceipt": "Print receipt",
   "processPayment": "Process Payment",
   "quantity": "Quantity",
+  "quantityGreaterThanZero": "Quantity must be greater than zero",
   "referenceNumber": "Reference number",
   "save": "Save",
   "searchConcepts": "Search associated concept",

package/translations/he.json

@@ -81,6 +81,7 @@
   "printReceipt": "Print receipt",
   "processPayment": "Process Payment",
   "quantity": "Quantity",
+  "quantityGreaterThanZero": "Quantity must be greater than zero",
   "referenceNumber": "Reference number",
   "save": "Save",
   "searchConcepts": "Search associated concept",

package/translations/km.json

@@ -81,6 +81,7 @@
   "printReceipt": "Print receipt",
   "processPayment": "Process Payment",
   "quantity": "Quantity",
+  "quantityGreaterThanZero": "Quantity must be greater than zero",
   "referenceNumber": "Reference number",
   "save": "Save",
   "searchConcepts": "Search associated concept",