Merge branch 'master' into Issue#6498

hmislk · Jul 21, 2024 · 2b21509 · 2b21509
2 parents 2b8cf0f + 58ab496
commit 2b21509
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/.github/counter.txt b/.github/counter.txt
@@ -1 +1 @@
-17
+18
diff --git a/README.md b/README.md
@@ -18,7 +18,10 @@ Developed using Java Enterprise Edition, the system offers both a web applicatio
 
 ## Current Version
 
-Current Version: 3.0.0.20240721.17 (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/resources/VERSION.txt b/src/main/resources/VERSION.txt
@@ -1 +1 @@
-3.0.0.20240721.17
+3.0.0.20240721.18
diff --git a/src/main/webapp/admin/pricing/payment_scheme_discount_opd_by_category.xhtml b/src/main/webapp/admin/pricing/payment_scheme_discount_opd_by_category.xhtml
@@ -15,19 +15,19 @@
                 <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="Category/Subcategory" ></h:outputLabel>
                                 <p:autoComplete value="#{opdMemberShipDiscountController.category}" 
                                                 forceSelection="true"
                                                 completeMethod="#{categoryController.completeCategoryServiceInvestigation}"
-
+                                                class="w-100" inputStyleClass="w-100"
                                                 var="cat" itemLabel="#{cat.name} #{cat.parentCategory}" itemValue="#{cat}" >
                                     <p:column headerText="Category">
                                         <h:outputLabel value="#{cat.name}"/>
@@ -51,20 +51,20 @@
                                     <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.saveOpdCategoryPaymentScheme()}" >
                                 </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.createItemsCategoryOpdPaymentScheme()}" />
-                            <p:commandButton ajax="false" value="Print" styleClass="noPrintButton" >                                         
+                            <p:commandButton ajax="false" value="Print" styleClass="noPrintButton" class="m-1 ui-button-info" icon="fas fa-print">                                         
                                 <p:printer target="reportPrint"/>
                             </p:commandButton>