diff --git a/.github/counter.txt b/.github/counter.txt
index d00491fd7e..56a6051ca2 100644
--- a/.github/counter.txt
+++ b/.github/counter.txt
@@ -1 +1 @@
-1
+1
\ No newline at end of file
diff --git a/nb-configuration.xml b/nb-configuration.xml
index a7ab4ee3a4..2c47f15239 100644
--- a/nb-configuration.xml
+++ b/nb-configuration.xml
@@ -18,7 +18,7 @@ Any value defined here will override the pom.xml file value but is only applicab
false
true
JSP
- none
+ all
/less:/css
false
false
@@ -27,7 +27,6 @@ Any value defined here will override the pom.xml file value but is only applicab
/scss:/css
js/libs
pfv5ee8
- false
- none
+ JDK_11
diff --git a/src/main/java/com/divudi/bean/opd/OpdBillController.java b/src/main/java/com/divudi/bean/opd/OpdBillController.java
index b5e9ab6c40..c87480b6fc 100644
--- a/src/main/java/com/divudi/bean/opd/OpdBillController.java
+++ b/src/main/java/com/divudi/bean/opd/OpdBillController.java
@@ -1687,6 +1687,13 @@ public boolean validatePaymentMethodDeta() {
JsfUtil.addErrorMessage("Please Enter a Slip Comment..");
error = true;
}
+ } else if (getPaymentMethod() == PaymentMethod.Credit) {
+ System.out.println("Credit");
+ if (getPaymentMethodData().getCredit().getComment().trim().equals("") && configOptionApplicationController.getBooleanValueByKey("OPD Billing - Credit Comment is Mandatory", false)) {
+ System.out.println("Error");
+ JsfUtil.addErrorMessage("Please Enter a Credit Comment..");
+ error = true;
+ }
}
return error;
}
@@ -3171,7 +3178,7 @@ public List createPayment(Bill bill, PaymentMethod pm) {
case Agent:
case Credit:
p.setReferenceNo(cd.getPaymentMethodData().getCredit().getReferralNo());
-
+ p.setComments(cd.getPaymentMethodData().getCredit().getComment());
case PatientDeposit:
if (getPatient().getRunningBalance() != null) {
getPatient().setRunningBalance(getPatient().getRunningBalance() - cd.getPaymentMethodData().getPatient_deposit().getTotalValue());
@@ -3226,6 +3233,7 @@ public List createPayment(Bill bill, PaymentMethod pm) {
case Agent:
case Credit:
p.setReferenceNo(paymentMethodData.getCredit().getReferralNo());
+ p.setComments(paymentMethodData.getCredit().getComment());
case PatientDeposit:
case Slip:
p.setBank(paymentMethodData.getSlip().getInstitution());
diff --git a/src/main/resources/VERSION.txt b/src/main/resources/VERSION.txt
index b75abb5d86..ab3dc5d2da 100644
--- a/src/main/resources/VERSION.txt
+++ b/src/main/resources/VERSION.txt
@@ -1 +1 @@
-3.0.0.20240728.1
+3.0.0.20240728.1
\ No newline at end of file
diff --git a/src/main/webapp/resources/paymentMethod/credit.xhtml b/src/main/webapp/resources/paymentMethod/credit.xhtml
index fa45f57b24..ce091c0955 100644
--- a/src/main/webapp/resources/paymentMethod/credit.xhtml
+++ b/src/main/webapp/resources/paymentMethod/credit.xhtml
@@ -38,10 +38,17 @@
+
+
+