closes #8670

Signed-off-by: DamithDeshan <[email protected]>
hmislk · Nov 9, 2024 · 58c0af6 · 58c0af6
1 parent d5cb043
commit 58c0af6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/src/main/java/com/divudi/ws/common/ApplicationConfig.java b/src/main/java/com/divudi/ws/common/ApplicationConfig.java
@@ -38,7 +38,6 @@ public Set<Class<?>> getClasses() {
     private void addRestResourceClasses(Set<Class<?>> resources) {
         resources.add(com.divudi.ws.channel.ChannelApi.class);
         resources.add(com.divudi.ws.channel.CorsResponseFilter.class);
-        resources.add(com.divudi.ws.common.ApiMembership.class);
         resources.add(com.divudi.ws.common.ConfigResource.class);
         resources.add(com.divudi.ws.fhir.Fhir.class);
         resources.add(com.divudi.ws.finance.Finance.class);

diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
@@ -2,7 +2,7 @@
 <persistence version="2.2" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd">
     <persistence-unit name="hmisPU" transaction-type="JTA">
         <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-        <jta-data-source>jdbc/digasiri</jta-data-source>
+        <jta-data-source>jdbc/arogya</jta-data-source>
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
             <property name="eclipselink.logging.level.sql" value="SEVERE"/>
@@ -13,7 +13,7 @@
         </properties>
     </persistence-unit>
     <persistence-unit name="hmisAuditPU" transaction-type="JTA">
-        <jta-data-source>jdbc/ruhunuAudit</jta-data-source>
+        <jta-data-source>jdbc/arogyaAudit</jta-data-source>
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
             <property name="eclipselink.logging.level.sql" value="SEVERE"/>

diff --git a/src/main/webapp/opd/view/opd_bill.xhtml b/src/main/webapp/opd/view/opd_bill.xhtml
@@ -50,6 +50,15 @@
                                                     icon="fa fa-print"
                                                     style="float: right"
                                                     ajax="false">
+                                                    <p:printer target="groupPrint" />
+                                                </p:commandButton>
+                                                <p:commandButton 
+                                                    value="Print Refund Bill" 
+                                                    class="ui-button-info m-1"
+                                                    icon="fa fa-print"
+                                                    rendered="#{billSearch.viewingBill.refunded}"
+                                                    style="float: right"
+                                                    ajax="false">
                                                     <p:printer target="gpPrintPanel" />
                                                 </p:commandButton>
                                             </div>

diff --git a/src/main/webapp/resources/ezcomp/menu.xhtml b/src/main/webapp/resources/ezcomp/menu.xhtml
@@ -486,8 +486,7 @@
                         <p:submenu 
                             id="smLabBillingSearch"
                             label="Billing Search"
-                            rendered="#{(webUserController.hasPrivilege('Opd') or webUserController.hasPrivilege('InwardServicesAndItems'))  and configOptionApplicationController.getBooleanValueByKey('Show the Bill Search in Under the Lab Module', false)} ">
-
+                            rendered="#{configOptionApplicationController.getBooleanValueByKey('Show the Bill Search in Under the Lab Module', false)}">
                             <p:menuitem 
                                 ajax="false" 
                                 action="#{opdBillController.navigateToSearchOpdBills()}"