Added billing and removed ugandaemr custom modules for further invest…

…igations on startup errors
UCSF-IGHS · Apr 10, 2024 · 25341b8 · 25341b8
1 parent f2aad94
commit 25341b8
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 13 deletions.
diff --git a/distro/distro.properties b/distro/distro.properties
@@ -55,11 +55,12 @@ omod.uilibrary=${uilibraryVersion}
 omod.xforms=${xformsVersion}
 omod.patientqueueing=${patientqueueingVersion}
 omod.cohort=${cohortModuleVersion}
-omod.ugandaemrsync=${ugandaemrSyncVersion}
-omod.ugandaemrfingerprint=${ugandaemrfingerprintVersion}
+#omod.ugandaemrsync=${ugandaemrSyncVersion}
+#omod.ugandaemrfingerprint=${ugandaemrfingerprintVersion}
 omod.stockmanagement=${stockmanagementVersion}
 omod.o3forms=${o3formsVersion}
 omod.ordertemplates=${orderTemplatesVersion}
 omod.attachments=${attachmentsVersion}
-omod.ugandaemrreports=${ugandaemrReportsVersion}
-omod.ugandaemr=${ugandaemrVersion}
+#omod.ugandaemrreports=${ugandaemrReportsVersion}
+#omod.ugandaemr=${ugandaemrVersion}
+omod.billing=${billing.version}
diff --git a/distro/pom.xml b/distro/pom.xml
@@ -75,17 +75,19 @@
     <uilibraryVersion>2.0.7</uilibraryVersion>
     <xformsVersion>4.3.12</xformsVersion>
     <patientqueueingVersion>1.3.1</patientqueueingVersion>
-    <ugandaemrSyncVersion>1.1.11-SNAPSHOT</ugandaemrSyncVersion>
-    <ugandaemrfingerprintVersion>1.1.0</ugandaemrfingerprintVersion>
+    <!--<ugandaemrSyncVersion>1.1.11-SNAPSHOT</ugandaemrSyncVersion>-->
+    <!--<ugandaemrfingerprintVersion>1.1.0</ugandaemrfingerprintVersion>-->
     <cohortModuleVersion>3.4.0</cohortModuleVersion>
     <stockmanagementVersion>1.3.0</stockmanagementVersion>
     <o3formsVersion>2.2.0-SNAPSHOT</o3formsVersion>
     <orderTemplatesVersion>1.0.3-SNAPSHOT</orderTemplatesVersion>
     <attachmentsVersion>3.0.0</attachmentsVersion>
 
     <!-- core configuration library -->
-    <ugandaemrReportsVersion>2.0.38-SNAPSHOT</ugandaemrReportsVersion>
-    <ugandaemrVersion>4.0.0-SNAPSHOT</ugandaemrVersion>
+    <!--<ugandaemrReportsVersion>2.0.38-SNAPSHOT</ugandaemrReportsVersion>-->
+    <!--<ugandaemrVersion>4.0.0-SNAPSHOT</ugandaemrVersion>-->
+
+    <billing.version>1.0.0-SNAPSHOT</billing.version>
 
   </properties>
 
@@ -363,12 +365,12 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
+    <!--<dependency>
       <groupId>org.openmrs.module</groupId>
       <artifactId>ugandaemrfingerprint-omod</artifactId>
       <version>${ugandaemrfingerprintVersion}</version>
       <scope>provided</scope>
-    </dependency>
+    </dependency>-->
 
     <dependency>
       <groupId>org.openmrs.module</groupId>
@@ -377,11 +379,18 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
+    <!--<dependency>
       <groupId>org.openmrs.module</groupId>
       <artifactId>ugandaemr-omod</artifactId>
       <version>${ugandaemrVersion}</version>
       <scope>provided</scope>
+    </dependency>-->
+
+    <dependency>
+      <groupId>org.openmrs.module</groupId>
+      <artifactId>billing-omod</artifactId>
+      <version>${billing.version}</version>
+      <scope>provided</scope>
     </dependency>
 
   </dependencies>

diff --git a/frontend/spa-build-config.json b/frontend/spa-build-config.json
@@ -39,14 +39,15 @@
     "@ugandaemr/esm-ugandaemr-app": "next",
     "@ugandaemr/esm-login-app": "next",
     "@ugandaemr/esm-hiv-app": "next",
-    "@ugandaemr/esm-stock-management-app": "next",
     "@ugandaemr/esm-outpatient-app": "next",
     "@ugandaemr/esm-data-visualizer-app": "next",
     "@ugandaemr/esm-radiology-app": "next",
     "@ugandaemr/esm-theatre-app": "next",
     "@ugandaemr/esm-family-health-app": "next",
     "@ugandaemr/esm-patient-queues-app": "next",
-    "@ugandaemr/esm-tb-app": "next"
+    "@ugandaemr/esm-tb-app": "next",
+    "@openmrs/esm-stock-management-app": "next",
+    "@openmrs/esm-billing-app": "next"
   },
   "spaPath": "$SPA_PATH",
   "apiUrl": "$API_URL",