Merge pull request #6766 from hmislk/Issue#6764

Issue#6764 Closes #6764
hmislk · Aug 7, 2024 · a333158 · a333158
2 parents 26a589c + 487fe49
commit a333158
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/main/java/com/divudi/bean/channel/BookingControllerViewScope.java b/src/main/java/com/divudi/bean/channel/BookingControllerViewScope.java
@@ -6578,7 +6578,7 @@ && getBillSession().getBill().getFromInstitution().getBallance()
             }
         }
 
-        if (settlePaymentMethod == PaymentMethod.Agent && settleInstitution == null) {
+        if (settlePaymentMethod == PaymentMethod.Agent && institution == null) {
             JsfUtil.addErrorMessage("Please select Agency");
             return true;
         }

diff --git a/src/main/java/com/divudi/bean/channel/BookingControllerViewScopeMonth.java b/src/main/java/com/divudi/bean/channel/BookingControllerViewScopeMonth.java
@@ -6276,7 +6276,7 @@ && getBillSession().getBill().getFromInstitution().getBallance()
             }
         }
 
-        if (settlePaymentMethod == PaymentMethod.Agent && settleInstitution == null) {
+        if (settlePaymentMethod == PaymentMethod.Agent && institution == null) {
             JsfUtil.addErrorMessage("Please select Agency");
             return true;
         }

diff --git a/src/main/webapp/channel/manage_booking_by_date.xhtml b/src/main/webapp/channel/manage_booking_by_date.xhtml
@@ -384,6 +384,9 @@
                                                             icon="fa fa-check"
                                                             action="#{bookingControllerViewScope.settleCredit()}"
                                                             immediate="true"
+                                                            disabled="#{bookingControllerViewScope.selectedBillSession.bill.billType.parent ne 'ChannelCreditFlow'
+                                                                        or bookingControllerViewScope.selectedBillSession.bill.cancelled==true
+                                                                        or  bookingControllerViewScope.selectedBillSession.bill.paidAmount ne 0}"
                                                             oncomplete="PF('dlgSettleAD').show();"
                                                             class="ui-button-success mx-2 w-100"
                                                             >