Merge pull request #6763 from hmislk/Issue#6361

Fixed #6361 Closes #6361
hmislk · Aug 7, 2024 · 17f03a7 · 17f03a7
2 parents 29a2892 + aff5476
commit 17f03a7
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/src/main/java/com/divudi/bean/common/EnumController.java b/src/main/java/com/divudi/bean/common/EnumController.java
@@ -70,6 +70,7 @@ public class EnumController implements Serializable {
     @Inject
     ConfigOptionApplicationController configOptionApplicationController;
     List<PaymentMethod> paymentMethodsForOpdBilling;
+    List<PaymentMethod> paymentMethodsForOpdBillCanceling;
     List<PaymentMethod> paymentMethodsForChanneling;
     List<PaymentMethod> paymentMethodsForChannelSettling;
     List<PaymentMethod> paymentMethodsForPharmacyBilling;
@@ -126,6 +127,16 @@ public void fillPaymentMethodsForOpdBilling() {
             }
         }
     }
+
+    public void fillPaymentMethodsForOpdBillCanceling() {
+        paymentMethodsForOpdBillCanceling = new ArrayList<>();
+        for (PaymentMethod pm : PaymentMethod.values()) {
+            boolean include = configOptionApplicationController.getBooleanValueByKey(pm.getLabel() + " is available for OPD Bill Canceling", true);
+            if (include) {
+                paymentMethodsForOpdBillCanceling.add(pm);
+            }
+        }
+    }
 
     public void fillPaymentMethodsForPackageBilling() {
         paymentMethodsForOpdBilling = new ArrayList<>();
@@ -854,6 +865,17 @@ public void setPaymentMethodsForStaffCreditSettle(List<PaymentMethod> paymentMet
         this.paymentMethodsForStaffCreditSettle = paymentMethodsForStaffCreditSettle;
     }
 
+    public List<PaymentMethod> getPaymentMethodsForOpdBillCanceling() {
+        if (paymentMethodsForOpdBillCanceling == null) {
+            fillPaymentMethodsForOpdBillCanceling();
+        }
+        return paymentMethodsForOpdBillCanceling;
+    }
+
+    public void setPaymentMethodsForOpdBillCanceling(List<PaymentMethod> paymentMethodsForOpdBillCanceling) {
+        this.paymentMethodsForOpdBillCanceling = paymentMethodsForOpdBillCanceling;
+    }
+
     public List<PaymentMethod> getPaymentMethodsForPatientDepositRefund() {
         paymentMethodsForPatientDepositRefund = new ArrayList<>();
         for (PaymentMethod pm : PaymentMethod.values()) {
@@ -868,5 +890,4 @@ public List<PaymentMethod> getPaymentMethodsForPatientDepositRefund() {
     public void setPaymentMethodsForPatientDepositRefund(List<PaymentMethod> paymentMethodsForPatientDepositRefund) {
         this.paymentMethodsForPatientDepositRefund = paymentMethodsForPatientDepositRefund;
     }
-
 }
diff --git a/src/main/webapp/opd/batch_bill_cancel.xhtml b/src/main/webapp/opd/batch_bill_cancel.xhtml
@@ -54,7 +54,7 @@
                                 <p:selectOneMenu id="cmbPs" value="#{billController.paymentMethod}"
                                                  rendered="#{billController.batchBill.billType eq 'OpdBathcBill'}">
                                     <f:selectItem itemLabel="Select paymentMethod"/>
-                                    <f:selectItems value="#{inwardPaymentController.paymentMethods}"/>
+                                    <f:selectItems value="#{enumController.paymentMethodsForOpdBillCanceling}"/>
                                 </p:selectOneMenu>
 
                                 <p:selectOneMenu id="cmbPs2" value="#{billController.paymentMethod}"  

diff --git a/src/main/webapp/opd/bill_cancel.xhtml b/src/main/webapp/opd/bill_cancel.xhtml
@@ -65,7 +65,7 @@
                                     value="#{billSearch.paymentMethod}" 
                                     rendered="#{billSearch.bill.billType eq 'OpdBill'}">
                                     <f:selectItem itemLabel="Select paymentMethod"/>
-                                    <f:selectItems value="#{inwardPaymentController.paymentMethods}"/>
+                                    <f:selectItems value="#{enumController.paymentMethodsForOpdBillCanceling}"/>
                                 </p:selectOneMenu>
 
                                 <p:selectOneMenu id="cmbPs2" value="#{billSearch.paymentMethod}"