From a3bbd8daf9967200eee5160e8c9991948a296f32 Mon Sep 17 00:00:00 2001
From: Piyankara N W M G P <pubudupiyankara.me@gmail.com>
Date: Sun, 21 Jul 2024 11:23:21 +0530
Subject: [PATCH] Signed-off-by: Piyankara N W M G P
 <pubudupiyankara.me@gmail.com> closes Issue#6500

---
 src/main/resources/META-INF/persistence.xml   |  4 ++--
 .../payment_scheme_discount_channel.xhtml     | 24 ++++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index 6553951ab8..0e77e8aff2 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
     <persistence-unit name="hmisPU" transaction-type="JTA">
-        <jta-data-source>jdbc/demos</jta-data-source>
+        <jta-data-source>jdbc/hims</jta-data-source>
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
             <property name="javax.persistence.schema-generation.database.action" value="create-or-extend-tables"/>
         </properties>
     </persistence-unit>
     <persistence-unit name="hmisAuditPU" transaction-type="JTA">
-        <jta-data-source>jdbc/demoaudit</jta-data-source>
+        <jta-data-source>jdbc/himsAduit</jta-data-source>
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
         </properties>
diff --git a/src/main/webapp/admin/pricing/payment_scheme_discount_channel.xhtml b/src/main/webapp/admin/pricing/payment_scheme_discount_channel.xhtml
index 44cf14e5c3..c030c26f4c 100644
--- a/src/main/webapp/admin/pricing/payment_scheme_discount_channel.xhtml
+++ b/src/main/webapp/admin/pricing/payment_scheme_discount_channel.xhtml
@@ -15,13 +15,14 @@
                 <h:form>
                     <p:panel header="Channel Discount Matrix" id="reportPrint">
 
-                        <p:panel header="Add new Matrix" >
-                            <h:panelGrid columns="2" >
+                        <p:panel header="Add New Matrix" >
+                            <p:panelGrid columns="2" >
                                 <h:outputLabel value="Discount Scheme"/>
                                 <p:autoComplete forceSelection="true" 
                                                 value="#{opdMemberShipDiscountController.paymentScheme}" 
                                                 completeMethod="#{paymentSchemeController.completePaymentSchemeChannel}" 
-                                                var="mem" itemLabel="#{mem.name}" itemValue="#{mem}" styleClass="mediuminput" >
+                                                var="mem" itemLabel="#{mem.name}" itemValue="#{mem}" styleClass="mediuminput"
+                                                class="w-100" inputStyleClass="w-100" >
                                 </p:autoComplete>
                                 <h:outputLabel value="Payment Method"/>
                                 <p:selectOneMenu   value="#{opdMemberShipDiscountController.paymentMethod}"  >
@@ -30,26 +31,27 @@
                                 </p:selectOneMenu>
                                 <h:outputLabel value="Category"/>
                                 <p:autoComplete value="#{opdMemberShipDiscountController.category}" 
-                                                forceSelection="true"
+                                                forceSelection="true" 
                                                 completeMethod="#{categoryController.completeCategoryServiceInvestigation}"
-                                                var="cat" itemLabel="#{cat.name} #{cat.parentCategory}" itemValue="#{cat}" >
+                                                var="cat" itemLabel="#{cat.name} #{cat.parentCategory}" itemValue="#{cat}"
+                                                class="w-100" inputStyleClass="w-100" >
                                 </p:autoComplete>
 
                                 <h:outputLabel value="Discount" ></h:outputLabel>
-                                <p:inputText autocomplete="off" value="#{opdMemberShipDiscountController.margin}" />
+                                <p:inputText autocomplete="off" value="#{opdMemberShipDiscountController.margin}" class="w-100" />
                                 <h:outputLabel value="" />
-                                <p:commandButton id="btnAdd" value="Add" ajax="false" 
+                                <p:commandButton id="btnAdd" value="Add" ajax="false" class="ui-button-success" icon="fa fa-plus"
                                                  action="#{opdMemberShipDiscountController.saveSelectedChannelPaymentScheme}" />
 
-                                <p:defaultCommand target="btnAdd"/>
-                            </h:panelGrid>
+                                
+                            </p:panelGrid>
 
                             <p:commandButton ajax="false" value="Fill" 
                                              action="#{opdMemberShipDiscountController.createItemsChannelPaymentScheme()}" />
-                            <p:commandButton ajax="false" value="Excel" styleClass="noPrintButton">
+                            <p:commandButton ajax="false" value="Excel" styleClass="noPrintButton" style="float: right;" class="ui-button-success" icon="fas fa-file-excel">
                                 <p:dataExporter type="xlsx" target="inwd" fileName="Price_metrix_investigation"  />
                             </p:commandButton>
-                            <p:commandButton ajax="false" value="Print" styleClass="noPrintButton" >                                         
+                            <p:commandButton ajax="false" value="Print" styleClass="noPrintButton" class="ui-button-info m-1" icon="fas fa-print" >                                         
                                 <p:printer target="reportPrint"/>
                             </p:commandButton>