Skip to content

Commit

Permalink
Merge pull request #6766 from hmislk/Issue#6764
Browse files Browse the repository at this point in the history
Issue#6764 Closes #6764
  • Loading branch information
DeshaniPubudu authored Aug 7, 2024
2 parents 26a589c + 487fe49 commit a333158
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
3 changes: 3 additions & 0 deletions src/main/webapp/channel/manage_booking_by_date.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
>
Expand Down

0 comments on commit a333158

Please sign in to comment.