Merge pull request #5939 from hmislk/Issue#5934

Issue#5934 Closes #5934
hmislk · Jun 22, 2024 · c46c562 · c46c562
2 parents ce97881 + 2acdffc
commit c46c562
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/counter.txt b/.github/counter.txt
@@ -1 +1 @@
-6
+6
diff --git a/src/main/resources/VERSION.txt b/src/main/resources/VERSION.txt
@@ -1 +1 @@
-3.0.0.20240622.6
+3.0.0.20240622.6
diff --git a/src/main/webapp/admin/pricing/membership/payment_scheme_discount_pharmacy_by_category.xhtml b/src/main/webapp/admin/pricing/membership/payment_scheme_discount_pharmacy_by_category.xhtml
@@ -44,7 +44,7 @@
  <h:outputLabel value="Payment Method"/>
  <p:selectOneMenu value="#{opdMemberShipDiscountController.paymentMethod}" >
  <f:selectItem itemLabel="Select" /> 
- <f:selectItems value="#{enumController.paymentMethods}" /> 
+ <f:selectItems value="#{enumController.allPaymentMethods}" /> 
  </p:selectOneMenu>
  <h:outputLabel value="Discount" ></h:outputLabel>
  <p:inputText autocomplete="off" value="#{opdMemberShipDiscountController.margin}" />
@@ -94,7 +94,7 @@
  <p:column headerText="Payment Method">
  <p:selectOneMenu value="#{a.paymentMethod}" >
  <f:selectItem itemLabel="Select" /> 
- <f:selectItems value="#{enumController.paymentMethods}" /> 
+ <f:selectItems value="#{enumController.allPaymentMethods}" /> 
  </p:selectOneMenu>
  </p:column>
 

diff --git a/src/main/webapp/admin/pricing/payment_scheme_discount_pharmacy_by_category.xhtml b/src/main/webapp/admin/pricing/payment_scheme_discount_pharmacy_by_category.xhtml
@@ -45,7 +45,7 @@
  <h:outputLabel value="Payment Method"/>
  <p:selectOneMenu value="#{opdMemberShipDiscountController.paymentMethod}" >
  <f:selectItem itemLabel="Select" /> 
- <f:selectItems value="#{enumController.paymentMethods}" /> 
+ <f:selectItems value="#{enumController.allPaymentMethods}" /> 
  </p:selectOneMenu>
  <h:outputLabel value="Discount" ></h:outputLabel>
  <p:inputText autocomplete="off" value="#{opdMemberShipDiscountController.margin}" />
@@ -95,7 +95,7 @@
  <p:column headerText="Payment Method">
  <p:selectOneMenu value="#{a.paymentMethod}" >
  <f:selectItem itemLabel="Select" /> 
- <f:selectItems value="#{enumController.paymentMethods}" /> 
+ <f:selectItems value="#{enumController.allPaymentMethods}" /> 
  </p:selectOneMenu>
  </p:column>