From c7e7bf0c4b5c4e97715aaefc9fea1894b04fe602 Mon Sep 17 00:00:00 2001 From: Lawan Samarasekara Date: Mon, 5 Aug 2024 10:27:52 +0530 Subject: [PATCH 1/2] Fixed Channel Booking By Date Signed-off-by: Lawan Samarasekara --- .../com/divudi/bean/channel/BookingControllerViewScope.java | 2 +- src/main/webapp/channel/manage_booking_by_date.xhtml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/divudi/bean/channel/BookingControllerViewScope.java b/src/main/java/com/divudi/bean/channel/BookingControllerViewScope.java index 50eb9478d4..b1d99be2cb 100644 --- a/src/main/java/com/divudi/bean/channel/BookingControllerViewScope.java +++ b/src/main/java/com/divudi/bean/channel/BookingControllerViewScope.java @@ -6557,7 +6557,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 index 16b9e3b55b..bb78ee591c 100644 --- 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" > From 487fe492b1ba4a63ca5c939ef065c124b30e33f8 Mon Sep 17 00:00:00 2001 From: Lawan Samarasekara Date: Mon, 5 Aug 2024 10:28:30 +0530 Subject: [PATCH 2/2] Fixed #6764 Signed-off-by: Lawan Samarasekara --- .../divudi/bean/channel/BookingControllerViewScopeMonth.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/divudi/bean/channel/BookingControllerViewScopeMonth.java b/src/main/java/com/divudi/bean/channel/BookingControllerViewScopeMonth.java index d3ce5f7c16..5387a9a21e 100644 --- a/src/main/java/com/divudi/bean/channel/BookingControllerViewScopeMonth.java +++ b/src/main/java/com/divudi/bean/channel/BookingControllerViewScopeMonth.java @@ -6280,7 +6280,7 @@ && getBillSession().getBill().getFromInstitution().getBallance() } } - if (settlePaymentMethod == PaymentMethod.Agent && settleInstitution == null) { + if (settlePaymentMethod == PaymentMethod.Agent && institution == null) { JsfUtil.addErrorMessage("Please select Agency"); return true; }