From 382f8e2f0a4619213093438e126d1cbcf38f959b Mon Sep 17 00:00:00 2001 From: DamithDeshan Date: Thu, 25 Jul 2024 21:03:59 +0530 Subject: [PATCH 1/5] Signed-off-by: DamithDeshan --- .../resources/paymentMethod/credit.xhtml | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 src/main/webapp/resources/paymentMethod/credit.xhtml diff --git a/src/main/webapp/resources/paymentMethod/credit.xhtml b/src/main/webapp/resources/paymentMethod/credit.xhtml new file mode 100644 index 0000000000..fa45f57b24 --- /dev/null +++ b/src/main/webapp/resources/paymentMethod/credit.xhtml @@ -0,0 +1,59 @@ + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + + \ No newline at end of file From bb02936245535642ee3eddea40c77798b9e09291 Mon Sep 17 00:00:00 2001 From: DamithDeshan Date: Thu, 25 Jul 2024 21:04:09 +0530 Subject: [PATCH 2/5] Signed-off-by: DamithDeshan --- .../data/dataStructure/ComponentDetail.java | 24 ++++++++++++------- src/main/java/com/divudi/entity/Payment.java | 13 ++++++++++ 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/divudi/data/dataStructure/ComponentDetail.java b/src/main/java/com/divudi/data/dataStructure/ComponentDetail.java index 1bdf2f91b8..037b88852c 100644 --- a/src/main/java/com/divudi/data/dataStructure/ComponentDetail.java +++ b/src/main/java/com/divudi/data/dataStructure/ComponentDetail.java @@ -34,6 +34,9 @@ public class ComponentDetail { private PaymentMethodData paymentMethodData; private int creditDuration; private Staff toStaff; + private String referralNo; + + public List getMultiplePaymentMethodComponentDetails() { if (multiplePaymentMethodComponentDetails == null) { @@ -44,13 +47,13 @@ public List getMultiplePaymentMethodComponentDetails() { } return multiplePaymentMethodComponentDetails; } - - public void addAnotherPaymentDetail(){ + + public void addAnotherPaymentDetail() { ComponentDetail cd = new ComponentDetail(); getMultiplePaymentMethodComponentDetails().add(cd); } - - public void removePaymentDetail(ComponentDetail cd){ + + public void removePaymentDetail(ComponentDetail cd) { getMultiplePaymentMethodComponentDetails().remove(cd); } @@ -115,7 +118,7 @@ public void setPaymentMethod(PaymentMethod paymentMethod) { } public PaymentMethodData getPaymentMethodData() { - if(paymentMethodData==null){ + if (paymentMethodData == null) { paymentMethodData = new PaymentMethodData(); } return paymentMethodData; @@ -140,8 +143,13 @@ public Staff getToStaff() { public void setToStaff(Staff toStaff) { this.toStaff = toStaff; } - - - + + public String getReferralNo() { + return referralNo; + } + + public void setReferralNo(String referralNo) { + this.referralNo = referralNo; + } } diff --git a/src/main/java/com/divudi/entity/Payment.java b/src/main/java/com/divudi/entity/Payment.java index a96a83d636..fbdd8fbaa2 100644 --- a/src/main/java/com/divudi/entity/Payment.java +++ b/src/main/java/com/divudi/entity/Payment.java @@ -105,6 +105,8 @@ public class Payment implements Serializable { @Transient private List humanReadableDenominations; + private String referenceNo; + public Long getId() { return id; } @@ -428,4 +430,15 @@ public void setCurrencyDenominations(List currencyDenominations) { this.currencyDenominations = currencyDenominations; } + public String getReferenceNo() { + + return referenceNo; + } + + public void setReferenceNo(String referenceNo) { + this.referenceNo = referenceNo; + } + + + } From 81ab60d11b1bcc4a37fd47a287079337aa2f131b Mon Sep 17 00:00:00 2001 From: DamithDeshan Date: Thu, 25 Jul 2024 21:04:19 +0530 Subject: [PATCH 3/5] Signed-off-by: DamithDeshan --- .../com/divudi/bean/opd/OpdBillController.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/main/java/com/divudi/bean/opd/OpdBillController.java b/src/main/java/com/divudi/bean/opd/OpdBillController.java index 4f38fc9c6e..b5e9ab6c40 100644 --- a/src/main/java/com/divudi/bean/opd/OpdBillController.java +++ b/src/main/java/com/divudi/bean/opd/OpdBillController.java @@ -294,6 +294,8 @@ public class OpdBillController implements Serializable, ControllerWithPatient, C private Double totalSaffFee; private boolean canChangeSpecialityAndDoctorInAddedBillItem; private String localNumber; + + private String refNo; /** * @@ -3168,6 +3170,8 @@ public List createPayment(Bill bill, PaymentMethod pm) { case Agent: case Credit: + p.setReferenceNo(cd.getPaymentMethodData().getCredit().getReferralNo()); + case PatientDeposit: if (getPatient().getRunningBalance() != null) { getPatient().setRunningBalance(getPatient().getRunningBalance() - cd.getPaymentMethodData().getPatient_deposit().getTotalValue()); @@ -3221,6 +3225,7 @@ public List createPayment(Bill bill, PaymentMethod pm) { case Agent: case Credit: + p.setReferenceNo(paymentMethodData.getCredit().getReferralNo()); case PatientDeposit: case Slip: p.setBank(paymentMethodData.getSlip().getInstitution()); @@ -4170,4 +4175,15 @@ public void setLocalNumber(String localNumber) { this.localNumber = localNumber; } + public String getRefNo() { + if(refNo == null){ + refNo = getPaymentMethodData().getCredit().getReferralNo(); + } + return refNo; + } + + public void setRefNo(String refNo) { + this.refNo = refNo; + } + } From bbf1069747e539c5477aa70c98609b1fabe7a7b2 Mon Sep 17 00:00:00 2001 From: DamithDeshan Date: Thu, 25 Jul 2024 21:04:22 +0530 Subject: [PATCH 4/5] Signed-off-by: DamithDeshan --- src/main/resources/META-INF/persistence.xml | 4 +- src/main/webapp/opd/opd_bill.xhtml | 49 +++------------------ 2 files changed, 9 insertions(+), 44 deletions(-) diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index 0e77e8aff2..f10263e018 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -1,14 +1,14 @@ - jdbc/hims + jdbc/arogya false - jdbc/himsAduit + jdbc/arogyaAudit false diff --git a/src/main/webapp/opd/opd_bill.xhtml b/src/main/webapp/opd/opd_bill.xhtml index 190202a3fe..ee04ecb2d6 100644 --- a/src/main/webapp/opd/opd_bill.xhtml +++ b/src/main/webapp/opd/opd_bill.xhtml @@ -645,48 +645,7 @@
- -
-
-
- - - - - - - - -
-
-
- + + + + Date: Thu, 25 Jul 2024 21:05:46 +0530 Subject: [PATCH 5/5] closes#6552 --- src/main/webapp/resources/paymentMethod/creditCard.xhtml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/webapp/resources/paymentMethod/creditCard.xhtml b/src/main/webapp/resources/paymentMethod/creditCard.xhtml index aefed9111a..63bebe1de4 100644 --- a/src/main/webapp/resources/paymentMethod/creditCard.xhtml +++ b/src/main/webapp/resources/paymentMethod/creditCard.xhtml @@ -35,6 +35,5 @@
- \ No newline at end of file