Merge pull request #6499 from hmislk/Issue#6498

Issue#6498 Closes #6498
hmislk · Jul 21, 2024 · 1dfe01f · 1dfe01f
2 parents 58ab496 + 2b21509
commit 1dfe01f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -19,8 +19,8 @@ Developed using Java Enterprise Edition, the system offers both a web applicatio
 ## Current Version
 
 
-Current Version: 3.0.0.20240721.18 (This line will be automatically updated to reflect the latest version)
 
+Current Version: 3.0.0.20240721.18 (This line will be automatically updated to reflect the latest version)
 
 
 ## History

diff --git a/src/main/webapp/WEB-INF/glassfish-web.xml b/src/main/webapp/WEB-INF/glassfish-web.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
 <glassfish-web-app error-url="">
-
   <context-root>/sethma</context-root>
-
   <class-loader delegate="true"/>
   <jsp-config>
     <property name="keepgenerated" value="true">

diff --git a/src/main/webapp/admin/pricing/payment_scheme_discount_opd_by_item.xhtml b/src/main/webapp/admin/pricing/payment_scheme_discount_opd_by_item.xhtml
@@ -15,13 +15,14 @@
                 <h:form>
                     <p:panel header="OPD Payment Discount Matrix" id="reportPrint">
 
-                        <p:panel header="Add new Matrix" >
+                        <p:panel header="Add New Matrix" >
                             <p:panelGrid columns="2" >
                                 <h:outputLabel value="Discount Scheme"/>
                                 <p:autoComplete forceSelection="true" 
                                                 value="#{opdMemberShipDiscountController.paymentScheme}" 
                                                 completeMethod="#{paymentSchemeController.completePaymentScheme}" 
-                                                var="mem" itemLabel="#{mem.name}" itemValue="#{mem}" >
+                                                var="mem" itemLabel="#{mem.name}" itemValue="#{mem}" 
+                                                class="w-100" inputStyleClass="w-100" >
                                 </p:autoComplete>
                                 <h:outputLabel value="Item Name" />
                                 <p:autoComplete widgetVar="aIx" id="acIx" 
@@ -53,25 +54,25 @@
 
 
                                 <h:outputLabel value="Payment Method"/>
-                                <p:selectOneMenu   value="#{opdMemberShipDiscountController.paymentMethod}"  >
+                                <p:selectOneMenu   value="#{opdMemberShipDiscountController.paymentMethod}" class="w-100" >
                                     <f:selectItem itemLabel="Select" />                           
                                     <f:selectItems value="#{enumController.allPaymentMethods}" />                                    
                                 </p:selectOneMenu>
                                 <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="" ></h:outputLabel>
-                                <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.saveItemPaymentScheme()}" >
                                 </p:commandButton>
 
-                                <p:defaultCommand target="btnAdd"/>
+
                             </p:panelGrid>
-                            <p:commandButton ajax="false" value="Excel" styleClass="noPrintButton" style="float: right;" >
+                            <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="Fill"
                                             action="#{opdMemberShipDiscountController.createItemsPaymentScheme()}" />
-                            <p:commandButton ajax="false" value="Print" styleClass="noPrintButton" >                                         
+                            <p:commandButton ajax="false" value="Print" styleClass="noPrintButton" class="ui-button-info m-1" icon="fa fa-print" >                                         
                                 <p:printer target="reportPrint"/>
                             </p:commandButton>