From 0dec3a773d33d115d0acf4a365e1fda9b942f260 Mon Sep 17 00:00:00 2001
From: Lawan Samarasekara <lawan.chaamindu1234@gmail.com>
Date: Wed, 12 Jun 2024 13:57:34 +0530
Subject: [PATCH] Fixed #5665 Signed-off-by: Lawan Samarasekara
 <lawan.chaamindu1234@gmail.com>

---
 src/main/resources/META-INF/persistence.xml  |  4 ++--
 src/main/webapp/channel/manage_booking.xhtml | 19 ++++++++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index 2772485043..5ac937d245 100644
--- 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/sethma</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"/>
@@ -11,7 +11,7 @@
     </properties>
   </persistence-unit>
   <persistence-unit name="hmisAuditPU" transaction-type="JTA">
-    <jta-data-source>jdbc/sethmaaudit</jta-data-source>
+    <jta-data-source>jdbc/arogyaAudit</jta-data-source>
     <class>com.divudi.entity.AuditEvent</class>
     <exclude-unlisted-classes>true</exclude-unlisted-classes>
     <properties>
diff --git a/src/main/webapp/channel/manage_booking.xhtml b/src/main/webapp/channel/manage_booking.xhtml
index 5b1a5c1cf9..bbdda9ee8c 100644
--- a/src/main/webapp/channel/manage_booking.xhtml
+++ b/src/main/webapp/channel/manage_booking.xhtml
@@ -511,9 +511,22 @@
                         </h:panelGroup>
                         <p:dialog minHeight="100" width="800" header="Confirmation" widgetVar="confirmationDialog" modal="true" resizable="false">
                             <p>Are you sure you want to cancel the channel booking?</p>
-                            <p:inputText class="w-100"
-                                         value="#{channelBillController.comment}"
-                                         placeholder="Please provide a comment for the cancel Channel Booking" />
+                            <p:selectOneMenu
+                                id="commentsMenuCancel"
+                                value="#{channelBillController.comment}"
+                                editable="true"
+                                filter="true"
+                                placeholder="Select or enter a comment"
+                                filterMatchMode="contains"
+                                style="float: right; width: 100%"
+                                class="p-2">
+                                <f:selectItem itemLabel="Select or enter a comment" itemValue="" noSelectionOption="true"/>
+                                <f:selectItems
+                                    value="#{configOptionApplicationController.getListOfCustomOptions('Channel Bill Canceling Comments')}"
+                                    var="option"
+                                    itemLabel="#{option}"
+                                    itemValue="#{option}"/>
+                            </p:selectOneMenu>
 
                             <f:facet name="footer">
                                 <p:commandButton