Merge pull request #6805 from hmislk/Issue#6051

Issue#6051 Closes #6051
hmislk · Aug 7, 2024 · 292a192 · 292a192
2 parents a783c0b + 4f9aa08
commit 292a192
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/src/main/java/com/divudi/bean/common/EnumController.java b/src/main/java/com/divudi/bean/common/EnumController.java
@@ -75,9 +75,9 @@ public class EnumController implements Serializable {
     List<PaymentMethod> paymentMethodsForChannelSettling;
     List<PaymentMethod> paymentMethodsForPharmacyBilling;
     private List<PaymentMethod> paymentMethodsForPatientDepositRefund;
-
-    private List<PaymentMethod> paymentMethodsForPatientDeposit;
     private List<PaymentMethod> paymentMethodsForStaffCreditSettle;
+    private List<PaymentMethod> paymentMethodsForPatientDeposit;
+    private List<PaymentMethod> paymentMethodsForOpdBillCanceling;
     SessionNumberType[] sessionNumberTypes;
 
     @PostConstruct
@@ -864,17 +864,6 @@ public List<PaymentMethod> getPaymentMethodsForStaffCreditSettle() {
     public void setPaymentMethodsForStaffCreditSettle(List<PaymentMethod> paymentMethodsForStaffCreditSettle) {
         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<>();
@@ -890,4 +879,20 @@ public List<PaymentMethod> getPaymentMethodsForPatientDepositRefund() {
     public void setPaymentMethodsForPatientDepositRefund(List<PaymentMethod> paymentMethodsForPatientDepositRefund) {
         this.paymentMethodsForPatientDepositRefund = paymentMethodsForPatientDepositRefund;
     }
+
+    public List<PaymentMethod> getPaymentMethodsForOpdBillCanceling() {
+        paymentMethodsForOpdBillCanceling = new ArrayList<>();
+        for (PaymentMethod pm : PaymentMethod.values()) {
+            boolean include = configOptionApplicationController.getBooleanValueByKey(pm.getLabel() + " is available for OPD Bill Cancel", true);
+            if (include) {
+                paymentMethodsForOpdBillCanceling.add(pm);
+            }
+        }
+        return paymentMethodsForOpdBillCanceling;
+    }
+
+    public void setPaymentMethodsForOpdBillCanceling(List<PaymentMethod> paymentMethodsForOpdBillCanceling) {
+        this.paymentMethodsForOpdBillCanceling = paymentMethodsForOpdBillCanceling;
+    }
+
 }
diff --git a/src/main/webapp/opd/opd_bill.xhtml b/src/main/webapp/opd/opd_bill.xhtml
@@ -994,6 +994,8 @@
                                                     ajax="false"
                                                     icon="fa fa-check"
                                                     action="#{opdBillController.settleOpdBill()}"
+                                                    onclick="if (!confirm('Are you sure you want to Settle This Bill ?'))
+                                                        return false;"
                                                     class="ui-button-success mx-2 w-100">
                                                 </p:commandButton>