@kenyaemr/esm-billing-app 5.4.2-pre.2598 → 5.4.2-pre.2603

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[{"component":"billableServicesHome","route":"billable-services"},{"component":"requirePaymentModal","routeRegex":"^patient/.+/chart","online":true,"offline":false}],"extensions":[{"component":"accountingDashboardLink","name":"accounting-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"accounting","slot":"accounting-dashboard-slot","title":"Accounting"}},{"name":"billing-dashboard","component":"billingDashboard","slot":"accounting-dashboard-slot"},{"component":"benefitsPackageDashboardLink","name":"benefits-package-dashboard-link","meta":{"name":"benefits-package","slot":"patient-chart-benefits-dashboard-slot","path":"insurance-benefits","columns":1,"columnSpan":1},"featureFlag":"healthInformationExchange"},{"component":"benefitsPackage","name":"benefits-package","slot":"patient-chart-benefits-dashboard-slot"},{"component":"root","name":"billing-dashboard-root","slot":"billing-dashboard-slot"},{"component":"benefitsEligibilyRequestForm","name":"benefits-eligibility-request-form"},{"component":"benefitsPreAuthForm","name":"benefits-pre-auth-form"},{"name":"billing-patient-summary","component":"billingPatientSummary","slot":"patient-chart-billing-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"billing-summary-dashboard-link","component":"billingSummaryDashboardLink","order":11,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-billing-dashboard-slot","path":"Billing","layoutMode":"anchored"}},{"name":"billing-check-in-form","slot":"extra-visit-attribute-slot","component":"billingCheckInForm"},{"name":"patient-banner-billing-tags","component":"visitAttributeTags","slot":"patient-banner-tags-slot","order":2},{"name":"initiate-payment-modal","component":"initiatePaymentDialog"},{"name":"delete-billableservice-modal","component":"deleteBillableServiceModal"},{"name":"refund-bill-modal","component":"refundBillModal"},{"name":"delete-bill-modal","component":"deleteBillModal"},{"name":"lab-order-billable-item","component":"labOrder","slot":"top-of-lab-order-form-slot"},{"name":"procedure-order-billable-item","component":"procedureOrder","slot":"top-of-procedure-order-form-slot"},{"name":"imaging-order-billable-item","component":"imagingOrder","slot":"top-of-imaging-order-form-slot"},{"name":"price-info-order","component":"priceInfoOrder"},{"name":"drug-order-billable-item","component":"drugOrder","slot":"medication-info-slot"},{"name":"order-action-button","component":"orderActionButton","slots":["prescription-action-button-slot","imaging-orders-action","procedure-orders-action","tests-ordered-actions-slot"],"order":0},{"component":"claimsManagementOverviewDashboardLink","name":"claims-management-overview-link","slots":["claims-management-dashboard-link-slot"]},{"component":"preAuthRequestsDashboardLink","name":"preauthrequest-overview-link","slots":["claims-management-dashboard-link-slot"]},{"component":"claimsOverview","name":"claims-overview-dashboard-link","slot":"claims-management-overview-slot"},{"component":"waiveBillActionButton","name":"waive-bill-action-button","slot":"bill-actions-slot"},{"component":"deleteBillActionButton","name":"delete-bill-action-button","slot":"bill-actions-slot"},{"component":"refundLineItem","name":"refund-line-item","slot":"bill-actions-overflow-menu-slot"},{"name":"edit-line-item","component":"editLineItem","slot":"bill-actions-overflow-menu-slot"},{"name":"cancel-line-item","component":"cancelLineItem","slot":"bill-actions-overflow-menu-slot"},{"name":"patient-info-sha-status","component":"patientBannerShaStatus","slot":"patient-banner-tags-slot"}],"workspaces":[{"name":"create-bill-workspace","component":"createBillWorkspace","title":"Create Bill Workspace","type":"other-form"},{"name":"waive-bill-form","component":"waiveBillForm","title":"Waive Bill Form","type":"other-form"},{"name":"edit-bill-form","component":"editBillForm","title":"Edit Bill Form","type":"other-form"},{"name":"billable-service-form","component":"addServiceForm","title":"Create Charge Item Form","type":"other-form"},{"name":"commodity-form","component":"addCommodityForm","title":"Create Charge Item Form","type":"other-form"},{"name":"billing-form","component":"billingForm","title":"Billing Form","type":"other-form","width":"extra-wide"},{"name":"payment-mode-workspace","component":"paymentModeWorkspace","title":"Payment Mode Workspace","type":"other-form"},{"name":"cancel-bill-workspace","component":"cancelBillWorkspace","title":"Cancel Bill Workspace","type":"other-form"},{"name":"add-deposit-workspace","component":"addDepositWorkspace","title":"Add Deposit","type":"other-form"},{"name":"deposit-transaction-workspace","component":"depositTransactionWorkspace","title":"Deposit Transaction","type":"other-form"},{"name":"payment-workspace","component":"paymentWorkspace","title":"Payment Workspace","type":"other-form"}],"modals":[{"name":"create-payment-point","component":"createPaymentPoint"},{"name":"clock-out-modal","component":"clockOut"},{"name":"bulk-import-billable-services-modal","component":"bulkImportBillableServicesModal"},{"name":"delete-payment-mode-modal","component":"deletePaymentModeModal"},{"name":"manage-claim-request-modal","component":"manageClaimRequestModal"},{"name":"clock-in-modal","component":"clockIn"},{"name":"create-bill-item-modal","component":"createBillItemModal"},{"name":"delete-deposit-modal","component":"deleteDepositModal"},{"name":"reverse-transaction-modal","component":"reverseTransactionModal"},{"name":"print-preview-modal","component":"printPreviewModal"},{"name":"bill-action-modal","component":"billActionModal"},{"name":"require-billing-modal","component":"requirePaymentModal"}],"version":"5.4.2-pre.2598"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[{"component":"billableServicesHome","route":"billable-services"},{"component":"requirePaymentModal","routeRegex":"^patient/.+/chart","online":true,"offline":false}],"extensions":[{"component":"accountingDashboardLink","name":"accounting-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"accounting","slot":"accounting-dashboard-slot","title":"Accounting"}},{"name":"billing-dashboard","component":"billingDashboard","slot":"accounting-dashboard-slot"},{"component":"benefitsPackageDashboardLink","name":"benefits-package-dashboard-link","meta":{"name":"benefits-package","slot":"patient-chart-benefits-dashboard-slot","path":"insurance-benefits","columns":1,"columnSpan":1},"featureFlag":"healthInformationExchange"},{"component":"benefitsPackage","name":"benefits-package","slot":"patient-chart-benefits-dashboard-slot"},{"component":"root","name":"billing-dashboard-root","slot":"billing-dashboard-slot"},{"component":"benefitsEligibilyRequestForm","name":"benefits-eligibility-request-form"},{"component":"benefitsPreAuthForm","name":"benefits-pre-auth-form"},{"name":"billing-patient-summary","component":"billingPatientSummary","slot":"patient-chart-billing-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"billing-summary-dashboard-link","component":"billingSummaryDashboardLink","order":11,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-billing-dashboard-slot","path":"Billing","layoutMode":"anchored"}},{"name":"billing-check-in-form","slot":"extra-visit-attribute-slot","component":"billingCheckInForm"},{"name":"patient-banner-billing-tags","component":"visitAttributeTags","slot":"patient-banner-tags-slot","order":2},{"name":"initiate-payment-modal","component":"initiatePaymentDialog"},{"name":"delete-billableservice-modal","component":"deleteBillableServiceModal"},{"name":"refund-bill-modal","component":"refundBillModal"},{"name":"delete-bill-modal","component":"deleteBillModal"},{"name":"lab-order-billable-item","component":"labOrder","slot":"top-of-lab-order-form-slot"},{"name":"procedure-order-billable-item","component":"procedureOrder","slot":"top-of-procedure-order-form-slot"},{"name":"imaging-order-billable-item","component":"imagingOrder","slot":"top-of-imaging-order-form-slot"},{"name":"price-info-order","component":"priceInfoOrder"},{"name":"drug-order-billable-item","component":"drugOrder","slot":"medication-info-slot"},{"name":"order-action-button","component":"orderActionButton","slots":["prescription-action-button-slot","imaging-orders-action","procedure-orders-action","tests-ordered-actions-slot"],"order":0},{"component":"claimsManagementOverviewDashboardLink","name":"claims-management-overview-link","slots":["claims-management-dashboard-link-slot"]},{"component":"preAuthRequestsDashboardLink","name":"preauthrequest-overview-link","slots":["claims-management-dashboard-link-slot"]},{"component":"claimsOverview","name":"claims-overview-dashboard-link","slot":"claims-management-overview-slot"},{"component":"waiveBillActionButton","name":"waive-bill-action-button","slot":"bill-actions-slot"},{"component":"deleteBillActionButton","name":"delete-bill-action-button","slot":"bill-actions-slot"},{"component":"refundLineItem","name":"refund-line-item","slot":"bill-actions-overflow-menu-slot"},{"name":"edit-line-item","component":"editLineItem","slot":"bill-actions-overflow-menu-slot"},{"name":"cancel-line-item","component":"cancelLineItem","slot":"bill-actions-overflow-menu-slot"},{"name":"patient-info-sha-status","component":"patientBannerShaStatus","slot":"patient-banner-tags-slot"}],"workspaces":[{"name":"create-bill-workspace","component":"createBillWorkspace","title":"Create Bill Workspace","type":"other-form"},{"name":"waive-bill-form","component":"waiveBillForm","title":"Waive Bill Form","type":"other-form"},{"name":"edit-bill-form","component":"editBillForm","title":"Edit Bill Form","type":"other-form"},{"name":"billable-service-form","component":"addServiceForm","title":"Create Charge Item Form","type":"other-form"},{"name":"commodity-form","component":"addCommodityForm","title":"Create Charge Item Form","type":"other-form"},{"name":"billing-form","component":"billingForm","title":"Billing Form","type":"other-form","width":"extra-wide"},{"name":"payment-mode-workspace","component":"paymentModeWorkspace","title":"Payment Mode Workspace","type":"other-form"},{"name":"cancel-bill-workspace","component":"cancelBillWorkspace","title":"Cancel Bill Workspace","type":"other-form"},{"name":"add-deposit-workspace","component":"addDepositWorkspace","title":"Add Deposit","type":"other-form"},{"name":"deposit-transaction-workspace","component":"depositTransactionWorkspace","title":"Deposit Transaction","type":"other-form"},{"name":"payment-workspace","component":"paymentWorkspace","title":"Payment Workspace","type":"other-form"}],"modals":[{"name":"create-payment-point","component":"createPaymentPoint"},{"name":"clock-out-modal","component":"clockOut"},{"name":"bulk-import-billable-services-modal","component":"bulkImportBillableServicesModal"},{"name":"delete-payment-mode-modal","component":"deletePaymentModeModal"},{"name":"manage-claim-request-modal","component":"manageClaimRequestModal"},{"name":"clock-in-modal","component":"clockIn"},{"name":"create-bill-item-modal","component":"createBillItemModal"},{"name":"delete-deposit-modal","component":"deleteDepositModal"},{"name":"reverse-transaction-modal","component":"reverseTransactionModal"},{"name":"print-preview-modal","component":"printPreviewModal"},{"name":"bill-action-modal","component":"billActionModal"},{"name":"require-billing-modal","component":"requirePaymentModal"}],"version":"5.4.2-pre.2603"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-billing-app",
-  "version": "5.4.2-pre.2598",
+  "version": "5.4.2-pre.2603",
   "description": "Billing app for KenyaEMR",
   "keywords": [
     "openmrs"

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

@@ -87,109 +87,111 @@ const VisitAttributesForm: React.FC<VisitAttributesFormProps> = ({ setAttributes
   }
 
   return (
-    <section>
-      <div className={styles.sectionTitle}>{t('modeOfPayment', 'Mode of payment')}</div>
-      <div className={styles.sectionField}>
-        <div className={styles.sectionFieldLayer}>
-          <Controller
-            name="isPatientExempted"
-            control={control}
-            render={({ field }) => (
-              <RadioButtonGroup
-                onChange={(selected) => {
-                  field.onChange(selected);
-                }}
-                orientation="horizontal"
-                legendText={t('isPatientExemptedLegend', 'Is patient exempted from payment?')}
-                name="patientExemption">
-                <RadioButton labelText={t('yes', 'Yes')} value="true" id="Yes" />
-                <RadioButton labelText={t('no', 'No')} value="false" id="No" />
-              </RadioButtonGroup>
-            )}
-          />
-        </div>
-
-        {isPatientExempted === 'true' && (
-          <div className={styles.sectionFieldLayer}>
-            <Controller
-              control={control}
-              name="exemptionCategory"
-              render={({ field }) => (
-                <ComboBox
-                  className={styles.sectionField}
-                  onChange={({ selectedItem }) => field.onChange(selectedItem?.value)}
-                  id="exemptionCategory"
-                  items={patientExemptionCategories}
-                  itemToString={(item) => (item ? item.label : '')}
-                  titleText={t('exemptionCategory', 'Exemption category')}
-                  placeholder={t('selectExemptionCategory', 'Select exemption category')}
-                />
-              )}
-            />
-          </div>
-        )}
-
-        {isPatientExempted === 'false' && (
+    <>
+      <section>
+        <div className={styles.sectionTitle}>{t('modeOfPayment', 'Mode of payment')}</div>
+        <div className={styles.sectionField}>
           <div className={styles.sectionFieldLayer}>
             <Controller
+              name="isPatientExempted"
               control={control}
-              name="paymentMethods"
               render={({ field }) => (
-                <ComboBox
-                  className={styles.sectionField}
-                  onChange={({ selectedItem }) => field.onChange(selectedItem)}
-                  initialSelectedItem={field.value}
-                  id="paymentMethods"
-                  items={paymentModes?.map((method) => method.uuid)}
-                  itemToString={(item) => paymentModes.find((mode) => mode.uuid === item)?.name ?? ''}
-                  titleText={t('paymentMethodsTitle', 'Payment method')}
-                  placeholder={t('selectPaymentMethod', 'Select payment method')}
-                />
+                <RadioButtonGroup
+                  onChange={(selected) => {
+                    field.onChange(selected);
+                  }}
+                  orientation="horizontal"
+                  legendText={t('isPatientExemptedLegend', 'Is patient exempted from payment?')}
+                  name="patientExemption">
+                  <RadioButton labelText={t('yes', 'Yes')} value="true" id="Yes" />
+                  <RadioButton labelText={t('no', 'No')} value="false" id="No" />
+                </RadioButtonGroup>
               )}
             />
           </div>
-        )}
 
-        {paymentMethods === insurancePaymentMethod && isPatientExempted === 'false' && (
-          <>
+          {isPatientExempted === 'true' && (
             <div className={styles.sectionFieldLayer}>
               <Controller
                 control={control}
-                name="insuranceScheme"
+                name="exemptionCategory"
                 render={({ field }) => (
                   <ComboBox
                     className={styles.sectionField}
-                    onChange={({ selectedItem }) => field.onChange(selectedItem)}
-                    id="insurance-scheme"
-                    items={insuranceSchemes}
-                    itemToString={(item) => (item ? item : '')}
-                    titleText={t('insuranceScheme', 'Insurance scheme')}
-                    placeholder={t('selectInsuranceScheme', 'Select insurance scheme')}
+                    onChange={({ selectedItem }) => field.onChange(selectedItem?.value)}
+                    id="exemptionCategory"
+                    items={patientExemptionCategories}
+                    itemToString={(item) => (item ? item.label : '')}
+                    titleText={t('exemptionCategory', 'Exemption category')}
+                    placeholder={t('selectExemptionCategory', 'Select exemption category')}
                   />
                 )}
               />
             </div>
+          )}
+
+          {isPatientExempted === 'false' && (
             <div className={styles.sectionFieldLayer}>
               <Controller
                 control={control}
-                name="policyNumber"
+                name="paymentMethods"
                 render={({ field }) => (
-                  <TextInput
-                    {...field}
+                  <ComboBox
                     className={styles.sectionField}
-                    onChange={(e) => field.onChange(e.target.value)}
-                    id="policy-number"
-                    type="text"
-                    labelText={t('policyNumber', 'Policy number')}
-                    placeholder={t('enterPolicyNumber', 'Enter policy number')}
+                    onChange={({ selectedItem }) => field.onChange(selectedItem)}
+                    initialSelectedItem={field.value}
+                    id="paymentMethods"
+                    items={paymentModes?.map((method) => method.uuid)}
+                    itemToString={(item) => paymentModes.find((mode) => mode.uuid === item)?.name ?? ''}
+                    titleText={t('paymentMethodsTitle', 'Payment method')}
+                    placeholder={t('selectPaymentMethod', 'Select payment method')}
                   />
                 )}
               />
             </div>
-          </>
-        )}
-      </div>
-    </section>
+          )}
+
+          {paymentMethods === insurancePaymentMethod && isPatientExempted === 'false' && (
+            <>
+              <div className={styles.sectionFieldLayer}>
+                <Controller
+                  control={control}
+                  name="insuranceScheme"
+                  render={({ field }) => (
+                    <ComboBox
+                      className={styles.sectionField}
+                      onChange={({ selectedItem }) => field.onChange(selectedItem)}
+                      id="insurance-scheme"
+                      items={insuranceSchemes}
+                      itemToString={(item) => (item ? item : '')}
+                      titleText={t('insuranceScheme', 'Insurance scheme')}
+                      placeholder={t('selectInsuranceScheme', 'Select insurance scheme')}
+                    />
+                  )}
+                />
+              </div>
+              <div className={styles.sectionFieldLayer}>
+                <Controller
+                  control={control}
+                  name="policyNumber"
+                  render={({ field }) => (
+                    <TextInput
+                      {...field}
+                      className={styles.sectionField}
+                      onChange={(e) => field.onChange(e.target.value)}
+                      id="policy-number"
+                      type="text"
+                      labelText={t('policyNumber', 'Policy number')}
+                      placeholder={t('enterPolicyNumber', 'Enter policy number')}
+                    />
+                  )}
+                />
+              </div>
+            </>
+          )}
+        </div>
+      </section>
+    </>
   );
 };