Merge pull request #49 from ojwanganto/add-payment-code-in-receipt-print

Add payment reference code to payment details
palladiumkenya · Nov 9, 2024 · 73d14f5 · 73d14f5
2 parents c48e896 + 56c6bb2
commit 73d14f5
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/cashier/api/impl/BillServiceImpl.java b/api/src/main/java/org/openmrs/module/kenyaemr/cashier/api/impl/BillServiceImpl.java
@@ -57,6 +57,7 @@
 import org.openmrs.module.kenyaemr.cashier.api.model.BillLineItem;
 import org.openmrs.module.kenyaemr.cashier.api.model.BillStatus;
 import org.openmrs.module.kenyaemr.cashier.api.model.Payment;
+import org.openmrs.module.kenyaemr.cashier.api.model.PaymentAttribute;
 import org.openmrs.module.kenyaemr.cashier.api.search.BillSearch;
 import org.openmrs.module.kenyaemr.cashier.api.util.PrivilegeConstants;
 import org.openmrs.module.kenyaemr.cashier.util.Utils;
@@ -85,6 +86,7 @@ public class BillServiceImpl extends BaseEntityDataServiceImpl<Bill> implements
 	private static final String GP_DEFAULT_LOCATION = "kenyaemr.defaultLocation";
 	private static final String GP_FACILITY_ADDRESS_DETAILS = "kenyaemr.cashier.receipt.facilityAddress";
 	public static final String OPENMRS_ID = "dfacd928-0370-4315-99d7-6ec1c9f7ae76";
+	public static final String PAYMENT_REFERENCE_ATTRIBUTE = "d453e528-0264-4d6e-ae23-bc0b777e1146";
 
 
 	@Override
@@ -449,14 +451,19 @@ public File downloadBillReceipt(Bill bill) {
 		Table paymentSection = new Table(paymentColWidth);
 		paymentSection.setWidth(UnitValue.createPercentValue(100f));
 		paymentSection.addCell(new Paragraph("  "));
-		paymentSection.addCell(new Paragraph("  "));
-		paymentSection.addCell(new Paragraph("Payment").setTextAlignment(TextAlignment.RIGHT).setBold());
-		paymentSection.addCell(new Paragraph(""));
+		paymentSection.addCell(new Paragraph("Payment").setTextAlignment(TextAlignment.LEFT).setBold());
+		paymentSection.addCell(new Paragraph("Ref No").setTextAlignment(TextAlignment.RIGHT).setBold());
+		paymentSection.addCell(new Paragraph(" "));
 		// append payment rows
 		for (Payment payment : bill.getPayments()) {
+			PaymentAttribute paymentReferenceAttribute = payment.getActiveAttributes().stream().filter(attribute -> attribute.getAttributeType().getUuid().equals(PAYMENT_REFERENCE_ATTRIBUTE)).findFirst().orElse(null);
+			String paymentReferenceCode = "";
+			if (paymentReferenceAttribute != null) {
+				paymentReferenceCode = paymentReferenceAttribute.getValue();
+			}
 			paymentSection.addCell(new Paragraph(" "));
-			paymentSection.addCell(new Paragraph(" "));
-			paymentSection.addCell(new Paragraph(payment.getInstanceType().getName()).setTextAlignment(TextAlignment.RIGHT)).setFontSize(10).setFont(helvetica);
+			paymentSection.addCell(new Paragraph(payment.getInstanceType().getName()).setTextAlignment(TextAlignment.LEFT)).setFontSize(10).setFont(helvetica);
+			paymentSection.addCell(new Paragraph(paymentReferenceCode).setTextAlignment(TextAlignment.RIGHT)).setFontSize(10).setFont(helvetica);
 			paymentSection.addCell(new Paragraph(df.format(payment.getAmountTendered())).setTextAlignment(TextAlignment.RIGHT)).setFontSize(10).setFont(helvetica);
 		}