Merge pull request #6647 from hmislk/Issue#6198

Issue#6198 Closes #6198
hmislk · Jul 28, 2024 · 897354e · 897354e
2 parents 3a6dfaa + fffbfe2
commit 897354e
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/.github/counter.txt b/.github/counter.txt
@@ -1 +1 @@
-1
+1
diff --git 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
         <org-netbeans-modules-maven-j2ee.netbeans_2e_deploy_2e_on_2e_save>false</org-netbeans-modules-maven-j2ee.netbeans_2e_deploy_2e_on_2e_save>
         <org-netbeans-modules-javascript2-requirejs.enabled>true</org-netbeans-modules-javascript2-requirejs.enabled>
         <org-netbeans-modules-projectapi.jsf_2e_language>JSP</org-netbeans-modules-projectapi.jsf_2e_language>
-        <netbeans.compile.on.save>none</netbeans.compile.on.save>
+        <netbeans.compile.on.save>all</netbeans.compile.on.save>
         <org-netbeans-modules-css-prep.less_2e_mappings>/less:/css</org-netbeans-modules-css-prep.less_2e_mappings>
         <org-netbeans-modules-css-prep.less_2e_enabled>false</org-netbeans-modules-css-prep.less_2e_enabled>
         <org-netbeans-modules-css-prep.sass_2e_enabled>false</org-netbeans-modules-css-prep.sass_2e_enabled>
@@ -27,7 +27,6 @@ Any value defined here will override the pom.xml file value but is only applicab
         <org-netbeans-modules-css-prep.sass_2e_mappings>/scss:/css</org-netbeans-modules-css-prep.sass_2e_mappings>
         <org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder>js/libs</org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder>
         <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>pfv5ee8</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>
-        <org-netbeans-modules-maven-j2ee.netbeans_2e_deploy_2e_on_2e_save>false</org-netbeans-modules-maven-j2ee.netbeans_2e_deploy_2e_on_2e_save>
-        <netbeans.compile.on.save>none</netbeans.compile.on.save>
+        <netbeans.hint.jdkPlatform>JDK_11</netbeans.hint.jdkPlatform>
     </properties>
 </project-shared-configuration>
diff --git 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<Payment> 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<Payment> 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
@@ -1 +1 @@
-3.0.0.20240728.1
+3.0.0.20240728.1
diff --git a/src/main/webapp/resources/paymentMethod/credit.xhtml b/src/main/webapp/resources/paymentMethod/credit.xhtml
@@ -38,10 +38,17 @@
 
             <p:inputText 
                 id="polNo" 
-                style="width: 250px;"
+                style="width: 200px;"
                 value="#{cc.attrs.paymentMethodData.credit.referralNo}" 
                 placeholder="Policy NO" >
             </p:inputText>
+
+            <p:inputText 
+                id="memo" 
+                style="width: 300px;"
+                value="#{cc.attrs.paymentMethodData.credit.comment}" 
+                placeholder="Memo" >
+            </p:inputText>
 
             <p:commandLink 
                 id="btnAddNewCreditCom"