Merge pull request #6501 from hmislk/Issue#6500

Issue#6500 Closes #6500
hmislk · Jul 21, 2024 · a900434 · a900434
2 parents 28d046b + c0c94ff
commit a900434
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -20,6 +20,7 @@ Developed using Java Enterprise Edition, the system offers both a web applicatio
 
 
 
+
 Current Version: 3.0.0.20240721.19 (This line will be automatically updated to reflect the latest version)
 
 

diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,6 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.divudi</groupId>
-
     <artifactId>sethma</artifactId>
     <version>3.0.0</version>
     <packaging>war</packaging>

diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
@@ -3,7 +3,6 @@
     <persistence-unit name="hmisPU" transaction-type="JTA">
 
         <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"/>

diff --git 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>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,6 +20,7 @@ Developed using Java Enterprise Edition, the system offers both a web applicatio




		Current Version: 3.0.0.20240721.19 (This line will be automatically updated to reflect the latest version)


Expand Down